@rebasepro/auth 0.0.1-canary.f81da60 → 0.1.2

package/dist/api.d.ts

@@ -20,8 +20,23 @@ export declare function register(email: string, password: string, displayName?:
  */
 export declare function login(email: string, password: string): Promise<AuthResponse>;
 /**
- * Login with Google token (ID token or access token)
+ * Google login payload — one of the three supported flows.
  */
+export type GoogleLoginPayload = {
+    idToken: string;
+} | {
+    accessToken: string;
+} | {
+    code: string;
+    redirectUri: string;
+};
+/**
+ * Login with Google.
+ *
+ * Overload 1 (legacy): `googleLogin("token", "idToken" | "accessToken")`
+ * Overload 2 (code flow): `googleLogin({ code, redirectUri })`
+ */
+export declare function googleLogin(payload: GoogleLoginPayload): Promise<AuthResponse>;
 export declare function googleLogin(token: string, tokenType?: "idToken" | "accessToken"): Promise<AuthResponse>;
 /**
  * Login with LinkedIn OAuth code
@@ -126,7 +141,10 @@ export interface AuthConfigResponse {
 }
 /**
  * Fetch auth configuration / status from the backend
- * This is an unauthenticated endpoint used to detect bootstrap mode
+ * This is an unauthenticated endpoint used to detect bootstrap mode.
+ *
+ * Concurrent calls are deduplicated: only one network request is made
+ * and all callers share the same promise.
  */
 export declare function fetchAuthConfig(): Promise<AuthConfigResponse>;
 export { AuthApiError };

package/dist/components/RebaseLoginView.d.ts

@@ -49,3 +49,25 @@ export interface RebaseLoginViewProps {
  * Login view component for custom JWT authentication
  */
 export declare function RebaseLoginView({ logo, authController, noUserComponent, disableSignupScreen, disabled, notAllowedError, googleEnabled, googleClientId }: RebaseLoginViewProps): import("react/jsx-runtime").JSX.Element;
+/** Google Identity Services SDK — injected by the GIS <script> tag. */
+declare global {
+    interface Window {
+        google?: {
+            accounts: {
+                oauth2: {
+                    initCodeClient(config: {
+                        client_id: string;
+                        scope: string;
+                        ux_mode: "popup" | "redirect";
+                        callback: (response: {
+                            code?: string;
+                            error?: string;
+                        }) => void;
+                    }): {
+                        requestCode(): void;
+                    };
+                };
+            };
+        };
+    }
+}

package/dist/index.es.js

@@ -1,6 +1,6 @@
 import { useState, useRef, useEffect, useCallback, useLayoutEffect } from "react";
 import { jsxs, jsx, Fragment } from "react/jsx-runtime";
-import { Menu, MenuItem, iconSize, IconButton, Button, cls, Typography, TextField, LoadingButton, CenteredView, CircularProgress, Container, Table, TableHeader, TableCell, TableBody, TableRow, Tooltip, Checkbox, getColorSchemeForSeed, Chip, Dialog, DialogTitle, DialogContent, DialogActions, MultiSelect, MultiSelectItem } from "@rebasepro/ui";
+import { Menu, MenuItem, iconSize, IconButton, Typography, cls, TextField, LoadingButton, Button, CenteredView, CircularProgress, Container, Table, TableHeader, TableCell, TableBody, TableRow, Tooltip, Checkbox, getColorSchemeForSeed, Chip, Dialog, DialogTitle, DialogContent, DialogActions, MultiSelect, MultiSelectItem } from "@rebasepro/ui";
 import { MoonIcon, SunIcon, SunMoonIcon, MailIcon, ArrowLeftIcon, PlusIcon, Trash2Icon } from "lucide-react";
 import { useModeController, useTranslation, LanguageToggle, ErrorView, RebaseLogo, useRebaseRegistryDispatch, useSnackbarController, ConfirmationDialog, useAuthController } from "@rebasepro/core";
 let baseApiUrl = "";
@@ -72,11 +72,12 @@ async function login(email, password) {
   });
   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);
 }
@@ -196,12 +197,23 @@ async function revokeAllSessions(accessToken) {
   });
   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;
@@ -412,6 +424,7 @@ function useRebaseAuthController(props = {}) {
     }
   }, [client, getAuthToken, refreshAccessToken$1, clearSessionAndSignOut]);
   const handleAuthSuccess = useCallback(async (userInfo, tokens) => {
+    console.log("[Auth] handleAuthSuccess called, user:", userInfo.email, "uid:", userInfo.uid);
     tokensRef.current = tokens;
     let convertedUser = convertToUser(userInfo);
     if (defineRolesFor) {
@@ -424,11 +437,13 @@ function useRebaseAuthController(props = {}) {
       }
     }
     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 = useCallback(async (email, password) => {
     setAuthLoading(true);
@@ -456,11 +471,11 @@ function useRebaseAuthController(props = {}) {
       setAuthLoading(false);
     }
   }, [handleAuthSuccess]);
-  const googleLogin$1 = useCallback(async (token, tokenType = "idToken") => {
+  const googleLogin$1 = 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);
@@ -795,6 +810,8 @@ function useBackendUserManagement(config) {
   const [loading, setLoading] = useState(true);
   const [usersError, setUsersError] = useState();
   const [rolesError, setRolesError] = useState();
+  const lastLoadedUidRef = useRef(null);
+  const apiRequestRef = useRef(null);
   const apiRequest = useCallback(async (endpoint, method = "GET", body, retryCount = 6, signal) => {
     let lastError = null;
     for (let attempt = 0; attempt < retryCount; attempt++) {
@@ -862,6 +879,7 @@ function useBackendUserManagement(config) {
     }
     throw lastError;
   }, [apiUrl, getAuthToken]);
+  apiRequestRef.current = apiRequest;
   useCallback(async (signal) => {
     try {
       const data = await apiRequest("/roles", "GET", void 0, 6, signal);
@@ -890,23 +908,43 @@ function useBackendUserManagement(config) {
       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);
       }
     };
@@ -914,7 +952,7 @@ function useBackendUserManagement(config) {
     return () => {
       abortController.abort();
     };
-  }, [currentUser, apiRequest, loadUsers]);
+  }, [currentUser?.uid]);
   const searchUsers = useCallback(async (options) => {
     const params = new URLSearchParams();
     if (options.limit !== void 0) params.set("limit", String(options.limit));
@@ -1193,17 +1231,22 @@ function RebaseLoginView({
                     authController
                   }
                 ),
-                showRegistration && /* @__PURE__ */ jsx(
-                  Button,
-                  {
-                    className: "w-full",
-                    variant: "filled",
-                    color: "primary",
-                    size: "large",
-                    onClick: () => switchMode("register"),
-                    children: "Create an account"
-                  }
-                )
+                showRegistration && /* @__PURE__ */ jsx("div", { className: "mt-2 text-center", children: /* @__PURE__ */ jsxs(Typography, { variant: "body2", color: "secondary", children: [
+                  "Don't have an account?",
+                  " ",
+                  /* @__PURE__ */ jsx(
+                    "button",
+                    {
+                      type: "button",
+                      className: cls(
+                        "font-semibold hover:underline cursor-pointer",
+                        "text-primary-600 dark:text-primary-400"
+                      ),
+                      onClick: () => switchMode("register"),
+                      children: "Create one"
+                    }
+                  )
+                ] }) })
               ] }),
               mode === "login" && /* @__PURE__ */ jsx(
                 LoginForm,
@@ -1299,20 +1342,24 @@ function GoogleLoginButton({
   googleClientId,
   authController
 }) {
-  const tokenClientRef = useRef(null);
+  const codeClientRef = useRef(null);
   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);
         }
@@ -1320,11 +1367,11 @@ function GoogleLoginButton({
     });
   }, [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__ */ jsx(
     LoginButton,
@@ -1603,14 +1650,12 @@ function createUserManagementAdminViews({ userManagement, apiUrl, getAuthToken,
     {
       slug: "dev/users",
       name: "CMS Users",
-      group: "Admin",
       icon: "face",
       view: /* @__PURE__ */ jsx(UsersView, { userManagement, apiUrl, getAuthToken })
     },
     {
       slug: "dev/roles",
       name: "Roles",
-      group: "Admin",
       icon: "gpp_good",
       view: /* @__PURE__ */ jsx(RolesView, { userManagement, collections })
     }
@@ -1708,7 +1753,7 @@ function UsersView({ userManagement, apiUrl, getAuthToken }) {
     return /* @__PURE__ */ jsx(CenteredView, { children: /* @__PURE__ */ jsx(CircularProgress, {}) });
   }
   return /* @__PURE__ */ jsxs(Container, { className: "w-full flex flex-col py-4 gap-4", maxWidth: "6xl", children: [
-    !hasAdmin && !usersError && loggedInUser && /* @__PURE__ */ 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__ */ 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__ */ jsx("div", { children: /* @__PURE__ */ jsx(Typography, { variant: "label", className: "text-yellow-800 dark:text-yellow-200", children: "No admin users exist. You can make yourself an admin." }) }),
       /* @__PURE__ */ jsx(
         Button,