@djangocfg/api 2.1.333 → 2.1.335

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@djangocfg/api",
-  "version": "2.1.333",
+  "version": "2.1.335",
   "description": "Auto-generated TypeScript API client with React hooks, SWR integration, and Zod validation for Django REST Framework backends",
   "keywords": [
     "django",
@@ -79,7 +79,7 @@
   "devDependencies": {
     "@types/node": "^24.7.2",
     "@types/react": "^19.1.0",
-    "@djangocfg/typescript-config": "^2.1.333",
+    "@djangocfg/typescript-config": "^2.1.335",
     "next": "^16.2.2",
     "react": "^19.1.0",
     "tsup": "^8.5.0",

package/src/_api/generated/_cfg_accounts/api.ts

@@ -61,6 +61,18 @@ export class API {
   setLocale(locale: string | null): void { auth.setLocale(locale); }
   getApiKey(): string | null { return auth.getApiKey(); }
   setApiKey(key: string | null): void { auth.setApiKey(key); }
+
+  // ── 401 handling ────────────────────────────────────────────────────────
+  /** Fired only on terminal 401 (after refresh+retry path is exhausted). */
+  onUnauthorized(cb: ((response: Response) => void) | null): void {
+    auth.onUnauthorized(cb);
+  }
+  /** Provide a refresh strategy. See `auth.setRefreshHandler` for the contract. */
+  setRefreshHandler(
+    fn: ((refreshToken: string) => Promise<{ access: string; refresh?: string } | null>) | null,
+  ): void {
+    auth.setRefreshHandler(fn);
+  }
 }
 
 export {  };

package/src/_api/generated/_cfg_centrifugo/api.ts

@@ -61,6 +61,18 @@ export class API {
   setLocale(locale: string | null): void { auth.setLocale(locale); }
   getApiKey(): string | null { return auth.getApiKey(); }
   setApiKey(key: string | null): void { auth.setApiKey(key); }
+
+  // ── 401 handling ────────────────────────────────────────────────────────
+  /** Fired only on terminal 401 (after refresh+retry path is exhausted). */
+  onUnauthorized(cb: ((response: Response) => void) | null): void {
+    auth.onUnauthorized(cb);
+  }
+  /** Provide a refresh strategy. See `auth.setRefreshHandler` for the contract. */
+  setRefreshHandler(
+    fn: ((refreshToken: string) => Promise<{ access: string; refresh?: string } | null>) | null,
+  ): void {
+    auth.setRefreshHandler(fn);
+  }
 }
 
 export {  };

package/src/_api/generated/_cfg_totp/api.ts

@@ -61,6 +61,18 @@ export class API {
   setLocale(locale: string | null): void { auth.setLocale(locale); }
   getApiKey(): string | null { return auth.getApiKey(); }
   setApiKey(key: string | null): void { auth.setApiKey(key); }
+
+  // ── 401 handling ────────────────────────────────────────────────────────
+  /** Fired only on terminal 401 (after refresh+retry path is exhausted). */
+  onUnauthorized(cb: ((response: Response) => void) | null): void {
+    auth.onUnauthorized(cb);
+  }
+  /** Provide a refresh strategy. See `auth.setRefreshHandler` for the contract. */
+  setRefreshHandler(
+    fn: ((refreshToken: string) => Promise<{ access: string; refresh?: string } | null>) | null,
+  ): void {
+    auth.setRefreshHandler(fn);
+  }
 }
 
 export {  };

package/src/_api/generated/helpers/auth.ts

@@ -105,6 +105,21 @@ let _baseUrlOverride: string | null = null;
 let _withCredentials = true;
 let _onUnauthorized: ((response: Response) => void) | null = null;
 
+/**
+ * User-supplied refresh handler. Receives the current refresh token,
+ * must return a fresh access (and optional refresh) pair or null on failure.
+ * Set once at app bootstrap via `auth.setRefreshHandler(...)`.
+ */
+type RefreshResult = { access: string; refresh?: string } | null;
+type RefreshHandler = (refreshToken: string) => Promise<RefreshResult>;
+let _refreshHandler: RefreshHandler | null = null;
+
+/** Single-flight: every concurrent 401 awaits the same refresh. */
+let _refreshInflight: Promise<string | null> | null = null;
+
+/** Marker header — set on retried requests so we never loop on 401. */
+const RETRY_MARKER = 'X-Auth-Retry';
+
 /**
  * Captured reference to the shared Hey API client. Set exactly once by
  * `installAuthOnClient(client)` (called from client.gen.ts). All `auth.set*`
@@ -192,11 +207,62 @@ export const auth = {
   },
 
   // ── 401 handler ───────────────────────────────────────────────────
+  /**
+   * Fired when the server returns 401 AND no refresh path recovers it
+   * (no refresh token, no refresh handler, refresh failed, or retry
+   * still 401). The app should clear local state and redirect to login.
+   *
+   * NOT fired for 401 that gets transparently recovered by the refresh
+   * handler — those are invisible to callers.
+   */
   onUnauthorized(cb: ((response: Response) => void) | null): void {
     _onUnauthorized = cb;
   },
+
+  /**
+   * Register the refresh strategy. The handler receives the current
+   * refresh token and must call your refresh endpoint, returning
+   * `{ access, refresh? }` on success or `null` on failure.
+   *
+   * @example
+   *   auth.setRefreshHandler(async (refresh) => {
+   *     const { data } = await Auth.tokenRefreshCreate({ body: { refresh } });
+   *     return data ? { access: data.access, refresh: data.refresh } : null;
+   *   });
+   */
+  setRefreshHandler(fn: RefreshHandler | null): void {
+    _refreshHandler = fn;
+  },
 };
 
+/**
+ * Run the user-supplied refresh handler under single-flight, persist
+ * the new tokens, and return the fresh access token (or null on any
+ * failure path). All concurrent 401s share the same in-flight promise.
+ */
+async function tryRefresh(): Promise<string | null> {
+  if (_refreshInflight) return _refreshInflight;
+  if (!_refreshHandler) return null;
+  const refresh = auth.getRefreshToken();
+  if (!refresh) return null;
+
+  _refreshInflight = (async () => {
+    try {
+      const result = await _refreshHandler!(refresh);
+      if (!result?.access) return null;
+      auth.setToken(result.access);
+      if (result.refresh) auth.setRefreshToken(result.refresh);
+      return result.access;
+    } catch {
+      return null;
+    } finally {
+      _refreshInflight = null;
+    }
+  })();
+
+  return _refreshInflight;
+}
+
 /**
  * Wire the shared client to the global auth store. Called exactly
  * once from `client.gen.ts` (post-processed) right after
@@ -229,11 +295,44 @@ export function installAuthOnClient(client: HeyClient): void {
     return request;
   });
 
-  client.interceptors.response.use((response) => {
-    if (response.status === 401 && _onUnauthorized) {
-      try { _onUnauthorized(response); } catch {}
+  client.interceptors.response.use(async (response, request) => {
+    if (response.status !== 401) return response;
+
+    // Already retried once — give up to avoid loops.
+    if (request.headers.get(RETRY_MARKER)) {
+      if (_onUnauthorized) {
+        try { _onUnauthorized(response); } catch {}
+      }
+      return response;
+    }
+
+    const newToken = await tryRefresh();
+    if (!newToken) {
+      if (_onUnauthorized) {
+        try { _onUnauthorized(response); } catch {}
+      }
+      return response;
+    }
+
+    // Retry the original request once with the new token. We mutate a
+    // clone so the original Request body (already consumed by the
+    // failed call) doesn't trip "body already used".
+    const retry = request.clone();
+    retry.headers.set('Authorization', `Bearer ${newToken}`);
+    retry.headers.set(RETRY_MARKER, '1');
+    try {
+      const retried = await fetch(retry);
+      if (retried.status === 401 && _onUnauthorized) {
+        try { _onUnauthorized(retried); } catch {}
+      }
+      return retried;
+    } catch {
+      // Network error on retry — surface the original 401.
+      if (_onUnauthorized) {
+        try { _onUnauthorized(response); } catch {}
+      }
+      return response;
     }
-    return response;
   });
 }