Used new viewer paths endpoint and added download token button

Author: zonia3000

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 # Unreleased
 
-* Alignment with fractal-server 2.9.0 (\#640, \#643):
+* Alignment with fractal-server 2.9.0 (\#640, \#643, \#652):
     * Updated task collections logic and created task-group activities pages for standard users and administrators (\#640);
     * Removed active checkbox from task group edit modal (\#640);
     * Added Manage button to deactivate and reactivate task groups (\#640);
@@ -11,6 +11,8 @@
     * Viewer paths page improvements (\#643);
     * Added manage buttons on admin task-groups page (\#643);
     * Added last used timestamp filter to task-group admin page (\#643);
+    * Used new `GET /auth/current-user/allowed-viewer-paths/` endpoint (\#652);
+    * Added "Download token" button in "My profile" page (\#652);
 
 # 1.10.1
 

playwright.config.js

@@ -107,7 +107,7 @@ export default defineConfig({
 
 	webServer: [
 		{
-			command: './tests/start-test-server.sh 2.9.0a5',
+			command: './tests/start-test-server.sh 2.9.0a9',
 			port: 8000,
 			waitForPort: true,
 			stdout: 'pipe',

src/lib/server/api/auth_api.js

@@ -74,16 +74,16 @@ export async function getCurrentUserSettings(fetch) {
  * @param {typeof fetch} fetch
  * @returns {Promise<string[]>}
  */
-export async function getCurrentUserViewerPaths(fetch) {
+export async function getCurrentUserAllowedViewerPaths(fetch) {
 	logger.debug('Retrieving current user viewer paths');
-	const url = `${env.FRACTAL_SERVER_HOST}/auth/current-user/viewer-paths/`;
+	const url = `${env.FRACTAL_SERVER_HOST}/auth/current-user/allowed-viewer-paths/`;
 	const response = await fetch(url, {
 		method: 'GET',
 		credentials: 'include'
 	});
 
 	if (!response.ok) {
-		logger.error('Unable to retrieve the current user viewer paths');
+		logger.error('Unable to retrieve the current user allowed viewer paths');
 		await responseError(response);
 	}
 

src/routes/profile/+page.svelte

@@ -68,5 +68,7 @@
 				</tr>
 			</tbody>
 		</table>
+
+		<a class="btn btn-primary mt-3" href="/profile/token" download>Download token</a>
 	</div>
 </div>

src/routes/profile/token/+server.js

@@ -0,0 +1,10 @@
+export async function GET({ cookies }) {
+	const cookie = cookies.get('fastapiusersauth');
+
+	return new Response(cookie, {
+		status: 200,
+		headers: {
+			'Content-Disposition': 'Attachment;filename=fractal-token.txt'
+		}
+	});
+}

src/routes/viewer-paths/+page.server.js

@@ -1,16 +1,14 @@
-import { getCurrentUserSettings, getCurrentUserViewerPaths } from '$lib/server/api/auth_api.js';
+import { getCurrentUserAllowedViewerPaths } from '$lib/server/api/auth_api.js';
 import { getLogger } from '$lib/server/logger.js';
 
 const logger = getLogger('viewer paths page');
 
 export async function load({ fetch }) {
 	logger.trace('Load viewer paths page');
 
-	const viewerPaths = await getCurrentUserViewerPaths(fetch);
-	const settings = await getCurrentUserSettings(fetch);
+	const viewerPaths = await getCurrentUserAllowedViewerPaths(fetch);
 
 	return {
-		viewerPaths,
-		settings
+		viewerPaths
 	};
 }

src/routes/viewer-paths/+page.svelte

@@ -3,8 +3,6 @@
 
 	/** @type {string[]} */
 	const viewerPaths = $page.data.viewerPaths;
-	/** @type {import('$lib/types').UserSettings} */
-	const settings = $page.data.settings;
 </script>
 
 <h1 class="fw-light mb-3">Viewer paths</h1>
@@ -18,17 +16,14 @@
 <p>
 	Note that access to image data is restricted to OME-Zarrs within certain paths (and their
 	subfolders).
-	{#if settings.project_dir || viewerPaths.length > 0}
+	{#if viewerPaths.length > 0}
 		The list of paths accessible to the current user includes:
 	{:else}
 		The list of paths accessible to the current user is empty.
 	{/if}
 </p>
 
 <ul>
-	{#if settings.project_dir}
-		<li><code>{settings.project_dir}</code></li>
-	{/if}
 	{#each viewerPaths as viewerPath}
 		<li><code>{viewerPath}</code></li>
 	{/each}

tests/download_token_test.spec.js

@@ -0,0 +1,19 @@
+import { expect, test } from '@playwright/test';
+import { waitPageLoading } from './utils.js';
+import path from 'path';
+import fs from 'fs/promises';
+import os from 'os';
+
+test('Download token test', async ({ page }) => {
+	await page.goto('/profile');
+	await waitPageLoading(page);
+	await page.getByRole('button', { name: '[email protected]' }).click();
+	const downloadPromise = page.waitForEvent('download');
+	await page.getByRole('link', { name: 'Download token' }).click();
+	const download = await downloadPromise;
+	const file = path.join(os.tmpdir(), download.suggestedFilename());
+	await download.saveAs(file);
+	const data = (await fs.readFile(file)).toString();
+	expect(data.length).toBeGreaterThan(0);
+	await fs.rm(file);
+});