react-native-nitro-auth 0.5.1 → 0.5.4

package/src/global.d.ts

@@ -35,4 +35,3 @@ declare global {
 }
 
 export {};
-

package/src/index.ts

@@ -1,5 +1,4 @@
 export * from "./Auth.nitro";
-export * from "./AuthStorage.nitro";
 export * from "./ui/social-button";
 export { useAuth, type UseAuthReturn } from "./use-auth";
-export { AuthService, type JSStorageAdapter } from "./service";
+export { AuthService } from "./service";

package/src/index.web.ts

@@ -1,5 +1,4 @@
 export * from "./Auth.nitro";
-export * from "./AuthStorage.nitro";
 export * from "./ui/social-button.web";
 export * from "./use-auth";
 export { AuthService } from "./service.web";

package/src/js-storage-adapter.ts

@@ -0,0 +1,5 @@
+export type JSStorageAdapter = {
+  save(key: string, value: string): void | Promise<void>;
+  load(key: string): string | undefined | Promise<string | undefined>;
+  remove(key: string): void | Promise<void>;
+};

package/src/service.ts

@@ -3,66 +3,22 @@ import type {
   Auth,
   AuthProvider,
   AuthTokens,
-  AuthUser,
   LoginOptions,
+  AuthUser,
 } from "./Auth.nitro";
-import type { AuthStorageAdapter } from "./AuthStorage.nitro";
-
-const STORAGE_KEY = "nitro_auth_user";
-const SCOPES_KEY = "nitro_auth_scopes";
-
-export interface JSStorageAdapter {
-  save(key: string, value: string): void | Promise<void>;
-  load(key: string): string | undefined | Promise<string | undefined>;
-  remove(key: string): void | Promise<void>;
-}
 
 const nitroAuth = NitroModules.createHybridObject<Auth>("Auth");
-
-let jsStorageAdapter: JSStorageAdapter | undefined;
-let cachedUser: AuthUser | undefined;
-let cachedScopes: string[] = [];
-
-async function loadFromJSStorage() {
-  if (!jsStorageAdapter) return;
-  const json = await jsStorageAdapter.load(STORAGE_KEY);
-  if (json) {
-    try {
-      cachedUser = JSON.parse(json);
-    } catch {}
-  }
-  const scopesJson = await jsStorageAdapter.load(SCOPES_KEY);
-  if (scopesJson) {
-    try {
-      cachedScopes = JSON.parse(scopesJson);
-    } catch {}
-  }
-}
-
-async function saveToJSStorage(user: AuthUser | undefined) {
-  if (!jsStorageAdapter) return;
-  if (user) {
-    await jsStorageAdapter.save(STORAGE_KEY, JSON.stringify(user));
-    await jsStorageAdapter.save(SCOPES_KEY, JSON.stringify(cachedScopes));
-  } else {
-    await jsStorageAdapter.remove(STORAGE_KEY);
-    await jsStorageAdapter.remove(SCOPES_KEY);
-  }
-}
-
-export const AuthService: Auth & {
-  setJSStorageAdapter(adapter: JSStorageAdapter | undefined): void;
-} = {
+export const AuthService: Auth = {
   get name() {
     return nitroAuth.name;
   },
 
   get currentUser() {
-    return jsStorageAdapter ? cachedUser : nitroAuth.currentUser;
+    return nitroAuth.currentUser;
   },
 
   get grantedScopes() {
-    return jsStorageAdapter ? cachedScopes : nitroAuth.grantedScopes;
+    return nitroAuth.grantedScopes;
   },
 
   get hasPlayServices() {
@@ -70,34 +26,15 @@ export const AuthService: Auth & {
   },
 
   async login(provider: AuthProvider, options?: LoginOptions) {
-    await nitroAuth.login(provider, options);
-    if (jsStorageAdapter) {
-      cachedUser = nitroAuth.currentUser;
-      cachedScopes = options?.scopes ?? nitroAuth.grantedScopes;
-      if (cachedUser) cachedUser.scopes = cachedScopes;
-      await saveToJSStorage(cachedUser);
-    }
+    return nitroAuth.login(provider, options);
   },
 
   async requestScopes(scopes: string[]) {
-    await nitroAuth.requestScopes(scopes);
-    if (jsStorageAdapter) {
-      cachedUser = nitroAuth.currentUser;
-      for (const s of scopes) {
-        if (!cachedScopes.includes(s)) cachedScopes.push(s);
-      }
-      if (cachedUser) cachedUser.scopes = cachedScopes;
-      await saveToJSStorage(cachedUser);
-    }
+    return nitroAuth.requestScopes(scopes);
   },
 
   async revokeScopes(scopes: string[]) {
-    await nitroAuth.revokeScopes(scopes);
-    if (jsStorageAdapter) {
-      cachedScopes = cachedScopes.filter((s) => !scopes.includes(s));
-      if (cachedUser) cachedUser.scopes = cachedScopes;
-      await saveToJSStorage(cachedUser);
-    }
+    return nitroAuth.revokeScopes(scopes);
   },
 
   async getAccessToken() {
@@ -105,36 +42,20 @@ export const AuthService: Auth & {
   },
 
   async refreshToken() {
-    const tokens = await nitroAuth.refreshToken();
-    if (jsStorageAdapter && cachedUser) {
-      cachedUser.accessToken = tokens.accessToken;
-      cachedUser.idToken = tokens.idToken;
-      await saveToJSStorage(cachedUser);
-    }
-    return tokens;
+    return nitroAuth.refreshToken();
   },
 
   logout() {
     nitroAuth.logout();
-    if (jsStorageAdapter) {
-      cachedUser = undefined;
-      cachedScopes = [];
-      saveToJSStorage(undefined);
-    }
   },
 
   async silentRestore() {
-    await nitroAuth.silentRestore();
-    if (jsStorageAdapter) {
-      cachedUser = nitroAuth.currentUser;
-      cachedScopes = nitroAuth.grantedScopes;
-      await saveToJSStorage(cachedUser);
-    }
+    return nitroAuth.silentRestore();
   },
 
   onAuthStateChanged(callback: (user: AuthUser | undefined) => void) {
-    return nitroAuth.onAuthStateChanged(() => {
-      callback(AuthService.currentUser);
+    return nitroAuth.onAuthStateChanged((user) => {
+      callback(user);
     });
   },
 
@@ -146,25 +67,11 @@ export const AuthService: Auth & {
     nitroAuth.setLoggingEnabled(enabled);
   },
 
-  setStorageAdapter(adapter: AuthStorageAdapter | undefined): void {
-    nitroAuth.setStorageAdapter(adapter);
-  },
-
-  async setJSStorageAdapter(adapter: JSStorageAdapter | undefined) {
-    jsStorageAdapter = adapter;
-    if (adapter) {
-      await loadFromJSStorage();
-    } else {
-      cachedUser = undefined;
-      cachedScopes = [];
-    }
-  },
-
   dispose() {
     nitroAuth.dispose();
   },
 
-  equals(other: unknown): boolean {
-    return (nitroAuth as { equals(o: unknown): boolean }).equals(other);
+  equals(other: Parameters<Auth["equals"]>[0]): boolean {
+    return nitroAuth.equals(other);
   },
 };

package/src/service.web.ts

@@ -1,6 +1,4 @@
 import { AuthModule } from "./Auth.web";
-import type { AuthStorageAdapter } from "./AuthStorage.nitro";
-import type { JSStorageAdapter } from "./service";
 
 export const AuthService = {
   ...AuthModule,
@@ -31,11 +29,6 @@ export const AuthService = {
   onAuthStateChanged: AuthModule.onAuthStateChanged.bind(AuthModule),
   onTokensRefreshed: AuthModule.onTokensRefreshed.bind(AuthModule),
   setLoggingEnabled: AuthModule.setLoggingEnabled.bind(AuthModule),
-  setStorageAdapter: AuthModule.setStorageAdapter.bind(AuthModule),
   dispose: AuthModule.dispose.bind(AuthModule),
   equals: AuthModule.equals.bind(AuthModule),
-
-  setJSStorageAdapter(adapter: JSStorageAdapter | undefined): void {
-    AuthModule.setStorageAdapter(adapter as AuthStorageAdapter | undefined);
-  },
 };

package/src/ui/social-button.tsx

@@ -1,19 +1,20 @@
 import React, { useState } from "react";
+import type { ViewStyle, TextStyle } from "react-native";
 import {
   Pressable,
   Text,
   StyleSheet,
   View,
-  ViewStyle,
-  TextStyle,
   ActivityIndicator,
 } from "react-native";
 import { NitroModules } from "react-native-nitro-modules";
 import type { Auth, AuthProvider, AuthUser } from "../Auth.nitro";
 
-interface SocialButtonProps {
+export type SocialButtonVariant = "primary" | "outline" | "white" | "black";
+
+export type SocialButtonProps = {
   provider: AuthProvider;
-  variant?: "primary" | "outline" | "white" | "black";
+  variant?: SocialButtonVariant;
   borderRadius?: number;
   style?: ViewStyle;
   textStyle?: TextStyle;
@@ -21,14 +22,45 @@ interface SocialButtonProps {
   onSuccess?: (user: AuthUser) => void;
   onError?: (error: unknown) => void;
   onPress?: () => void;
-}
+};
+
+const PROVIDER_LABELS: Record<AuthProvider, string> = {
+  google: "Google",
+  apple: "Apple",
+  microsoft: "Microsoft",
+};
+
+const PROVIDER_PRIMARY_BACKGROUND: Record<AuthProvider, string> = {
+  google: "#4285F4",
+  apple: "#000000",
+  microsoft: "#2F2F2F",
+};
+
+const getBackgroundColor = ({
+  disabled,
+  variant,
+  provider,
+}: {
+  disabled: boolean;
+  variant: SocialButtonVariant;
+  provider: AuthProvider;
+}): string => {
+  if (disabled) return "#CCCCCC";
+  if (variant === "black") return "#000000";
+  if (variant === "white") return "#FFFFFF";
+  if (variant === "outline") return "transparent";
+  return PROVIDER_PRIMARY_BACKGROUND[provider];
+};
+
+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);
 }
 
-export const SocialButton: React.FC<SocialButtonProps> = ({
+export const SocialButton = ({
   provider,
   variant = "primary",
   borderRadius = 8,
@@ -38,46 +70,30 @@ export const SocialButton: React.FC<SocialButtonProps> = ({
   onSuccess,
   onError,
   onPress,
-}) => {
+}: SocialButtonProps) => {
   const [loading, setLoading] = useState(false);
 
-  const handleLogin = () => {
+  const handleLogin = async () => {
     if (loading || disabled) return;
     if (onPress) {
       onPress();
       return;
     }
-    setLoading(true);
-    performLogin(provider)
-      .then(() => {
-        setLoading(false);
-        const user = NitroModules.createHybridObject<Auth>("Auth").currentUser;
-        if (user) onSuccess?.(user);
-      })
-      .catch((e) => {
-        setLoading(false);
-        onError?.(e);
-      });
-  };
 
-  const isGoogle = provider === "google";
-  const isMicrosoft = provider === "microsoft";
-  const isDisabled = loading || disabled;
-
-  const getBackgroundColor = () => {
-    if (isDisabled) return "#CCCCCC";
-    if (variant === "black") return "#000000";
-    if (variant === "white") return "#FFFFFF";
-    if (variant === "outline") return "transparent";
-    if (isGoogle) return "#4285F4";
-    if (isMicrosoft) return "#2F2F2F";
-    return "#000000";
-  };
-
-  const getTextColor = () => {
-    if (variant === "white" || variant === "outline") return "#000000";
-    return "#FFFFFF";
+    setLoading(true);
+    try {
+      await performLogin(provider);
+      const user = NitroModules.createHybridObject<Auth>("Auth").currentUser;
+      if (user) {
+        onSuccess?.(user);
+      }
+    } catch (error) {
+      onError?.(error);
+    } finally {
+      setLoading(false);
+    }
   };
+  const isDisabled = loading || disabled === true;
 
   const getBorderColor = () => {
     if (variant === "outline") return "#DDDDDD";
@@ -89,7 +105,11 @@ export const SocialButton: React.FC<SocialButtonProps> = ({
       style={[
         styles.button,
         {
-          backgroundColor: getBackgroundColor(),
+          backgroundColor: getBackgroundColor({
+            disabled: isDisabled,
+            variant,
+            provider,
+          }),
           borderRadius,
           borderColor: getBorderColor(),
           borderWidth: variant === "outline" ? 1 : 0,
@@ -101,7 +121,7 @@ export const SocialButton: React.FC<SocialButtonProps> = ({
     >
       <View style={styles.content}>
         {loading ? (
-          <ActivityIndicator size="small" color={getTextColor()} />
+          <ActivityIndicator size="small" color={getTextColor(variant)} />
         ) : (
           <>
             {provider === "google" && variant !== "primary" && (
@@ -111,7 +131,9 @@ export const SocialButton: React.FC<SocialButtonProps> = ({
             )}
             {provider === "apple" && variant !== "primary" && (
               <View style={styles.iconPlaceholder}>
-                <Text style={{ fontSize: 18, color: getTextColor() }}></Text>
+                <Text style={{ fontSize: 18, color: getTextColor(variant) }}>
+                  
+                </Text>
               </View>
             )}
             {provider === "microsoft" && variant !== "primary" && (
@@ -119,9 +141,10 @@ export const SocialButton: React.FC<SocialButtonProps> = ({
                 <Text style={{ fontSize: 16 }}>⊞</Text>
               </View>
             )}
-            <Text style={[styles.text, { color: getTextColor() }, textStyle]}>
-              Sign in with{" "}
-              {provider.charAt(0).toUpperCase() + provider.slice(1)}
+            <Text
+              style={[styles.text, { color: getTextColor(variant) }, textStyle]}
+            >
+              Sign in with {PROVIDER_LABELS[provider]}
             </Text>
           </>
         )}

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

@@ -1,19 +1,20 @@
 import React, { useState } from "react";
+import type { ViewStyle, TextStyle } from "react-native";
 import {
   Pressable,
   Text,
   StyleSheet,
   View,
-  ViewStyle,
-  TextStyle,
   ActivityIndicator,
 } from "react-native";
-import type { AuthProvider, AuthUser } from "../Auth.nitro";
 import { AuthModule } from "../Auth.web";
+import type { AuthProvider, AuthUser } from "../Auth.nitro";
+
+export type SocialButtonVariant = "primary" | "outline" | "white" | "black";
 
-interface SocialButtonProps {
+export type SocialButtonProps = {
   provider: AuthProvider;
-  variant?: "primary" | "outline" | "white" | "black";
+  variant?: SocialButtonVariant;
   borderRadius?: number;
   style?: ViewStyle;
   textStyle?: TextStyle;
@@ -21,13 +22,44 @@ interface SocialButtonProps {
   onSuccess?: (user: AuthUser) => void;
   onError?: (error: unknown) => void;
   onPress?: () => void;
-}
+};
+
+const PROVIDER_LABELS: Record<AuthProvider, string> = {
+  google: "Google",
+  apple: "Apple",
+  microsoft: "Microsoft",
+};
+
+const PROVIDER_PRIMARY_BACKGROUND: Record<AuthProvider, string> = {
+  google: "#4285F4",
+  apple: "#000000",
+  microsoft: "#2F2F2F",
+};
+
+const getBackgroundColor = ({
+  disabled,
+  variant,
+  provider,
+}: {
+  disabled: boolean;
+  variant: SocialButtonVariant;
+  provider: AuthProvider;
+}): string => {
+  if (disabled) return "#CCCCCC";
+  if (variant === "black") return "#000000";
+  if (variant === "white") return "#FFFFFF";
+  if (variant === "outline") return "transparent";
+  return PROVIDER_PRIMARY_BACKGROUND[provider];
+};
+
+const getTextColor = (variant: SocialButtonVariant): string =>
+  variant === "white" || variant === "outline" ? "#000000" : "#FFFFFF";
 
 async function performLogin(provider: AuthProvider): Promise<void> {
   await AuthModule.login(provider);
 }
 
-export const SocialButton: React.FC<SocialButtonProps> = ({
+export const SocialButton = ({
   provider,
   variant = "primary",
   borderRadius = 8,
@@ -37,46 +69,30 @@ export const SocialButton: React.FC<SocialButtonProps> = ({
   onSuccess,
   onError,
   onPress,
-}) => {
+}: SocialButtonProps) => {
   const [loading, setLoading] = useState(false);
 
-  const handleLogin = () => {
+  const handleLogin = async () => {
     if (loading || disabled) return;
     if (onPress) {
       onPress();
       return;
     }
-    setLoading(true);
-    performLogin(provider)
-      .then(() => {
-        setLoading(false);
-        const user = AuthModule.currentUser;
-        if (user) onSuccess?.(user);
-      })
-      .catch((e) => {
-        setLoading(false);
-        onError?.(e);
-      });
-  };
 
-  const isGoogle = provider === "google";
-  const isMicrosoft = provider === "microsoft";
-  const isDisabled = loading || disabled;
-
-  const getBackgroundColor = () => {
-    if (isDisabled) return "#CCCCCC";
-    if (variant === "black") return "#000000";
-    if (variant === "white") return "#FFFFFF";
-    if (variant === "outline") return "transparent";
-    if (isGoogle) return "#4285F4";
-    if (isMicrosoft) return "#2F2F2F";
-    return "#000000";
-  };
-
-  const getTextColor = () => {
-    if (variant === "white" || variant === "outline") return "#000000";
-    return "#FFFFFF";
+    setLoading(true);
+    try {
+      await performLogin(provider);
+      const user = AuthModule.currentUser;
+      if (user) {
+        onSuccess?.(user);
+      }
+    } catch (error) {
+      onError?.(error);
+    } finally {
+      setLoading(false);
+    }
   };
+  const isDisabled = loading || disabled === true;
 
   const getBorderColor = () => {
     if (variant === "outline") return "#DDDDDD";
@@ -88,7 +104,11 @@ export const SocialButton: React.FC<SocialButtonProps> = ({
       style={[
         styles.button,
         {
-          backgroundColor: getBackgroundColor(),
+          backgroundColor: getBackgroundColor({
+            disabled: isDisabled,
+            variant,
+            provider,
+          }),
           borderRadius,
           borderColor: getBorderColor(),
           borderWidth: variant === "outline" ? 1 : 0,
@@ -100,7 +120,7 @@ export const SocialButton: React.FC<SocialButtonProps> = ({
     >
       <View style={styles.content}>
         {loading ? (
-          <ActivityIndicator size="small" color={getTextColor()} />
+          <ActivityIndicator size="small" color={getTextColor(variant)} />
         ) : (
           <>
             {provider === "google" && variant !== "primary" && (
@@ -110,7 +130,9 @@ export const SocialButton: React.FC<SocialButtonProps> = ({
             )}
             {provider === "apple" && variant !== "primary" && (
               <View style={styles.iconPlaceholder}>
-                <Text style={{ fontSize: 18, color: getTextColor() }}></Text>
+                <Text style={{ fontSize: 18, color: getTextColor(variant) }}>
+                  
+                </Text>
               </View>
             )}
             {provider === "microsoft" && variant !== "primary" && (
@@ -118,9 +140,10 @@ export const SocialButton: React.FC<SocialButtonProps> = ({
                 <Text style={{ fontSize: 16 }}>⊞</Text>
               </View>
             )}
-            <Text style={[styles.text, { color: getTextColor() }, textStyle]}>
-              Sign in with{" "}
-              {provider.charAt(0).toUpperCase() + provider.slice(1)}
+            <Text
+              style={[styles.text, { color: getTextColor(variant) }, textStyle]}
+            >
+              Sign in with {PROVIDER_LABELS[provider]}
             </Text>
           </>
         )}