KI-AGENT: Persistente App-Sessions mit Refresh-Tokens ergänzen
This commit is contained in:
@@ -1,8 +1,22 @@
|
||||
import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
|
||||
|
||||
import { fetchMe, loginWithEmailPassword, MeResponse, switchTenantRequest, Tenant } from '@/src/lib/api';
|
||||
import {
|
||||
fetchMe,
|
||||
loginWithEmailPassword,
|
||||
logoutSession,
|
||||
MeResponse,
|
||||
isAuthenticationError,
|
||||
refreshAuthSession,
|
||||
switchTenantRequest,
|
||||
Tenant,
|
||||
} from '@/src/lib/api';
|
||||
import { hydrateApiBaseUrl } from '@/src/lib/server-config';
|
||||
import { clearStoredToken, getStoredToken, setStoredToken, tokenStorageInfo } from '@/src/lib/token-storage';
|
||||
import {
|
||||
clearStoredToken,
|
||||
getStoredSession,
|
||||
setStoredSession,
|
||||
tokenStorageInfo,
|
||||
} from '@/src/lib/token-storage';
|
||||
|
||||
export type AuthUser = MeResponse['user'];
|
||||
|
||||
@@ -27,6 +41,7 @@ type AuthContextValue = {
|
||||
|
||||
const AuthContext = createContext<AuthContextValue | undefined>(undefined);
|
||||
const BOOTSTRAP_TIMEOUT_MS = 20000;
|
||||
const SESSION_REFRESH_INTERVAL_MS = 5 * 60 * 60 * 1000;
|
||||
|
||||
function normalizeTenantId(value: number | string | null | undefined): number | null {
|
||||
if (value === null || value === undefined || value === '') {
|
||||
@@ -52,6 +67,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||
const [isBootstrapping, setIsBootstrapping] = useState(true);
|
||||
const [bootstrapError, setBootstrapError] = useState<string | null>(null);
|
||||
const [token, setToken] = useState<string | null>(null);
|
||||
const [refreshToken, setRefreshToken] = useState<string | null>(null);
|
||||
const [user, setUser] = useState<AuthUser | null>(null);
|
||||
const [tenants, setTenants] = useState<Tenant[]>([]);
|
||||
const [activeTenantId, setActiveTenantId] = useState<number | null>(null);
|
||||
@@ -80,11 +96,15 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||
);
|
||||
|
||||
const logout = useCallback(async () => {
|
||||
if (refreshToken) {
|
||||
void logoutSession(refreshToken).catch(() => undefined);
|
||||
}
|
||||
await clearStoredToken();
|
||||
setToken(null);
|
||||
setRefreshToken(null);
|
||||
setBootstrapError(null);
|
||||
resetSession();
|
||||
}, [resetSession]);
|
||||
}, [refreshToken, resetSession]);
|
||||
|
||||
const refreshUser = useCallback(async () => {
|
||||
if (!token) {
|
||||
@@ -101,6 +121,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||
|
||||
const resetLocalSession = useCallback(async () => {
|
||||
setToken(null);
|
||||
setRefreshToken(null);
|
||||
setBootstrapError(null);
|
||||
setIsBootstrapping(false);
|
||||
resetSession();
|
||||
@@ -117,19 +138,27 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||
await withTimeout(
|
||||
(async () => {
|
||||
await hydrateApiBaseUrl();
|
||||
const storedToken = await getStoredToken();
|
||||
const storedSession = await getStoredSession();
|
||||
|
||||
if (!storedToken) {
|
||||
if (!storedSession) {
|
||||
if (bootstrapRunRef.current !== runId) return;
|
||||
setToken(null);
|
||||
resetSession();
|
||||
return;
|
||||
}
|
||||
|
||||
await hydrateSession(storedToken);
|
||||
let activeSession = storedSession;
|
||||
try {
|
||||
await hydrateSession(activeSession.token);
|
||||
} catch {
|
||||
activeSession = await refreshAuthSession(activeSession.refreshToken);
|
||||
await setStoredSession(activeSession);
|
||||
await hydrateSession(activeSession.token);
|
||||
}
|
||||
|
||||
if (bootstrapRunRef.current !== runId) return;
|
||||
setToken(storedToken);
|
||||
setToken(activeSession.token);
|
||||
setRefreshToken(activeSession.refreshToken);
|
||||
})(),
|
||||
BOOTSTRAP_TIMEOUT_MS,
|
||||
'Die mobile Session konnte nicht rechtzeitig initialisiert werden.'
|
||||
@@ -137,9 +166,12 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||
} catch (err) {
|
||||
if (bootstrapRunRef.current === runId) {
|
||||
setToken(null);
|
||||
setRefreshToken(null);
|
||||
resetSession();
|
||||
setBootstrapError(err instanceof Error ? err.message : 'Die mobile Session konnte nicht initialisiert werden.');
|
||||
void clearStoredToken().catch(() => undefined);
|
||||
if (isAuthenticationError(err)) {
|
||||
void clearStoredToken().catch(() => undefined);
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
if (bootstrapRunRef.current === runId) {
|
||||
@@ -154,28 +186,49 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||
|
||||
const login = useCallback(
|
||||
async (email: string, password: string) => {
|
||||
const nextToken = await loginWithEmailPassword(email, password);
|
||||
await setStoredToken(nextToken);
|
||||
await hydrateSession(nextToken);
|
||||
setToken(nextToken);
|
||||
const session = await loginWithEmailPassword(email, password);
|
||||
await setStoredSession(session);
|
||||
await hydrateSession(session.token);
|
||||
setToken(session.token);
|
||||
setRefreshToken(session.refreshToken);
|
||||
},
|
||||
[hydrateSession]
|
||||
);
|
||||
|
||||
const switchTenant = useCallback(
|
||||
async (tenantId: number) => {
|
||||
if (!token) {
|
||||
if (!token || !refreshToken) {
|
||||
throw new Error('No active session found.');
|
||||
}
|
||||
|
||||
const nextToken = await switchTenantRequest(tenantId, token);
|
||||
await setStoredToken(nextToken);
|
||||
await hydrateSession(nextToken);
|
||||
setToken(nextToken);
|
||||
const session = await switchTenantRequest(tenantId, token, refreshToken);
|
||||
await setStoredSession(session);
|
||||
await hydrateSession(session.token);
|
||||
setToken(session.token);
|
||||
setRefreshToken(session.refreshToken);
|
||||
},
|
||||
[token, hydrateSession]
|
||||
[token, refreshToken, hydrateSession]
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
if (!refreshToken) return;
|
||||
|
||||
const interval = setInterval(() => {
|
||||
void (async () => {
|
||||
try {
|
||||
const session = await refreshAuthSession(refreshToken);
|
||||
await setStoredSession(session);
|
||||
setToken(session.token);
|
||||
setRefreshToken(session.refreshToken);
|
||||
} catch {
|
||||
// Bei einem temporären Netzfehler bleibt die gespeicherte Session erhalten.
|
||||
}
|
||||
})();
|
||||
}, SESSION_REFRESH_INTERVAL_MS);
|
||||
|
||||
return () => clearInterval(interval);
|
||||
}, [refreshToken]);
|
||||
|
||||
const activeTenant = useMemo(
|
||||
() => tenants.find((tenant) => Number(tenant.id) === activeTenantId) || null,
|
||||
[activeTenantId, tenants]
|
||||
|
||||
Reference in New Issue
Block a user