@micha.bigler/ui-core-micha 2.1.5 → 2.1.7

package/dist/auth/apiClient.js

@@ -1,4 +1,4 @@
-// src/auth/apiClient.js
+// src/auth/apiClient.js (in your core library)
 import axios from "axios";
 import { CSRF_URL } from "./authConfig";
 const apiClient = axios.create({
@@ -21,25 +21,34 @@ function redirectToLoginOnce() {
     redirectingToLogin = true;
     window.location.assign("/login");
 }
-function isAuthish403(error) {
+apiClient.interceptors.response.use((response) => response, (error) => {
     var _a, _b, _c, _d;
     const status = (_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : null;
-    if (status !== 403)
-        return false;
     const data = (_d = (_c = error === null || error === void 0 ? void 0 : error.response) === null || _c === void 0 ? void 0 : _c.data) !== null && _d !== void 0 ? _d : {};
-    const detail = typeof (data === null || data === void 0 ? void 0 : data.detail) === "string" ? data.detail : "";
-    // Typical auth/session/CSRF related phrases (keep broad but not too broad)
-    return /csrf|authentication|credentials|not authenticated|session/i.test(detail);
-}
-apiClient.interceptors.response.use((response) => response, (error) => {
-    var _a, _b;
-    const status = (_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : null;
-    if (status === 401 || isAuthish403(error)) {
+    const detail = typeof data.detail === "string" ? data.detail : "";
+    const isStandard401 = status === 401;
+    const isDrfAuth403 = status === 403 && detail === "Authentication credentials were not provided.";
+    if (isStandard401 || isDrfAuth403) {
         redirectToLoginOnce();
     }
     return Promise.reject(error);
 });
+// --- NEW HELPER ---
+function getCookie(name) {
+    if (!isBrowser() || !document.cookie)
+        return null;
+    const xsrfCookies = document.cookie.split(';')
+        .map(c => c.trim())
+        .filter(c => c.startsWith(name + '='));
+    if (xsrfCookies.length === 0)
+        return null;
+    return decodeURIComponent(xsrfCookies[0].split('=')[1]);
+}
 export async function ensureCsrfToken() {
+    // OPTIMIZATION: If we already have the token, skip the network request
+    if (getCookie("csrftoken")) {
+        return;
+    }
     try {
         await apiClient.get(CSRF_URL);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@micha.bigler/ui-core-micha",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "private": false,

package/src/auth/apiClient.jsx

@@ -1,4 +1,4 @@
-// src/auth/apiClient.js
+// src/auth/apiClient.js (in your core library)
 import axios from "axios";
 import { CSRF_URL } from "./authConfig";
 
@@ -16,41 +16,46 @@ function isBrowser() {
 
 function redirectToLoginOnce() {
   if (!isBrowser()) return;
-
   const onLogin = window.location.pathname.startsWith("/login");
   if (onLogin) return;
-
   if (redirectingToLogin) return;
   redirectingToLogin = true;
-
   window.location.assign("/login");
 }
 
-function isAuthish403(error) {
-  const status = error?.response?.status ?? null;
-  if (status !== 403) return false;
-
-  const data = error?.response?.data ?? {};
-  const detail = typeof data?.detail === "string" ? data.detail : "";
-
-  // Typical auth/session/CSRF related phrases (keep broad but not too broad)
-  return /csrf|authentication|credentials|not authenticated|session/i.test(detail);
-}
-
 apiClient.interceptors.response.use(
   (response) => response,
   (error) => {
     const status = error?.response?.status ?? null;
+    const data = error?.response?.data ?? {};
+    const detail = typeof data.detail === "string" ? data.detail : "";
 
-    if (status === 401 || isAuthish403(error)) {
+    const isStandard401 = status === 401;
+    const isDrfAuth403 = status === 403 && detail === "Authentication credentials were not provided.";
+
+    if (isStandard401 || isDrfAuth403) {
       redirectToLoginOnce();
     }
-
     return Promise.reject(error);
   }
 );
 
+// --- NEW HELPER ---
+function getCookie(name) {
+  if (!isBrowser() || !document.cookie) return null;
+  const xsrfCookies = document.cookie.split(';')
+    .map(c => c.trim())
+    .filter(c => c.startsWith(name + '='));
+  if (xsrfCookies.length === 0) return null;
+  return decodeURIComponent(xsrfCookies[0].split('=')[1]);
+}
+
 export async function ensureCsrfToken() {
+  // OPTIMIZATION: If we already have the token, skip the network request
+  if (getCookie("csrftoken")) {
+      return;
+  }
+
   try {
     await apiClient.get(CSRF_URL);
   } catch (err) {
@@ -59,4 +64,4 @@ export async function ensureCsrfToken() {
   }
 }
 
-export default apiClient;
+export default apiClient;