From f8fb234e379862941e13c4df842643283eebe515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elida=20Kj=C3=B8pstad?= <77298927+Stelaug@users.noreply.github.com> Date: Thu, 19 Nov 2026 18:52:00 +0100 Subject: [PATCH 1/2] feat: uses is logged out if they change their token --- Backend/logic/UserLogicBackend.ts | 4 ++-- Frontend/src/FrontendLogic/LogicConnection.ts | 15 ++++++++++++++- Frontend/src/context/AuthContext.tsx | 9 +++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/Backend/logic/UserLogicBackend.ts b/Backend/logic/UserLogicBackend.ts index 6042858..ec35ae8 100644 --- a/Backend/logic/UserLogicBackend.ts +++ b/Backend/logic/UserLogicBackend.ts @@ -114,8 +114,8 @@ export async function RequireUser(token: string | null, userId: number | null): const { rows } = await pool.query('SELECT user_id FROM users WHERE token = $1', [token]) if (rows.length === 0 || Number(rows[0].user_id) !== Number(userId)) { - throw new GraphQLError('Not allowed.', { - extensions: { code: 'FORBIDDEN' } + throw new GraphQLError('Your session is invalid or has expired.', { + extensions: { code: 'UNAUTHENTICATED' } }) } } diff --git a/Frontend/src/FrontendLogic/LogicConnection.ts b/Frontend/src/FrontendLogic/LogicConnection.ts index 1e08489..311f74c 100644 --- a/Frontend/src/FrontendLogic/LogicConnection.ts +++ b/Frontend/src/FrontendLogic/LogicConnection.ts @@ -19,7 +19,14 @@ export async function Gql(query: string, variables: Record): } if (!res.ok) throw new Error(`Request failed: ${res.status}`) const json = await res.json() - if (json.errors) throw new Error(json.errors[0].message) + if (json.errors?.length) { + // NEW: a bad token logs the user out + if (json.errors.some((e: { extensions?: { code?: string } }) => + e.extensions?.code === 'UNAUTHENTICATED')) { + onUnauthenticated?.() + } + throw new Error(json.errors[0].message) + } return json.data } @@ -33,3 +40,9 @@ export function GetStoredToken(): string | null { return null } } + +let onUnauthenticated: (() => void) | null = null + +export const SetUnauthenticatedHandler = (handler: (() => void) | null) => { + onUnauthenticated = handler +} \ No newline at end of file diff --git a/Frontend/src/context/AuthContext.tsx b/Frontend/src/context/AuthContext.tsx index 91333d7..7464215 100644 --- a/Frontend/src/context/AuthContext.tsx +++ b/Frontend/src/context/AuthContext.tsx @@ -1,6 +1,8 @@ import * as React from 'react' import type { User } from '../../../Backend/logic/UserLogicBackend' import { SaveUser, ClearUser, GetSavedUser } from '../FrontendLogic/UserLogicFrontend' +import { useEffect } from 'react' +import { SetUnauthenticatedHandler } from '../FrontendLogic/LogicConnection' interface AuthContextValue { user: User | null @@ -22,6 +24,13 @@ export function AuthProvider({ children }: { children: React.ReactNode }) { setUser(null) } + useEffect(() => { + SetUnauthenticatedHandler(() => { + Logout() + }) + return () => SetUnauthenticatedHandler(null) + }, [Logout]) + return ( {children} From 1f55334b6f0f304973bfd29e1a792199e25abd5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elida=20Kj=C3=B8pstad?= <77298927+Stelaug@users.noreply.github.com> Date: Thu, 19 Nov 2026 19:05:35 +0100 Subject: [PATCH 2/2] fix: opdates tests and fixes a lint warning in authcontext --- Backend/tests/TokenBackend.test.ts | 8 ++++---- Frontend/src/context/AuthContext.tsx | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Backend/tests/TokenBackend.test.ts b/Backend/tests/TokenBackend.test.ts index ef3b322..b3956f6 100644 --- a/Backend/tests/TokenBackend.test.ts +++ b/Backend/tests/TokenBackend.test.ts @@ -218,8 +218,8 @@ describe('RequireUser', () => { const error = await RejectionOf(RequireUser('unknown-token', 1)) - expect(error.message).toBe('Not allowed.') - expect(error.extensions.code).toBe('FORBIDDEN') + expect(error.message).toBe('Your session is invalid or has expired.') + expect(error.extensions.code).toBe('UNAUTHENTICATED') }) it("rejects a valid token that belongs to a different user's id", async () => { @@ -227,7 +227,7 @@ describe('RequireUser', () => { const error = await RejectionOf(RequireUser(TOKEN, 1)) - expect(error.extensions.code).toBe('FORBIDDEN') + expect(error.extensions.code).toBe('UNAUTHENTICATED') }) it('rejects a valid token when no user id is given', async () => { @@ -235,7 +235,7 @@ describe('RequireUser', () => { const error = await RejectionOf(RequireUser(TOKEN, null)) - expect(error.extensions.code).toBe('FORBIDDEN') + expect(error.extensions.code).toBe('UNAUTHENTICATED') }) it('lets the request through when the token belongs to that user', async () => { diff --git a/Frontend/src/context/AuthContext.tsx b/Frontend/src/context/AuthContext.tsx index 7464215..10d3516 100644 --- a/Frontend/src/context/AuthContext.tsx +++ b/Frontend/src/context/AuthContext.tsx @@ -1,7 +1,7 @@ import * as React from 'react' import type { User } from '../../../Backend/logic/UserLogicBackend' import { SaveUser, ClearUser, GetSavedUser } from '../FrontendLogic/UserLogicFrontend' -import { useEffect } from 'react' +import { useCallback, useEffect } from 'react' import { SetUnauthenticatedHandler } from '../FrontendLogic/LogicConnection' interface AuthContextValue { @@ -19,10 +19,10 @@ export function AuthProvider({ children }: { children: React.ReactNode }) { setUser(user) } - const Logout = () => { - ClearUser() + const Logout = useCallback(() => { setUser(null) - } + ClearUser() + }, []) useEffect(() => { SetUnauthenticatedHandler(() => {