@rebasepro/auth 0.0.1-canary.f81da60 → 0.1.2

package/dist/index.umd.js

@@ -71,11 +71,12 @@
     });
     return handleResponse(response);
   }
-  async function googleLogin(token, tokenType = "idToken") {
+  async function googleLogin(tokenOrPayload, tokenType = "idToken") {
+    const body = typeof tokenOrPayload === "string" ? { [tokenType]: tokenOrPayload } : tokenOrPayload;
     const response = await fetchWithHandling(`${baseApiUrl}/api/auth/google`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ [tokenType]: token })
+      body: JSON.stringify(body)
     });
     return handleResponse(response);
   }
@@ -195,12 +196,23 @@
     });
     return handleResponse(response);
   }
+  let authConfigInflight = null;
   async function fetchAuthConfig() {
-    const response = await fetchWithHandling(`${baseApiUrl}/api/auth/config`, {
-      method: "GET",
-      headers: { "Content-Type": "application/json" }
-    });
-    return handleResponse(response);
+    if (authConfigInflight) {
+      return authConfigInflight;
+    }
+    authConfigInflight = (async () => {
+      const response = await fetchWithHandling(`${baseApiUrl}/api/auth/config`, {
+        method: "GET",
+        headers: { "Content-Type": "application/json" }
+      });
+      return handleResponse(response);
+    })();
+    try {
+      return await authConfigInflight;
+    } finally {
+      authConfigInflight = null;
+    }
   }
   const STORAGE_KEY = "rebase_auth";
   const TOKEN_REFRESH_BUFFER_MS = 2 * 60 * 1e3;
@@ -411,6 +423,7 @@
       }
     }, [client, getAuthToken, refreshAccessToken$1, clearSessionAndSignOut]);
     const handleAuthSuccess = react.useCallback(async (userInfo, tokens) => {
+      console.log("[Auth] handleAuthSuccess called, user:", userInfo.email, "uid:", userInfo.uid);
       tokensRef.current = tokens;
       let convertedUser = convertToUser(userInfo);
       if (defineRolesFor) {
@@ -423,11 +436,13 @@
         }
       }
       saveAuthToStorage(tokens, userInfo);
+      console.log("[Auth] Calling setUser, roles:", convertedUser.roles);
       setUser(convertedUser);
       setAuthError(null);
       setAuthProviderError(null);
       setLoginSkipped(false);
       scheduleTokenRefresh(tokens);
+      console.log("[Auth] handleAuthSuccess completed");
     }, [scheduleTokenRefresh, defineRolesFor]);
     const emailPasswordLogin = react.useCallback(async (email, password) => {
       setAuthLoading(true);
@@ -455,11 +470,11 @@
         setAuthLoading(false);
       }
     }, [handleAuthSuccess]);
-    const googleLogin$1 = react.useCallback(async (token, tokenType = "idToken") => {
+    const googleLogin$1 = react.useCallback(async (tokenOrPayload, tokenType) => {
       setAuthLoading(true);
       setAuthProviderError(null);
       try {
-        const response = await googleLogin(token, tokenType);
+        const response = typeof tokenOrPayload === "string" ? await googleLogin(tokenOrPayload, tokenType ?? "idToken") : await googleLogin(tokenOrPayload);
         await handleAuthSuccess(response.user, response.tokens);
       } catch (error) {
         setAuthProviderError(error);
@@ -794,6 +809,8 @@
     const [loading, setLoading] = react.useState(true);
     const [usersError, setUsersError] = react.useState();
     const [rolesError, setRolesError] = react.useState();
+    const lastLoadedUidRef = react.useRef(null);
+    const apiRequestRef = react.useRef(null);
     const apiRequest = react.useCallback(async (endpoint, method = "GET", body, retryCount = 6, signal) => {
       let lastError = null;
       for (let attempt = 0; attempt < retryCount; attempt++) {
@@ -861,6 +878,7 @@
       }
       throw lastError;
     }, [apiUrl, getAuthToken]);
+    apiRequestRef.current = apiRequest;
     react.useCallback(async (signal) => {
       try {
         const data = await apiRequest("/roles", "GET", void 0, 6, signal);
@@ -889,23 +907,43 @@
         setLoading(false);
         return;
       }
+      if (lastLoadedUidRef.current === currentUser.uid) {
+        setLoading(false);
+        return;
+      }
       const abortController = new AbortController();
       const load = async () => {
         setLoading(true);
+        const request = apiRequestRef.current;
         try {
-          const data = await apiRequest("/roles", "GET", void 0, 6, abortController.signal);
+          const data = await request("/roles", "GET", void 0, 6, abortController.signal);
           setRoles(data.roles.map(convertRole));
           setRolesError(void 0);
         } catch (error) {
-          if (error instanceof Error && error.name !== "AbortError") {
-            console.error("Failed to load roles:", error);
-            setRolesError(error);
+          if (error instanceof Error && error.name === "AbortError") return;
+          console.error("Failed to load roles:", error);
+          setRolesError(error instanceof Error ? error : new Error(String(error)));
+          const status = error.status;
+          if (status === 403 || status === 401) {
+            setUsersError(error instanceof Error ? error : new Error(String(error)));
+            setLoading(false);
+            return;
           }
         }
         if (!abortController.signal.aborted) {
-          await loadUsers(abortController.signal);
+          try {
+            const data = await request("/users", "GET", void 0, 6, abortController.signal);
+            const allUsers = data.users.map((u) => convertUser(u));
+            setUsers(allUsers);
+            setUsersError(void 0);
+          } catch (error) {
+            if (error instanceof Error && error.name === "AbortError") return;
+            console.error("Failed to load users:", error);
+            setUsersError(error instanceof Error ? error : new Error(String(error)));
+          }
         }
         if (!abortController.signal.aborted) {
+          lastLoadedUidRef.current = currentUser.uid;
           setLoading(false);
         }
       };
@@ -913,7 +951,7 @@
       return () => {
         abortController.abort();
       };
-    }, [currentUser, apiRequest, loadUsers]);
+    }, [currentUser?.uid]);
     const searchUsers = react.useCallback(async (options) => {
       const params = new URLSearchParams();
       if (options.limit !== void 0) params.set("limit", String(options.limit));
@@ -1192,17 +1230,22 @@
                       authController
                     }
                   ),
-                  showRegistration && /* @__PURE__ */ jsxRuntime.jsx(
-                    ui.Button,
-                    {
-                      className: "w-full",
-                      variant: "filled",
-                      color: "primary",
-                      size: "large",
-                      onClick: () => switchMode("register"),
-                      children: "Create an account"
-                    }
-                  )
+                  showRegistration && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mt-2 text-center", children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Typography, { variant: "body2", color: "secondary", children: [
+                    "Don't have an account?",
+                    " ",
+                    /* @__PURE__ */ jsxRuntime.jsx(
+                      "button",
+                      {
+                        type: "button",
+                        className: ui.cls(
+                          "font-semibold hover:underline cursor-pointer",
+                          "text-primary-600 dark:text-primary-400"
+                        ),
+                        onClick: () => switchMode("register"),
+                        children: "Create one"
+                      }
+                    )
+                  ] }) })
                 ] }),
                 mode === "login" && /* @__PURE__ */ jsxRuntime.jsx(
                   LoginForm,
@@ -1298,20 +1341,24 @@
     googleClientId,
     authController
   }) {
-    const tokenClientRef = react.useRef(null);
+    const codeClientRef = react.useRef(null);
     react.useEffect(() => {
       const google = window.google;
-      if (!google || tokenClientRef.current) return;
-      tokenClientRef.current = google.accounts.oauth2.initTokenClient({
+      if (!google || codeClientRef.current) return;
+      codeClientRef.current = google.accounts.oauth2.initCodeClient({
         client_id: googleClientId,
         scope: "openid email profile",
+        ux_mode: "popup",
         callback: async (response) => {
-          if (response.error || !response.access_token) {
+          if (response.error || !response.code) {
             console.error("Google login error:", response.error);
             return;
           }
           try {
-            await authController.googleLogin(response.access_token, "accessToken");
+            await authController.googleLogin({
+              code: response.code,
+              redirectUri: "postmessage"
+            });
           } catch (err) {
             console.error("Google login error:", err);
           }
@@ -1319,11 +1366,11 @@
       });
     }, [googleClientId, authController]);
     const handleClick = () => {
-      if (!tokenClientRef.current) {
+      if (!codeClientRef.current) {
         console.error("Google Sign-In not loaded");
         return;
       }
-      tokenClientRef.current.requestAccessToken();
+      codeClientRef.current.requestCode();
     };
     return /* @__PURE__ */ jsxRuntime.jsx(
       LoginButton,
@@ -1602,14 +1649,12 @@
       {
         slug: "dev/users",
         name: "CMS Users",
-        group: "Admin",
         icon: "face",
         view: /* @__PURE__ */ jsxRuntime.jsx(UsersView, { userManagement, apiUrl, getAuthToken })
       },
       {
         slug: "dev/roles",
         name: "Roles",
-        group: "Admin",
         icon: "gpp_good",
         view: /* @__PURE__ */ jsxRuntime.jsx(RolesView, { userManagement, collections })
       }
@@ -1707,7 +1752,7 @@
       return /* @__PURE__ */ jsxRuntime.jsx(ui.CenteredView, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.CircularProgress, {}) });
     }
     return /* @__PURE__ */ jsxRuntime.jsxs(ui.Container, { className: "w-full flex flex-col py-4 gap-4", maxWidth: "6xl", children: [
-      !hasAdmin && !usersError && loggedInUser && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "bg-yellow-100 dark:bg-yellow-900 border border-yellow-400 dark:border-yellow-700 rounded p-4 flex items-center justify-between", children: [
+      !hasAdmin && loggedInUser && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "bg-yellow-100 dark:bg-yellow-900 border border-yellow-400 dark:border-yellow-700 rounded p-4 flex items-center justify-between", children: [
         /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Typography, { variant: "label", className: "text-yellow-800 dark:text-yellow-200", children: "No admin users exist. You can make yourself an admin." }) }),
         /* @__PURE__ */ jsxRuntime.jsx(
           ui.Button,