flfeders/FEDEO
2
1
Fork 0
Code Issues 102 Pull Requests Actions Packages Projects 22 Releases Wiki Activity

KI-AGENT: Persistente App-Sessions mit Refresh-Tokens ergänzen

Browse Source
This commit is contained in:
florianfederspiel
2026-07-20 22:01:08 +02:00
parent d8273e794d
commit 657a4f9e85
11 changed files with 405 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
mobile/src/lib/api.ts
View File

@@ -131,6 +131,11 @@ export type MeResponse = {
permissions: string[];
};
export type AuthSession = {
token: string;
refreshToken: string;
};
export type EncodedLabelRow = {
dataType: 'pixels' | 'void' | 'check';
rowNumber: number;
@@ -199,6 +204,20 @@ type RequestOptions = {
timeoutMs?: number;
};
export class ApiError extends Error {
constructor(
message: string,
public readonly status: number
) {
super(message);
this.name = 'ApiError';
}
}
export function isAuthenticationError(error: unknown): boolean {
return error instanceof ApiError && error.status === 401;
}
export type MatrixStatus = {
enabled?: boolean;
ready?: boolean;
@@ -363,7 +382,7 @@ export async function apiRequest<T>(path: string, options: RequestOptions = {}):
(payload as { message?: string; error?: string } | null)?.message ||
(payload as { message?: string; error?: string } | null)?.error ||
`Request failed (${response.status}) for ${path}`;
throw new Error(message);
throw new ApiError(message, response.status);
}
return payload as T;
@@ -399,7 +418,7 @@ async function apiFormRequest<T>(path: string, token: string, formData: FormData
(payload as { message?: string; error?: string } | null)?.message ||
(payload as { message?: string; error?: string } | null)?.error ||
`Request failed (${response.status}) for ${path}`;
throw new Error(message);
throw new ApiError(message, response.status);
}
return payload as T;
@@ -629,17 +648,37 @@ export async function renderPrintLabel(
});
}
export async function loginWithEmailPassword(email: string, password: string): Promise<string> {
const payload = await apiRequest<{ token?: string }>('/auth/login', {
function requireAuthSession(payload: Partial<AuthSession>, action: string): AuthSession {
if (!payload?.token || !payload?.refreshToken) {
throw new Error(`${action} did not return a complete session.`);
}
return { token: payload.token, refreshToken: payload.refreshToken };
}
export async function loginWithEmailPassword(email: string, password: string): Promise<AuthSession> {
const payload = await apiRequest<Partial<AuthSession>>('/auth/login', {
method: 'POST',
body: { email, password },
});
if (!payload?.token) {
throw new Error('Login did not return a token.');
}
return requireAuthSession(payload, 'Login');
}
return payload.token;
export async function refreshAuthSession(refreshToken: string): Promise<AuthSession> {
const payload = await apiRequest<Partial<AuthSession>>('/auth/refresh', {
method: 'POST',
body: { refreshToken },
});
return requireAuthSession(payload, 'Session refresh');
}
export async function logoutSession(refreshToken: string): Promise<void> {
await apiRequest('/auth/logout', {
method: 'POST',
body: { refreshToken },
});
}
export async function fetchMe(token: string): Promise<MeResponse> {
@@ -666,18 +705,18 @@ export async function sendMobileTestPush(token: string): Promise<{ accepted: num
});
}
export async function switchTenantRequest(tenantId: number, token: string): Promise<string> {
const payload = await apiRequest<{ token?: string }>('/api/tenant/switch', {
export async function switchTenantRequest(
tenantId: number,
token: string,
refreshToken: string
): Promise<AuthSession> {
const payload = await apiRequest<Partial<AuthSession>>('/api/tenant/switch', {
method: 'POST',
token,
body: { tenant_id: String(tenantId) },
body: { tenant_id: String(tenantId), refreshToken },
});
if (!payload?.token) {
throw new Error('Tenant switch did not return a token.');
}
return payload.token;
return requireAuthSession(payload, 'Tenant switch');
}
export async function fetchTasks(token: string): Promise<Task[]> {

43
mobile/src/lib/token-storage.ts
View File

@@ -1,8 +1,15 @@
import * as SecureStore from 'expo-secure-store';
const TOKEN_KEY = 'fedeo.mobile.auth.token';
const REFRESH_TOKEN_KEY = 'fedeo.mobile.auth.refresh-token';
let memoryToken: string | null = null;
let memoryRefreshToken: string | null = null;
export type StoredSession = {
token: string;
refreshToken: string;
};
async function hasSecureStore(): Promise<boolean> {
try {
@@ -30,11 +37,41 @@ export async function setStoredToken(token: string): Promise<void> {
}
}
export async function clearStoredToken(): Promise<void> {
memoryToken = null;
export async function getStoredSession(): Promise<StoredSession | null> {
if (await hasSecureStore()) {
const [token, refreshToken] = await Promise.all([
SecureStore.getItemAsync(TOKEN_KEY),
SecureStore.getItemAsync(REFRESH_TOKEN_KEY),
]);
memoryToken = token;
memoryRefreshToken = refreshToken;
}
if (!memoryToken || !memoryRefreshToken) return null;
return { token: memoryToken, refreshToken: memoryRefreshToken };
}
export async function setStoredSession(session: StoredSession): Promise<void> {
memoryToken = session.token;
memoryRefreshToken = session.refreshToken;
if (await hasSecureStore()) {
await SecureStore.deleteItemAsync(TOKEN_KEY);
await Promise.all([
SecureStore.setItemAsync(TOKEN_KEY, session.token),
SecureStore.setItemAsync(REFRESH_TOKEN_KEY, session.refreshToken),
]);
}
}
export async function clearStoredToken(): Promise<void> {
memoryToken = null;
memoryRefreshToken = null;
if (await hasSecureStore()) {
await Promise.all([
SecureStore.deleteItemAsync(TOKEN_KEY),
SecureStore.deleteItemAsync(REFRESH_TOKEN_KEY),
]);
}
}

89
mobile/src/providers/auth-provider.tsx
View File

@@ -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]