Tria/emaui
1
0
Fork 0
mirror of https://github.com/Tria-plc/emaui.git synced 2026-08-26 13:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: update session management to prioritize cookie storage and enhance token retrieval logic

Browse Source
This commit is contained in:
estifanos
2026-08-01 07:52:46 +00:00
parent d16d9840ba
commit 5a95358ea0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@@ -37,8 +37,8 @@ emaui/
``` ```
### libs/api ### libs/api
- `base-api/` — RTK Query `createApi` instance with `prepareHeaders` that injects the Bearer token from Redux state or localStorage. - `base-api/` — RTK Query `createApi` instance with `prepareHeaders` that injects the Bearer token from Redux state or storage.
- `session/` — `resolveTokenFromStorage()` reads from `localStorage` keys or `auth-token` cookie. `resolveSessionContext()` merges Redux state token with storage fallback. - `session/` — `resolveTokenFromStorage()` reads the `auth-token` cookie first, falling back to `localStorage` for legacy pre-migration sessions. `resolveSessionContext()` merges Redux state token with storage fallback.
- `query-and-mutation/` — Generic `useApiQuery` / `useApiMutation` wrappers for one-off API calls without defining a dedicated endpoint file. - `query-and-mutation/` — Generic `useApiQuery` / `useApiMutation` wrappers for one-off API calls without defining a dedicated endpoint file.
### libs/ui ### libs/ui
@@ -55,10 +55,10 @@ emaui/
1. User submits the login form (LoginForm / LoginPage). 1. User submits the login form (LoginForm / LoginPage).
2. The form calls the `login` RTK Query mutation (backoffice) or a plain `fetch` (portal). 2. The form calls the `login` RTK Query mutation (backoffice) or a plain `fetch` (portal).
3. On success, `loginSuccess` action is dispatched → Redux `auth` slice stores `token` and `user`; `authStorage.setToken()` persists the token to `localStorage`. 3. On success, `loginSuccess` action is dispatched → Redux `auth` slice stores `token` and `user`; `authStorage.setToken()` persists the token to a cookie (both apps call `configureAuthStorage(prefix, true)`).
4. `baseApi`'s `prepareHeaders` reads the token via `resolveSessionContext(getState())` and attaches `Authorization: Bearer <token>` to every RTK Query request. 4. `baseApi`'s `prepareHeaders` reads the token via `resolveSessionContext(getState())` and attaches `Authorization: Bearer <token>` to every RTK Query request.
5. `ProtectedRoute` checks `localStorage` for the token key on every navigation — if absent, redirects to `/login`. 5. `ProtectedRoute` checks `authStorage`/the token cookie on every navigation — if absent, redirects to `/login`.
6. `logout` action clears Redux state and calls `authStorage.clear()` to remove all localStorage keys. 6. `logout` action clears Redux state and calls `authStorage.clear()` to remove all auth cookies.
--- ---

2
apps/portal/src/app/store/index.ts
View File

@@ -11,7 +11,7 @@ import {
} from "@ema-platform/auth"; } from "@ema-platform/auth";
import type { AuthUser, CurrentProfile } from "@ema-platform/auth"; import type { AuthUser, CurrentProfile } from "@ema-platform/auth";
configureAuthStorage("ema-portal"); configureAuthStorage("ema-portal", true);
const preloadedAuth = (() => { const preloadedAuth = (() => {
const token = authStorage.getToken(); const token = authStorage.getToken();

2
libs/api/src/lib/session/index.ts
View File

@@ -14,7 +14,7 @@ const TOKEN_STORAGE_KEYS = [
] as const; ] as const;
export function resolveTokenFromStorage(): string | undefined { export function resolveTokenFromStorage(): string | undefined {
// cookie first (backoffice stores tokens there), then localStorage (portal / legacy) // cookie first, then localStorage (legacy pre-migration sessions)
for (const key of TOKEN_STORAGE_KEYS) { for (const key of TOKEN_STORAGE_KEYS) {
const cookie = Cookies.get(key); const cookie = Cookies.get(key);
if (cookie) return cookie; if (cookie) return cookie;