Merge pull request #350 from fractal-analytics-platform/align-1.4.0

Used new endpoints for retrieving current user and list of users

Author: tcompa

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 This release requires fractal-server 1.4.0.
 
+* Used new endpoints for retrieving current user and list of users (\#350).
 * Added user profile page (\#336).
 * Added admin area with users management (\#336).
 * Added Jobs button in home page (\#346).

playwright.config.js

@@ -38,7 +38,7 @@ export default defineConfig({
 
 	webServer: [
 		{
-			command: './tests/start-test-server.sh 1.4.0a6',
+			command: './tests/start-test-server.sh 1.4.0a8',
 			port: 8000,
 			waitForPort: true,
 			stdout: 'pipe',

src/hooks.server.js

@@ -24,8 +24,8 @@ export async function handle({ event, resolve }) {
 		});
 	}
 
-	const whoami = await event.fetch(`${FRACTAL_SERVER_HOST}/auth/whoami/`);
-	if (!whoami.ok) {
+	const currentUser = await event.fetch(`${FRACTAL_SERVER_HOST}/auth/current-user/`);
+	if (!currentUser.ok) {
 		console.log('Validation of authentication - Error loading user info');
 		return new Response(null, {
 			status: 302,
@@ -34,7 +34,7 @@ export async function handle({ event, resolve }) {
 	}
 
 	if (event.url.pathname.startsWith('/admin')) {
-		const user = await whoami.json();
+		const user = await currentUser.json();
 		if (!user.is_superuser) {
 			throw error(403, `Only superusers can access the admin area`);
 		}

src/lib/server/api/v1/auth_api.js

@@ -27,8 +27,8 @@ export async function userAuthentication(fetch, data) {
  * @param {typeof fetch} fetch
  * @returns {Promise<*>}
  */
-export async function whoami(fetch) {
-	const response = await fetch(FRACTAL_SERVER_HOST + '/auth/whoami/', {
+export async function getCurrentUser(fetch) {
+	const response = await fetch(FRACTAL_SERVER_HOST + '/auth/current-user/', {
 		method: 'GET',
 		credentials: 'include',
 		mode: 'cors'
@@ -68,7 +68,7 @@ export async function logout(fetch) {
  * @returns {Promise<*>}
  */
 export async function listUsers(fetch) {
-	const response = await fetch(FRACTAL_SERVER_HOST + '/auth/userlist/', {
+	const response = await fetch(FRACTAL_SERVER_HOST + '/auth/users/', {
 		method: 'GET',
 		credentials: 'include'
 	});

src/routes/+layout.server.js

@@ -1,5 +1,5 @@
 import { FRACTAL_SERVER_HOST } from '$env/static/private';
-import { whoami } from '$lib/server/api/v1/auth_api';
+import { getCurrentUser } from '$lib/server/api/v1/auth_api';
 
 export async function load({ fetch, cookies }) {
 	// This is a mark to notify and log when the server is running SSR
@@ -29,7 +29,7 @@ export async function load({ fetch, cookies }) {
 		};
 	}
 
-	const userInfo = await whoami(fetch).catch((error) => {
+	const userInfo = await getCurrentUser(fetch).catch((error) => {
 		console.log('Error loading user info');
 		console.error(error);
 		return null;