@djangocfg/api 2.1.420 → 2.1.422

package/dist/auth.cjs

@@ -291,24 +291,35 @@ var authLogger = logger.withTag("auth");
 // src/auth/hooks/useAutoAuth.ts
 var import_navigation3 = require("next/navigation");
 var import_react5 = require("react");
+var normalizePath = /* @__PURE__ */ __name((path) => {
+  if (!path) return "";
+  const withoutLocale = path.replace(/^\/[a-z]{2}(?=\/|$)/, "");
+  const trimmed = withoutLocale.replace(/\/+$/, "");
+  return trimmed || "/";
+}, "normalizePath");
 var useAutoAuth = /* @__PURE__ */ __name((options = {}) => {
   const { onOTPDetected, cleanupUrl = true, allowedPaths = ["/auth"] } = options;
   const queryParams = useQueryParams();
   const pathname = (0, import_navigation3.usePathname)();
   const router = useCfgRouter();
-  const isAllowedPath = allowedPaths.some((path) => pathname === path || pathname?.startsWith(path + "/"));
+  const normalizedPath = normalizePath(pathname);
+  const isAllowedPath = allowedPaths.some(
+    (path) => normalizedPath === path || normalizedPath.startsWith(path + "/")
+  );
   const hasOTP = !!queryParams.get("otp");
   const isReady = !!pathname && hasOTP && isAllowedPath;
   (0, import_react5.useEffect)(() => {
     if (!isReady) return;
     const queryOtp = queryParams.get("otp");
+    const queryEmail = queryParams.get("email") || void 0;
     if (queryOtp && typeof queryOtp === "string" && queryOtp.length === AUTH_CONSTANTS.EMAIL_OTP_LENGTH) {
       authLogger.info("OTP detected in URL on auth page:", queryOtp);
-      onOTPDetected?.(queryOtp);
+      onOTPDetected?.(queryOtp, queryEmail);
     }
     if (cleanupUrl && queryOtp) {
       const cleanQuery = Object.fromEntries(queryParams.entries());
       delete cleanQuery.otp;
+      delete cleanQuery.email;
       const queryString = new URLSearchParams(cleanQuery).toString();
       const realPathname = typeof window !== "undefined" ? window.location.pathname : pathname;
       router.replace(queryString ? `${realPathname}?${queryString}` : realPathname);
@@ -451,6 +462,18 @@ function detectLocale() {
 }
 __name(detectLocale, "detectLocale");
 function defaultBaseUrl() {
+  if (typeof window !== "undefined") {
+    try {
+      if (typeof process !== "undefined" && process.env) {
+        if (process.env.NEXT_PUBLIC_STATIC_BUILD === "true") return "";
+        if (process.env.NEXT_PUBLIC_API_PROXY_URL !== void 0)
+          return process.env.NEXT_PUBLIC_API_PROXY_URL;
+        return process.env.NEXT_PUBLIC_API_URL || "";
+      }
+    } catch {
+    }
+    return "";
+  }
   try {
     if (typeof process !== "undefined" && process.env) {
       if (process.env.NEXT_PUBLIC_STATIC_BUILD === "true") return "";
@@ -462,7 +485,6 @@ function defaultBaseUrl() {
 }
 __name(defaultBaseUrl, "defaultBaseUrl");
 function defaultApiKey() {
-  if (isBrowser2) return null;
   try {
     if (typeof process !== "undefined" && process.env?.NEXT_PUBLIC_API_KEY) {
       return process.env.NEXT_PUBLIC_API_KEY;
@@ -618,7 +640,7 @@ function installAuthOnClient(client2) {
     const locale = auth.getLocale();
     if (locale) request.headers.set("Accept-Language", locale);
     const apiKey = auth.getApiKey();
-    if (apiKey) request.headers.set("X-API-Key", apiKey);
+    if (apiKey && !request.headers.has("X-API-Key")) request.headers.set("X-API-Key", apiKey);
     try {
       const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
       if (tz) request.headers.set("X-Timezone", tz);
@@ -1257,11 +1279,8 @@ var checkForExistence = /* @__PURE__ */ __name((options, name) => {
   }
   return false;
 }, "checkForExistence");
-var setAuthParams = /* @__PURE__ */ __name(async ({
-  security,
-  ...options
-}) => {
-  for (const auth2 of security) {
+async function setAuthParams(options) {
+  for (const auth2 of options.security ?? []) {
     if (checkForExistence(options, auth2.name)) {
       continue;
     }
@@ -1286,7 +1305,8 @@ var setAuthParams = /* @__PURE__ */ __name(async ({
         break;
     }
   }
-}, "setAuthParams");
+}
+__name(setAuthParams, "setAuthParams");
 var buildUrl = /* @__PURE__ */ __name((options) => getUrl({
   baseUrl: options.baseUrl,
   path: options.path,
@@ -1415,10 +1435,7 @@ var createClient = /* @__PURE__ */ __name((config = {}) => {
       serializedBody: void 0
     };
     if (opts.security) {
-      await setAuthParams({
-        ...opts,
-        security: opts.security
-      });
+      await setAuthParams(opts);
     }
     if (opts.requestValidator) {
       await opts.requestValidator(opts);
@@ -1611,11 +1628,15 @@ var CfgAccountsApiKey = class {
    */
   static cfgAccountsApiKeyRetrieve(options) {
     return (options?.client ?? client).get({
-      security: [{ scheme: "bearer", type: "http" }, {
-        in: "cookie",
-        name: "sessionid",
-        type: "apiKey"
-      }],
+      security: [
+        { scheme: "bearer", type: "http" },
+        {
+          in: "cookie",
+          name: "sessionid",
+          type: "apiKey"
+        },
+        { name: "X-API-Key", type: "apiKey" }
+      ],
       url: "/cfg/accounts/api-key/",
       ...options
     });
@@ -1627,11 +1648,15 @@ var CfgAccountsApiKey = class {
    */
   static cfgAccountsApiKeyRegenerateCreate(options) {
     return (options.client ?? client).post({
-      security: [{ scheme: "bearer", type: "http" }, {
-        in: "cookie",
-        name: "sessionid",
-        type: "apiKey"
-      }],
+      security: [
+        { scheme: "bearer", type: "http" },
+        {
+          in: "cookie",
+          name: "sessionid",
+          type: "apiKey"
+        },
+        { name: "X-API-Key", type: "apiKey" }
+      ],
       url: "/cfg/accounts/api-key/regenerate/",
       ...options,
       headers: {
@@ -1647,11 +1672,15 @@ var CfgAccountsApiKey = class {
    */
   static cfgAccountsApiKeyTestCreate(options) {
     return (options.client ?? client).post({
-      security: [{ scheme: "bearer", type: "http" }, {
-        in: "cookie",
-        name: "sessionid",
-        type: "apiKey"
-      }],
+      security: [
+        { scheme: "bearer", type: "http" },
+        {
+          in: "cookie",
+          name: "sessionid",
+          type: "apiKey"
+        },
+        { name: "X-API-Key", type: "apiKey" }
+      ],
       url: "/cfg/accounts/api-key/test/",
       ...options,
       headers: {
@@ -2717,14 +2746,13 @@ var useAuthForm = /* @__PURE__ */ __name((options) => {
   }, [setUseBackupCode, setTwoFactorCode, clearError]);
   useAutoAuth({
     allowedPaths: [authPath],
-    onOTPDetected: /* @__PURE__ */ __name((detectedOtp) => {
+    onOTPDetected: /* @__PURE__ */ __name((detectedOtp, detectedEmail) => {
       if (isAutoSubmitFromUrlRef.current || isLoading) return;
       isAutoSubmitFromUrlRef.current = true;
       authLogger.info("OTP detected from URL, auto-submitting");
-      const savedEmail = getSavedEmail();
-      const autoIdentifier = savedEmail || "";
+      const autoIdentifier = detectedEmail || getSavedEmail() || "";
       if (!autoIdentifier) {
-        authLogger.warn("No saved identifier found for auto-submit");
+        authLogger.warn("No identifier found for auto-submit (no email in URL or storage)");
         isAutoSubmitFromUrlRef.current = false;
         return;
       }