Merge pull request #336 from fractal-analytics-platform/users-crud

Admin area - users CRUD

Author: zonia3000

.gitignore

@@ -12,3 +12,4 @@ node_modules
 /tests/.auth
 coverage*/
 .nyc_output
+playwright-report/

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 This release requires fractal-server 1.4.0.
 
+* Added user profile page (\#336).
+* Added admin area with users management (\#336).
 * Added Jobs button in home page (\#346).
 * Improved jobs table layout for small screens (\#346).
 * Fixed jobs status badge color bug (\#346).

src/hooks.server.js

@@ -1,4 +1,5 @@
 import { FRACTAL_SERVER_HOST } from '$env/static/private';
+import { error } from '@sveltejs/kit';
 
 export async function handle({ event, resolve }) {
 	console.log(`[${event.request.method}] - ${event.url.pathname}`);
@@ -17,16 +18,29 @@ export async function handle({ event, resolve }) {
 	const fastApiUsersAuth = event.cookies.get('fastapiusersauth');
 	if (!fastApiUsersAuth) {
 		console.log('Authentication required - No auth cookie found - Redirecting to login');
-		return new Response(null, { status: 302, headers: { location: '/auth/login?invalidate=true' } });
+		return new Response(null, {
+			status: 302,
+			headers: { location: '/auth/login?invalidate=true' }
+		});
 	}
 
 	const whoami = await event.fetch(`${FRACTAL_SERVER_HOST}/auth/whoami/`);
-	if (whoami.ok) {
-		return await resolve(event);
-	} else {
+	if (!whoami.ok) {
 		console.log('Validation of authentication - Error loading user info');
-		return new Response(null, { status: 302, headers: { location: '/auth/login?invalidate=true' } });
+		return new Response(null, {
+			status: 302,
+			headers: { location: '/auth/login?invalidate=true' }
+		});
 	}
+
+	if (event.url.pathname.startsWith('/admin')) {
+		const user = await whoami.json();
+		if (!user.is_superuser) {
+			throw error(403, `Only superusers can access the admin area`);
+		}
+	}
+
+	return await resolve(event);
 }
 
 /** @type {import('@sveltejs/kit').HandleFetch} */

src/lib/common/component_utilities.js

@@ -121,6 +121,21 @@ export function nullifyEmptyStrings(inputValues) {
 	return clearedValues;
 }
 
+/**
+ * Removes null values from an object
+ * @param {object} inputValues
+ * @returns {object}
+ */
+export function removeNullValues(inputValues) {
+	const clearedValues = {};
+	for (let key in inputValues) {
+		if (inputValues[key] !== null) {
+			clearedValues[key] = inputValues[key];
+		}
+	}
+	return clearedValues;
+}
+
 /**
  * Replacer function to ignore empty strings when using JSON.stringify().
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#description}

src/lib/common/errors.js

@@ -55,16 +55,11 @@ export class AlertError extends Error {
  * @returns {null | { loc: string[], msg: string }}
  */
 function getSimpleValidationMessage(reason, statusCode) {
-	if (
-		statusCode !== 422 ||
-		!('detail' in reason) ||
-		!Array.isArray(reason.detail) ||
-		reason.detail.length !== 1
-	) {
+	if (!isValidationError(reason, statusCode) || reason.detail.length !== 1) {
 		return null;
 	}
 	const err = reason.detail[0];
-	if (!Array.isArray(err.loc) || !err.msg || err.type !== 'value_error') {
+	if (!isValueError(err)) {
 		return null;
 	}
 	return {
@@ -73,6 +68,46 @@ function getSimpleValidationMessage(reason, statusCode) {
 	};
 }
 
+/**
+ * @param {any} reason
+ * @param {number | null} statusCode
+ * @returns {null | { [key: string]: string }}
+ */
+export function getValidationMessagesMap(reason, statusCode) {
+	if (!isValidationError(reason, statusCode) || reason.detail.length === 0) {
+		return null;
+	}
+	/** @type {{[key: string]: string}} */
+	const map = {};
+	for (const error of reason.detail) {
+		if (!isValueError(error)) {
+			return null;
+		}
+		if (error.loc.length !== 2 || error.loc[0] !== 'body') {
+			return null;
+		}
+		map[error.loc[1]] = error.msg;
+	}
+	return map;
+}
+
+/**
+ * @param {any} reason
+ * @param {number | null} statusCode
+ * @returns {boolean}
+ */
+function isValidationError(reason, statusCode) {
+	return statusCode === 422 && 'detail' in reason && Array.isArray(reason.detail);
+}
+
+/**
+ * @param {any} err
+ * @returns {boolean}
+ */
+function isValueError(err) {
+	return Array.isArray(err.loc) && !!err.msg && err.type === 'value_error';
+}
+
 /**
  * Display a standard error alert on the desired HTML element.
  * @param {any} error