react-native-nitro-auth 0.5.7 → 0.5.9

package/src/service.ts

@@ -1,12 +1,6 @@
 import { NitroModules } from "react-native-nitro-modules";
-import type {
-  Auth,
-  AuthProvider,
-  AuthTokens,
-  LoginOptions,
-  AuthUser,
-} from "./Auth.nitro";
-import { AuthError } from "./utils/auth-error";
+import type { Auth } from "./Auth.nitro";
+import { createAuthService } from "./create-auth-service";
 
 let nitroAuth: Auth | undefined;
 
@@ -15,96 +9,4 @@ function getNitroAuth(): Auth {
   return nitroAuth;
 }
 
-export const AuthService: Auth = {
-  get name() {
-    return getNitroAuth().name;
-  },
-
-  get currentUser() {
-    return getNitroAuth().currentUser;
-  },
-
-  get grantedScopes() {
-    return getNitroAuth().grantedScopes;
-  },
-
-  get hasPlayServices() {
-    return getNitroAuth().hasPlayServices;
-  },
-
-  async login(provider: AuthProvider, options?: LoginOptions) {
-    try {
-      await getNitroAuth().login(provider, options);
-      return;
-    } catch (e) {
-      throw AuthError.from(e);
-    }
-  },
-
-  async requestScopes(scopes: string[]) {
-    try {
-      await getNitroAuth().requestScopes(scopes);
-      return;
-    } catch (e) {
-      throw AuthError.from(e);
-    }
-  },
-
-  async revokeScopes(scopes: string[]) {
-    try {
-      await getNitroAuth().revokeScopes(scopes);
-      return;
-    } catch (e) {
-      throw AuthError.from(e);
-    }
-  },
-
-  async getAccessToken() {
-    try {
-      return await getNitroAuth().getAccessToken();
-    } catch (e) {
-      throw AuthError.from(e);
-    }
-  },
-
-  async refreshToken() {
-    try {
-      return await getNitroAuth().refreshToken();
-    } catch (e) {
-      throw AuthError.from(e);
-    }
-  },
-
-  logout() {
-    getNitroAuth().logout();
-  },
-
-  async silentRestore() {
-    try {
-      await getNitroAuth().silentRestore();
-      return;
-    } catch (e) {
-      throw AuthError.from(e);
-    }
-  },
-
-  onAuthStateChanged(callback: (user: AuthUser | undefined) => void) {
-    return getNitroAuth().onAuthStateChanged(callback);
-  },
-
-  onTokensRefreshed(callback: (tokens: AuthTokens) => void) {
-    return getNitroAuth().onTokensRefreshed(callback);
-  },
-
-  setLoggingEnabled(enabled: boolean) {
-    getNitroAuth().setLoggingEnabled(enabled);
-  },
-
-  dispose() {
-    getNitroAuth().dispose();
-  },
-
-  equals(other: Parameters<Auth["equals"]>[0]): boolean {
-    return getNitroAuth().equals(other);
-  },
-};
+export const AuthService: Auth = createAuthService(getNitroAuth);

package/src/service.web.ts

@@ -1,103 +1,5 @@
-import type {
-  Auth,
-  AuthProvider,
-  AuthTokens,
-  LoginOptions,
-  AuthUser,
-} from "./Auth.nitro";
+import type { Auth } from "./Auth.nitro";
 import { AuthModule } from "./Auth.web";
-import { AuthError } from "./utils/auth-error";
+import { createAuthService } from "./create-auth-service";
 
-export const AuthService: Auth = {
-  get name() {
-    return AuthModule.name;
-  },
-
-  get currentUser() {
-    return AuthModule.currentUser;
-  },
-
-  get grantedScopes() {
-    return AuthModule.grantedScopes;
-  },
-
-  get hasPlayServices() {
-    return AuthModule.hasPlayServices;
-  },
-
-  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);
-  },
-};
+export const AuthService: Auth = createAuthService(() => AuthModule);

package/src/use-auth.ts

@@ -10,6 +10,10 @@ import { AuthError } from "./utils/auth-error";
 
 const EMPTY_SCOPES: string[] = [];
 
+function normalizeScopes(scopes: string[] | undefined): string[] {
+  return Array.isArray(scopes) ? scopes : EMPTY_SCOPES;
+}
+
 type AuthState = {
   user: AuthUser | undefined;
   scopes: string[];
@@ -53,7 +57,7 @@ export type UseAuthReturn = AuthState & {
 export function useAuth(): UseAuthReturn {
   const [state, setState] = useState<AuthState>({
     user: AuthService.currentUser,
-    scopes: AuthService.grantedScopes,
+    scopes: normalizeScopes(AuthService.grantedScopes),
     loading: false,
     error: undefined,
   });
@@ -61,7 +65,7 @@ export function useAuth(): UseAuthReturn {
   const syncStateFromService = useCallback(
     (nextLoading: boolean, nextError: AuthError | undefined) => {
       const nextUser = AuthService.currentUser;
-      const nextScopes = AuthService.grantedScopes;
+      const nextScopes = normalizeScopes(AuthService.grantedScopes);
       setState((prev) => {
         if (
           prev.loading === nextLoading &&
@@ -176,7 +180,7 @@ export function useAuth(): UseAuthReturn {
 
   useEffect(() => {
     const unsubscribeAuth = AuthService.onAuthStateChanged((currentUser) => {
-      const nextScopes = AuthService.grantedScopes;
+      const nextScopes = normalizeScopes(AuthService.grantedScopes);
       setState((prev) => {
         if (
           prev.user === currentUser &&

package/src/utils/auth-error.ts

@@ -23,7 +23,16 @@ export function isAuthErrorCode(value: string): value is AuthErrorCode {
 }
 
 export function toAuthErrorCode(raw: string): AuthErrorCode {
-  return isAuthErrorCode(raw) ? raw : "unknown";
+  if (isAuthErrorCode(raw)) {
+    return raw;
+  }
+
+  const prefix = raw.split(":", 1)[0]?.trim();
+  if (prefix && isAuthErrorCode(prefix)) {
+    return prefix;
+  }
+
+  return "unknown";
 }
 
 /**