Forbedre utloggingsvarsel (#350)

Beregner tid for utloggingsvarsel basert på `expires_in_seconds` og
regner om dette til lokal tid. Dermed slipper vi problemer hvor brukere
har feil klokkeslett på maskinen sin.

Rydder i logout-warning for bedre lesbarhet.

Skriver enhetstester for auth-hjelperen.

Flytter også logout-warning ut av controller-mappe (som den eneste
komponenten der) og legger den i src sammen med de andre.

Foreslår å bumpe vitest fordi gammel versjon ikke fungerer med VS-code.

---------

Co-authored-by: Andreas Nordahl <[email protected]>

packages/client/package.json

@@ -27,12 +27,12 @@
         "@types/lodash.debounce": "4.0.9",
         "autoprefixer": "10.4.14",
         "jsdom": "24.0.0",
-        "msw": "2.3.0",
         "postcss": "8.4.27",
         "postcss-prefix-selector": "1.16.0",
         "rollup-plugin-minify-html-literals-v3": "1.3.3",
         "vite-bundle-visualizer": "1.2.1",
         "vite-tsconfig-paths": "4.2.0",
-        "vitest": "1.3.1"
+        "vitest": "1.6.0",
+        "msw": "2.3.0"
     }
 }

packages/client/src/helpers/auth.test.ts

@@ -0,0 +1,43 @@
+import { describe, expect, it } from "vitest";
+import { SessionData, transformSessionToAuth } from "./auth";
+
+describe("Auth helpers", () => {
+    describe("transformSessionToAuth", () => {
+        it("correctly uses expire_in_seconds when transforming to local time", () => {
+            const mockCurrentISODate = "2021-10-10T10:10:00.000Z";
+
+            // Note: Discrepancy between ISO dates and ends_in_seconds and expire_in_seconds
+            // This is intentional to test that the function does infact use the seconds and not the time stamps.
+            const mockSessionData: SessionData = {
+                session: {
+                    created_at: "2021-10-10T10:00:00.000Z",
+                    ends_at: "2021-10-10T16:00:00.000Z",
+                    timeout_at: "2021-10-10T16:00:00.000Z",
+                    ends_in_seconds: 3600,
+                    active: true,
+                    timeout_in_seconds: 3600,
+                },
+                tokens: {
+                    expire_at: "2021-10-10T11:05:00.000Z",
+                    refreshed_at: "2021-10-10T12:05:00.000Z",
+                    expire_in_seconds: 1800,
+                    next_auto_refresh_in_seconds: 1800,
+                    refresh_cooldown: false,
+                    refresh_cooldown_seconds: 0,
+                },
+            };
+
+            vi.useFakeTimers();
+            vi.setSystemTime(mockCurrentISODate);
+
+            const authData = transformSessionToAuth(mockSessionData);
+
+            expect(authData.sessionExpireAtLocal).toBe(
+                "2021-10-10T11:10:00.000Z",
+            );
+            expect(authData.tokenExpireAtLocal).toBe(
+                "2021-10-10T10:40:00.000Z",
+            );
+        });
+    });
+});

packages/client/src/helpers/auth.ts

@@ -1,4 +1,4 @@
-export type AuthData = {
+export type SessionData = {
     session: {
         created_at: string;
         ends_at: string;
@@ -25,14 +25,9 @@ export async function fetchSession() {
             credentials: "include",
         });
 
-        return await sessionResponse.json();
+        return (await sessionResponse.json()) as SessionData;
     } catch (error) {
-        console.log(`User is not logged in`);
-        return {
-            authenticated: false,
-            name: "",
-            securityLevel: "",
-        };
+        return null;
     }
 }
 
@@ -44,23 +39,25 @@ export async function fetchRenew() {
             credentials: "include",
         });
 
-        return await sessionResponse.json();
+        return (await sessionResponse.json()) as SessionData;
     } catch (error) {
-        console.log(`User is not logged in`);
-        return {
-            authenticated: false,
-            name: "",
-            securityLevel: "",
-        };
+        return null;
     }
 }
 
-export function getSecondsToExpiration(expiration: string) {
-    const now = new Date().getTime();
-    const expires = new Date(expiration).getTime();
-    return Math.ceil((expires - now) / 1000);
-}
+export function transformSessionToAuth(session: SessionData) {
+    const sessionExpireInSeconds = session.session.ends_in_seconds;
+    const tokenExpireInSeconds = session.tokens.expire_in_seconds;
+
+    const sessionExpireAtLocal = new Date(
+        new Date().getTime() + sessionExpireInSeconds * 1000,
+    ).toISOString();
+    const tokenExpireAtLocal = new Date(
+        new Date().getTime() + tokenExpireInSeconds * 1000,
+    ).toISOString();
 
-export function fakeExpirationTime(seconds: number) {
-    return new Date(Date.now() + seconds * 1000).toISOString();
+    return {
+        sessionExpireAtLocal,
+        tokenExpireAtLocal,
+    };
 }