selfhostyourtech/reflector
2
0
Fork 0
mirror of https://github.com/Monadical-SAS/reflector.git synced 2025-12-20 20:29:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove timeout-based auth session logic (#649)

Browse Source 
* remove timeout-based auth session logic

* remove timeout-based auth session logic

---------

Co-authored-by: Igor Loskutov <igor.loskutoff@gmail.com>
This commit is contained in:
Igor Monadical
2025-09-15 14:19:10 -04:00
committed by GitHub
parent 5f143fe364
commit 3f1fe8c9bf
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
www/app/lib/apiClient.tsx
View File

@@ -3,8 +3,10 @@
import createClient from "openapi-fetch"; import createClient from "openapi-fetch";
import type { paths } from "../reflector-api"; import type { paths } from "../reflector-api";
import createFetchClient from "openapi-react-query"; import createFetchClient from "openapi-react-query";
import { assertExistsAndNonEmptyString } from "./utils"; import { assertExistsAndNonEmptyString, parseNonEmptyString } from "./utils";
import { isBuildPhase } from "./next"; import { isBuildPhase } from "./next";
import { getSession } from "next-auth/react";
import { assertExtendedToken } from "./types";
export const API_URL = !isBuildPhase export const API_URL = !isBuildPhase
? assertExistsAndNonEmptyString( ? assertExistsAndNonEmptyString(
@@ -21,29 +23,29 @@ export const client = createClient<paths>({
baseUrl: API_URL, baseUrl: API_URL,
}); });
const waitForAuthTokenDefinitivePresenceOrAbscence = async () => { // will assert presence/absence of login initially
let tries = 0; const initialSessionPromise = getSession();
let time = 0;
const STEP = 100; const waitForAuthTokenDefinitivePresenceOrAbsence = async () => {
while (currentAuthToken === undefined) { const initialSession = await initialSessionPromise;
await new Promise((resolve) => setTimeout(resolve, STEP)); if (currentAuthToken === undefined) {
time += STEP; currentAuthToken =
tries++; initialSession === null
// most likely first try is more than enough, if it's more there's already something weird happens ? null
if (tries > 10) { : assertExtendedToken(initialSession).accessToken;
// even when there's no auth assumed at all, we probably should explicitly call configureApiAuth(null)
throw new Error(
`Could not get auth token definitive presence/absence in ${time}ms. not calling configureApiAuth?`,
);
}
} }
// otherwise already overwritten by external forces
return currentAuthToken;
}; };
client.use({ client.use({
async onRequest({ request }) { async onRequest({ request }) {
await waitForAuthTokenDefinitivePresenceOrAbscence(); const token = await waitForAuthTokenDefinitivePresenceOrAbsence();
if (currentAuthToken) { if (token !== null) {
request.headers.set("Authorization", `Bearer ${currentAuthToken}`); request.headers.set(
"Authorization",
`Bearer ${parseNonEmptyString(token)}`,
);
} }
// XXX Only set Content-Type if not already set (FormData will set its own boundary) // XXX Only set Content-Type if not already set (FormData will set its own boundary)
// This is a work around for uploading file, we're passing a formdata // This is a work around for uploading file, we're passing a formdata

10
www/app/lib/types.ts
View File

@@ -21,7 +21,7 @@ export interface CustomSession extends Session {
// assumption that JWT is JWTWithAccessToken - we set it in jwt callback of auth; typing isn't strong around there // assumption that JWT is JWTWithAccessToken - we set it in jwt callback of auth; typing isn't strong around there
// but the assumption is crucial to auth working // but the assumption is crucial to auth working
export const assertExtendedToken = <T>( export const assertExtendedToken = <T>(
t: T, t: Exclude<T, null | undefined>,
): T & { ): T & {
accessTokenExpires: number; accessTokenExpires: number;
accessToken: string; accessToken: string;
@@ -45,7 +45,7 @@ export const assertExtendedToken = <T>(
}; };
export const assertExtendedTokenAndUserId = <U, T extends { user?: U }>( export const assertExtendedTokenAndUserId = <U, T extends { user?: U }>(
t: T, t: Exclude<T, null | undefined>,
): T & { ): T & {
accessTokenExpires: number; accessTokenExpires: number;
accessToken: string; accessToken: string;
@@ -55,7 +55,7 @@ export const assertExtendedTokenAndUserId = <U, T extends { user?: U }>(
} => { } => {
const extendedToken = assertExtendedToken(t); const extendedToken = assertExtendedToken(t);
if (typeof (extendedToken.user as any)?.id === "string") { if (typeof (extendedToken.user as any)?.id === "string") {
return t as T & { return t as Exclude<T, null | undefined> & {
accessTokenExpires: number; accessTokenExpires: number;
accessToken: string; accessToken: string;
user: U & { user: U & {
@@ -67,7 +67,9 @@ export const assertExtendedTokenAndUserId = <U, T extends { user?: U }>(
}; };
// best attempt to check the session is valid // best attempt to check the session is valid
export const assertCustomSession = <S extends Session>(s: S): CustomSession => { export const assertCustomSession = <T extends Session>(
s: Exclude<T, null | undefined>,
): CustomSession => {
const r = assertExtendedTokenAndUserId(s); const r = assertExtendedTokenAndUserId(s);
// no other checks for now // no other checks for now
return r as CustomSession; return r as CustomSession;