react-native-nitro-auth 0.5.5 → 0.5.6

package/src/service.ts

@@ -29,7 +29,8 @@ export const AuthService: Auth = {
 
   async login(provider: AuthProvider, options?: LoginOptions) {
     try {
-      return await nitroAuth.login(provider, options);
+      await nitroAuth.login(provider, options);
+      return;
     } catch (e) {
       throw AuthError.from(e);
     }
@@ -37,7 +38,8 @@ export const AuthService: Auth = {
 
   async requestScopes(scopes: string[]) {
     try {
-      return await nitroAuth.requestScopes(scopes);
+      await nitroAuth.requestScopes(scopes);
+      return;
     } catch (e) {
       throw AuthError.from(e);
     }
@@ -45,7 +47,8 @@ export const AuthService: Auth = {
 
   async revokeScopes(scopes: string[]) {
     try {
-      return await nitroAuth.revokeScopes(scopes);
+      await nitroAuth.revokeScopes(scopes);
+      return;
     } catch (e) {
       throw AuthError.from(e);
     }
@@ -73,16 +76,15 @@ export const AuthService: Auth = {
 
   async silentRestore() {
     try {
-      return await nitroAuth.silentRestore();
+      await nitroAuth.silentRestore();
+      return;
     } catch (e) {
       throw AuthError.from(e);
     }
   },
 
   onAuthStateChanged(callback: (user: AuthUser | undefined) => void) {
-    return nitroAuth.onAuthStateChanged((user) => {
-      callback(user);
-    });
+    return nitroAuth.onAuthStateChanged(callback);
   },
 
   onTokensRefreshed(callback: (tokens: AuthTokens) => void) {

package/src/service.web.ts

@@ -1,8 +1,14 @@
+import type {
+  Auth,
+  AuthProvider,
+  AuthTokens,
+  LoginOptions,
+  AuthUser,
+} from "./Auth.nitro";
 import { AuthModule } from "./Auth.web";
+import { AuthError } from "./utils/auth-error";
 
-export const AuthService = {
-  ...AuthModule,
-
+export const AuthService: Auth = {
   get name() {
     return AuthModule.name;
   },
@@ -19,16 +25,79 @@ export const AuthService = {
     return AuthModule.hasPlayServices;
   },
 
-  login: AuthModule.login.bind(AuthModule),
-  logout: AuthModule.logout.bind(AuthModule),
-  requestScopes: AuthModule.requestScopes.bind(AuthModule),
-  revokeScopes: AuthModule.revokeScopes.bind(AuthModule),
-  getAccessToken: AuthModule.getAccessToken.bind(AuthModule),
-  refreshToken: AuthModule.refreshToken.bind(AuthModule),
-  silentRestore: AuthModule.silentRestore.bind(AuthModule),
-  onAuthStateChanged: AuthModule.onAuthStateChanged.bind(AuthModule),
-  onTokensRefreshed: AuthModule.onTokensRefreshed.bind(AuthModule),
-  setLoggingEnabled: AuthModule.setLoggingEnabled.bind(AuthModule),
-  dispose: AuthModule.dispose.bind(AuthModule),
-  equals: AuthModule.equals.bind(AuthModule),
+  async login(provider: AuthProvider, options?: LoginOptions) {
+    try {
+      await AuthModule.login(provider, options);
+      return;
+    } catch (e) {
+      throw AuthError.from(e);
+    }
+  },
+
+  async requestScopes(scopes: string[]) {
+    try {
+      await AuthModule.requestScopes(scopes);
+      return;
+    } catch (e) {
+      throw AuthError.from(e);
+    }
+  },
+
+  async revokeScopes(scopes: string[]) {
+    try {
+      await AuthModule.revokeScopes(scopes);
+      return;
+    } catch (e) {
+      throw AuthError.from(e);
+    }
+  },
+
+  async getAccessToken() {
+    try {
+      return await AuthModule.getAccessToken();
+    } catch (e) {
+      throw AuthError.from(e);
+    }
+  },
+
+  async refreshToken() {
+    try {
+      return await AuthModule.refreshToken();
+    } catch (e) {
+      throw AuthError.from(e);
+    }
+  },
+
+  logout() {
+    AuthModule.logout();
+  },
+
+  async silentRestore() {
+    try {
+      await AuthModule.silentRestore();
+      return;
+    } catch (e) {
+      throw AuthError.from(e);
+    }
+  },
+
+  onAuthStateChanged(callback: (user: AuthUser | undefined) => void) {
+    return AuthModule.onAuthStateChanged(callback);
+  },
+
+  onTokensRefreshed(callback: (tokens: AuthTokens) => void) {
+    return AuthModule.onTokensRefreshed(callback);
+  },
+
+  setLoggingEnabled(enabled: boolean) {
+    AuthModule.setLoggingEnabled(enabled);
+  },
+
+  dispose() {
+    AuthModule.dispose();
+  },
+
+  equals(other: Parameters<Auth["equals"]>[0]): boolean {
+    return AuthModule.equals(other);
+  },
 };

package/src/ui/social-button.tsx

@@ -7,8 +7,9 @@ import {
   View,
   ActivityIndicator,
 } from "react-native";
-import { NitroModules } from "react-native-nitro-modules";
-import type { Auth, AuthProvider, AuthUser } from "../Auth.nitro";
+import { AuthService } from "../service";
+import { logger } from "../utils/logger";
+import type { AuthProvider, AuthUser } from "../Auth.nitro";
 
 export type SocialButtonVariant = "primary" | "outline" | "white" | "black";
 
@@ -56,8 +57,7 @@ const getTextColor = (variant: SocialButtonVariant): string =>
   variant === "white" || variant === "outline" ? "#000000" : "#FFFFFF";
 
 async function performLogin(provider: AuthProvider): Promise<void> {
-  const auth = NitroModules.createHybridObject<Auth>("Auth");
-  await auth.login(provider);
+  await AuthService.login(provider);
 }
 
 export const SocialButton = ({
@@ -83,12 +83,16 @@ export const SocialButton = ({
     setLoading(true);
     try {
       await performLogin(provider);
-      const user = NitroModules.createHybridObject<Auth>("Auth").currentUser;
+      const user = AuthService.currentUser;
       if (user) {
         onSuccess?.(user);
       }
     } catch (error) {
-      onError?.(error);
+      if (onError) {
+        onError(error);
+      } else if (__DEV__) {
+        logger.error("SocialButton unhandled error:", error);
+      }
     } finally {
       setLoading(false);
     }
@@ -126,19 +130,21 @@ export const SocialButton = ({
           <>
             {provider === "google" && variant !== "primary" && (
               <View style={styles.iconPlaceholder}>
-                <Text style={{ fontSize: 18 }}>G</Text>
+                <Text style={styles.iconText}>G</Text>
               </View>
             )}
             {provider === "apple" && variant !== "primary" && (
               <View style={styles.iconPlaceholder}>
-                <Text style={{ fontSize: 18, color: getTextColor(variant) }}>
+                <Text
+                  style={[styles.iconText, { color: getTextColor(variant) }]}
+                >
                   
                 </Text>
               </View>
             )}
             {provider === "microsoft" && variant !== "primary" && (
               <View style={styles.iconPlaceholder}>
-                <Text style={{ fontSize: 16 }}>⊞</Text>
+                <Text style={styles.microsoftIconText}>⊞</Text>
               </View>
             )}
             <Text
@@ -179,4 +185,10 @@ const styles = StyleSheet.create({
     fontSize: 16,
     fontWeight: "600",
   },
+  iconText: {
+    fontSize: 18,
+  },
+  microsoftIconText: {
+    fontSize: 16,
+  },
 });

package/src/ui/social-button.web.tsx

@@ -8,6 +8,7 @@ import {
   ActivityIndicator,
 } from "react-native";
 import { AuthModule } from "../Auth.web";
+import { logger } from "../utils/logger";
 import type { AuthProvider, AuthUser } from "../Auth.nitro";
 
 export type SocialButtonVariant = "primary" | "outline" | "white" | "black";
@@ -87,7 +88,11 @@ export const SocialButton = ({
         onSuccess?.(user);
       }
     } catch (error) {
-      onError?.(error);
+      if (onError) {
+        onError(error);
+      } else if (process.env.NODE_ENV !== "production") {
+        logger.error("SocialButton unhandled error:", error);
+      }
     } finally {
       setLoading(false);
     }
@@ -125,19 +130,21 @@ export const SocialButton = ({
           <>
             {provider === "google" && variant !== "primary" && (
               <View style={styles.iconPlaceholder}>
-                <Text style={{ fontSize: 18 }}>G</Text>
+                <Text style={styles.iconText}>G</Text>
               </View>
             )}
             {provider === "apple" && variant !== "primary" && (
               <View style={styles.iconPlaceholder}>
-                <Text style={{ fontSize: 18, color: getTextColor(variant) }}>
+                <Text
+                  style={[styles.iconText, { color: getTextColor(variant) }]}
+                >
                   
                 </Text>
               </View>
             )}
             {provider === "microsoft" && variant !== "primary" && (
               <View style={styles.iconPlaceholder}>
-                <Text style={{ fontSize: 16 }}>⊞</Text>
+                <Text style={styles.microsoftIconText}>⊞</Text>
               </View>
             )}
             <Text
@@ -178,4 +185,10 @@ const styles = StyleSheet.create({
     fontSize: 16,
     fontWeight: "600",
   },
+  iconText: {
+    fontSize: 18,
+  },
+  microsoftIconText: {
+    fontSize: 16,
+  },
 });

package/src/use-auth.ts

@@ -17,8 +17,10 @@ type AuthState = {
 
 const areScopesEqual = (left: string[], right: string[]): boolean => {
   if (left.length !== right.length) return false;
-  for (let i = 0; i < left.length; i += 1) {
-    if (left[i] !== right[i]) return false;
+  const sortedLeft = [...left].sort();
+  const sortedRight = [...right].sort();
+  for (let i = 0; i < sortedLeft.length; i += 1) {
+    if (sortedLeft[i] !== sortedRight[i]) return false;
   }
   return true;
 };
@@ -55,7 +57,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,
+        };
       });
     },
     [],
@@ -139,7 +146,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 +156,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 +185,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/logger.ts

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