react-native-nitro-auth 0.5.5 → 0.5.7

package/src/use-auth.ts

@@ -8,6 +8,8 @@ import type {
 import { AuthService } from "./service";
 import { AuthError } from "./utils/auth-error";
 
+const EMPTY_SCOPES: string[] = [];
+
 type AuthState = {
   user: AuthUser | undefined;
   scopes: string[];
@@ -16,11 +18,25 @@ type AuthState = {
 };
 
 const areScopesEqual = (left: string[], right: string[]): boolean => {
+  if (left === right) return true;
   if (left.length !== right.length) return false;
+
+  let matchesInOrder = true;
   for (let i = 0; i < left.length; i += 1) {
-    if (left[i] !== right[i]) return false;
+    if (left[i] !== right[i]) {
+      matchesInOrder = false;
+      break;
+    }
+  }
+  if (matchesInOrder) return true;
+
+  const remaining = new Set(left);
+  for (const scope of right) {
+    if (!remaining.delete(scope)) {
+      return false;
+    }
   }
-  return true;
+  return remaining.size === 0;
 };
 
 export type UseAuthReturn = AuthState & {
@@ -55,7 +71,12 @@ export function useAuth(): UseAuthReturn {
         ) {
           return prev;
         }
-        return { user: nextUser, scopes: nextScopes, loading: nextLoading, error: nextError };
+        return {
+          user: nextUser,
+          scopes: nextScopes,
+          loading: nextLoading,
+          error: nextError,
+        };
       });
     },
     [],
@@ -78,7 +99,22 @@ export function useAuth(): UseAuthReturn {
 
   const logout = useCallback(() => {
     AuthService.logout();
-    setState({ user: undefined, scopes: [], loading: false, error: undefined });
+    setState((prev) => {
+      if (
+        prev.user === undefined &&
+        prev.scopes.length === 0 &&
+        prev.loading === false &&
+        prev.error === undefined
+      ) {
+        return prev;
+      }
+      return {
+        user: undefined,
+        scopes: EMPTY_SCOPES,
+        loading: false,
+        error: undefined,
+      };
+    });
   }, []);
 
   const requestScopes = useCallback(
@@ -139,7 +175,7 @@ export function useAuth(): UseAuthReturn {
   }, [syncStateFromService]);
 
   useEffect(() => {
-    const unsubscribe = AuthService.onAuthStateChanged((currentUser) => {
+    const unsubscribeAuth = AuthService.onAuthStateChanged((currentUser) => {
       const nextScopes = AuthService.grantedScopes;
       setState((prev) => {
         if (
@@ -149,11 +185,22 @@ export function useAuth(): UseAuthReturn {
         ) {
           return prev;
         }
-        return { ...prev, user: currentUser, scopes: nextScopes, loading: false };
+        return {
+          ...prev,
+          user: currentUser,
+          scopes: nextScopes,
+          loading: false,
+        };
       });
     });
-    return unsubscribe;
-  }, []);
+    const unsubscribeTokens = AuthService.onTokensRefreshed?.(() => {
+      syncStateFromService(false, undefined);
+    });
+    return () => {
+      unsubscribeAuth();
+      unsubscribeTokens?.();
+    };
+  }, [syncStateFromService]);
 
   return useMemo(
     () => ({
@@ -167,6 +214,15 @@ export function useAuth(): UseAuthReturn {
       refreshToken,
       silentRestore,
     }),
-    [state, login, logout, requestScopes, revokeScopes, getAccessToken, refreshToken, silentRestore],
+    [
+      state,
+      login,
+      logout,
+      requestScopes,
+      revokeScopes,
+      getAccessToken,
+      refreshToken,
+      silentRestore,
+    ],
   );
 }

package/src/utils/auth-error.ts

@@ -6,6 +6,8 @@ const AUTH_ERROR_CODES: ReadonlySet<string> = new Set<AuthErrorCode>([
   "popup_blocked",
   "network_error",
   "configuration_error",
+  "not_signed_in",
+  "operation_in_progress",
   "unsupported_provider",
   "invalid_state",
   "invalid_nonce",

package/src/utils/logger.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 let enabled = false;
 
 export const logger = {