Handled user without profile

Author: zonia3000

src/hooks.server.js

@@ -79,9 +79,14 @@ export async function handle({ event, resolve }) {
 	}
 
 	// Authentication guard
-	if (!isPublicPage && userInfo === null) {
-		logger.debug('Authentication required - No auth cookie found - Redirecting to login');
-		redirect(302, '/auth/login?invalidate=true');
+	if (!isPublicPage) {
+		if (userInfo === null) {
+			logger.debug('Authentication required - No auth cookie found - Redirecting to login');
+			redirect(302, '/auth/login?invalidate=true');
+		} else if (userInfo.profile_id === null) {
+			logger.debug('User without profile - Redirecting to home');
+			redirect(302, '/');
+		}
 	}
 
 	// Admin area check

src/routes/+page.svelte

@@ -5,7 +5,8 @@
 	import { formatMarkdown } from '$lib/common/component_utilities';
 	import { onMount } from 'svelte';
 
-	let userLoggedIn = $derived(!!page.data.userInfo);
+	/** @type {import('fractal-components/types/api').User|undefined} */
+	let userInfo = $derived(page.data.userInfo);
 	let news = $derived(page.data.news);
 
 	let mounted = $state(false);
@@ -22,6 +23,12 @@
 </script>
 
 <div class="container mt-3">
+	{#if userInfo && userInfo.profile_id === null}
+		<div class="alert alert-warning">
+			This user is not authorized to use this Fractal instance - please contact {env.PUBLIC_FRACTAL_ADMIN_SUPPORT_EMAIL}.
+		</div>
+	{/if}
+
 	{#if temporaryMessage}
 		<div class="alert alert-info">
 			{temporaryMessage}
@@ -49,7 +56,7 @@
 		</p>
 
 		<div class="col mb-3">
-			{#if !userLoggedIn}
+			{#if !userInfo}
 				<a href="/auth/login" class="btn btn-primary">Login</a>
 			{/if}
 			<a href="/v2/projects" class="btn btn-primary">Projects</a>

tests/v2/user_without_profile.spec.js

@@ -0,0 +1,49 @@
+import { expect, test } from '@playwright/test';
+import { login, logout, waitPageLoading } from '../utils.js';
+
+// Reset storage state for this file to avoid being authenticated
+test.use({ storageState: { cookies: [], origins: [] } });
+
+test('User without profile', async ({ page }) => {
+	const randomValue = Math.random().toString(36).substring(7);
+	const randomEmail = `${randomValue}@example.com`;
+
+	await test.step('Login as admin and create test user', async () => {
+		await login(page, '[email protected]', '1234');
+		await page.goto('/v2/admin/users/register');
+		await waitPageLoading(page);
+		await page.getByRole('textbox', { name: 'E-mail' }).fill(randomEmail);
+		await page.getByRole('textbox', { name: 'Password', exact: true }).fill('1234');
+		await page.getByRole('textbox', { name: 'Confirm password' }).fill('1234');
+		await page.getByRole('textbox', { name: 'Project dir' }).fill('/tmp');
+
+		// Unset the profile
+		await page
+			.getByRole('combobox', { name: 'Select resource' })
+			.selectOption('Select resource...');
+		await expect(page.getByRole('combobox', { name: 'Select profile' })).toBeDisabled();
+		await expect(page.getByRole('combobox', { name: 'Select profile' })).toHaveValue('');
+
+		await page.getByRole('button', { name: 'Save' }).first().click();
+		await page.waitForURL(/\/v2\/admin\/users\/\d+\/edit/);
+	});
+
+	await test.step('Login as test user', async () => {
+		await logout(page, '[email protected]');
+
+		await page.goto('/auth/login');
+		await waitPageLoading(page);
+		await page.getByRole('button', { name: 'Log in with username & password' }).click();
+		await page.getByLabel('Email address').fill(randomEmail);
+		await page.getByLabel('Password').fill('1234');
+		await page.getByRole('button', { name: 'Log in', exact: true }).click();
+
+		await page.waitForURL('/');
+
+		await expect(
+			page.getByText(/This user is not authorized to use this Fractal instance/)
+		).toBeVisible();
+
+		await logout(page, randomEmail);
+	});
+});

tests/v2/viewer_paths.spec.js

@@ -17,6 +17,8 @@ test('Viewer paths', async ({ page }) => {
 		await page.getByRole('textbox', { name: 'Password', exact: true }).fill('1234');
 		await page.getByRole('textbox', { name: 'Confirm password' }).fill('1234');
 		await page.getByRole('textbox', { name: 'Project dir' }).fill('/tmp');
+		await page.getByRole('combobox', { name: 'Select resource' }).selectOption('Local resource');
+		await page.getByRole('combobox', { name: 'Select profile' }).selectOption('Local profile');
 		await page.getByRole('button', { name: 'Save' }).first().click();
 		await page.waitForURL(/\/v2\/admin\/users\/\d+\/edit/);
 	});