react-native-nitro-auth 0.5.1 → 0.5.4

package/src/use-auth.ts

@@ -1,20 +1,44 @@
 import { useState, useEffect, useCallback, useMemo } from "react";
-import { AuthService } from "./service";
 import type {
   AuthUser,
   AuthProvider,
   LoginOptions,
   AuthTokens,
 } from "./Auth.nitro";
+import { AuthService } from "./service";
 
-interface AuthState {
+type AuthState = {
   user: AuthUser | undefined;
   scopes: string[];
   loading: boolean;
   error: Error | undefined;
+};
+
+const areScopesEqual = (left: string[], right: string[]): boolean => {
+  if (left.length !== right.length) {
+    return false;
+  }
+
+  for (let index = 0; index < left.length; index += 1) {
+    if (left[index] !== right[index]) {
+      return false;
+    }
+  }
+
+  return true;
+};
+
+class AuthHookError extends Error {
+  public readonly underlyingError?: string;
+
+  constructor(message: string, underlyingError?: string) {
+    super(message);
+    this.name = "AuthHookError";
+    this.underlyingError = underlyingError;
+  }
 }
 
-export interface UseAuthReturn extends AuthState {
+export type UseAuthReturn = AuthState & {
   hasPlayServices: boolean;
   login: (provider: AuthProvider, options?: LoginOptions) => Promise<void>;
   logout: () => void;
@@ -23,7 +47,7 @@ export interface UseAuthReturn extends AuthState {
   getAccessToken: () => Promise<string | undefined>;
   refreshToken: () => Promise<AuthTokens>;
   silentRestore: () => Promise<void>;
-}
+};
 
 export function useAuth(): UseAuthReturn {
   const [state, setState] = useState<AuthState>({
@@ -33,17 +57,37 @@ export function useAuth(): UseAuthReturn {
     error: undefined,
   });
 
+  const syncStateFromService = useCallback(
+    (nextLoading: boolean, nextError: Error | undefined) => {
+      const nextUser = AuthService.currentUser;
+      const nextScopes = AuthService.grantedScopes;
+      setState((prev) => {
+        if (
+          prev.loading === nextLoading &&
+          prev.error === nextError &&
+          prev.user === nextUser &&
+          areScopesEqual(prev.scopes, nextScopes)
+        ) {
+          return prev;
+        }
+
+        return {
+          user: nextUser,
+          scopes: nextScopes,
+          loading: nextLoading,
+          error: nextError,
+        };
+      });
+    },
+    [],
+  );
+
   const login = useCallback(
     async (provider: AuthProvider, options?: LoginOptions) => {
       setState((prev) => ({ ...prev, loading: true, error: undefined }));
       try {
         await AuthService.login(provider, options);
-        setState({
-          user: AuthService.currentUser,
-          scopes: AuthService.grantedScopes,
-          loading: false,
-          error: undefined,
-        });
+        syncStateFromService(false, undefined);
       } catch (e) {
         const error = e instanceof Error ? e : new Error(String(e));
         setState((prev) => ({
@@ -54,7 +98,7 @@ export function useAuth(): UseAuthReturn {
         throw error;
       }
     },
-    [],
+    [syncStateFromService],
   );
 
   const logout = useCallback(() => {
@@ -67,47 +111,43 @@ export function useAuth(): UseAuthReturn {
     });
   }, []);
 
-  const requestScopes = useCallback(async (newScopes: string[]) => {
-    setState((prev) => ({ ...prev, loading: true, error: undefined }));
-    try {
-      await AuthService.requestScopes(newScopes);
-      setState({
-        user: AuthService.currentUser,
-        scopes: AuthService.grantedScopes,
-        loading: false,
-        error: undefined,
-      });
-    } catch (e) {
-      const error = e instanceof Error ? e : new Error(String(e));
-      setState((prev) => ({
-        ...prev,
-        loading: false,
-        error,
-      }));
-      throw error;
-    }
-  }, []);
+  const requestScopes = useCallback(
+    async (newScopes: string[]) => {
+      setState((prev) => ({ ...prev, loading: true, error: undefined }));
+      try {
+        await AuthService.requestScopes(newScopes);
+        syncStateFromService(false, undefined);
+      } catch (e) {
+        const error = e instanceof Error ? e : new Error(String(e));
+        setState((prev) => ({
+          ...prev,
+          loading: false,
+          error,
+        }));
+        throw error;
+      }
+    },
+    [syncStateFromService],
+  );
 
-  const revokeScopes = useCallback(async (scopesToRevoke: string[]) => {
-    setState((prev) => ({ ...prev, loading: true, error: undefined }));
-    try {
-      await AuthService.revokeScopes(scopesToRevoke);
-      setState({
-        user: AuthService.currentUser,
-        scopes: AuthService.grantedScopes,
-        loading: false,
-        error: undefined,
-      });
-    } catch (e) {
-      const error = e instanceof Error ? e : new Error(String(e));
-      setState((prev) => ({
-        ...prev,
-        loading: false,
-        error,
-      }));
-      throw error;
-    }
-  }, []);
+  const revokeScopes = useCallback(
+    async (scopesToRevoke: string[]) => {
+      setState((prev) => ({ ...prev, loading: true, error: undefined }));
+      try {
+        await AuthService.revokeScopes(scopesToRevoke);
+        syncStateFromService(false, undefined);
+      } catch (e) {
+        const error = e instanceof Error ? e : new Error(String(e));
+        setState((prev) => ({
+          ...prev,
+          loading: false,
+          error,
+        }));
+        throw error;
+      }
+    },
+    [syncStateFromService],
+  );
 
   const getAccessToken = useCallback(() => AuthService.getAccessToken(), []);
 
@@ -115,17 +155,14 @@ export function useAuth(): UseAuthReturn {
     setState((prev) => ({ ...prev, loading: true, error: undefined }));
     try {
       const tokens = await AuthService.refreshToken();
-      setState({
-        user: AuthService.currentUser,
-        scopes: AuthService.grantedScopes,
-        loading: false,
-        error: undefined,
-      });
+      syncStateFromService(false, undefined);
       return tokens;
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
-      const authError = new Error(msg) as Error & { underlyingError?: string };
-      authError.underlyingError = AuthService.currentUser?.underlyingError;
+      const authError = new AuthHookError(
+        msg,
+        AuthService.currentUser?.underlyingError,
+      );
       setState((prev) => ({
         ...prev,
         loading: false,
@@ -133,18 +170,13 @@ export function useAuth(): UseAuthReturn {
       }));
       throw authError;
     }
-  }, []);
+  }, [syncStateFromService]);
 
   const silentRestore = useCallback(async () => {
     setState((prev) => ({ ...prev, loading: true, error: undefined }));
     try {
       await AuthService.silentRestore();
-      setState({
-        user: AuthService.currentUser,
-        scopes: AuthService.grantedScopes,
-        loading: false,
-        error: undefined,
-      });
+      syncStateFromService(false, undefined);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
       setState((prev) => ({
@@ -154,15 +186,27 @@ export function useAuth(): UseAuthReturn {
       }));
       throw error;
     }
-  }, []);
+  }, [syncStateFromService]);
 
   useEffect(() => {
     const unsubscribe = AuthService.onAuthStateChanged((currentUser) => {
-      setState((prev) => ({
-        ...prev,
-        user: currentUser,
-        scopes: AuthService.grantedScopes,
-      }));
+      const nextScopes = AuthService.grantedScopes;
+      setState((prev) => {
+        if (
+          prev.user === currentUser &&
+          areScopesEqual(prev.scopes, nextScopes) &&
+          prev.loading === false
+        ) {
+          return prev;
+        }
+
+        return {
+          ...prev,
+          user: currentUser,
+          scopes: nextScopes,
+          loading: false,
+        };
+      });
     });
     return unsubscribe;
   }, []);

package/src/utils/logger.ts

@@ -4,8 +4,16 @@ export const logger = {
   setEnabled(value: boolean): void {
     enabled = value;
   },
-  log: (...args: unknown[]) => enabled && console.log("[NitroAuth]", ...args),
-  warn: (...args: unknown[]) => enabled && console.warn("[NitroAuth]", ...args),
-  error: (...args: unknown[]) => enabled && console.error("[NitroAuth]", ...args),
-  debug: (...args: unknown[]) => enabled && console.debug("[NitroAuth]", ...args),
+  log: (...args: unknown[]) => {
+    if (enabled) console.log("[NitroAuth]", ...args);
+  },
+  warn: (...args: unknown[]) => {
+    if (enabled) console.warn("[NitroAuth]", ...args);
+  },
+  error: (...args: unknown[]) => {
+    if (enabled) console.error("[NitroAuth]", ...args);
+  },
+  debug: (...args: unknown[]) => {
+    if (enabled) console.debug("[NitroAuth]", ...args);
+  },
 };

package/ios/KeychainStore.swift

@@ -1,43 +0,0 @@
-import Foundation
-import Security
-
-enum KeychainStore {
-  private static let service = "react-native-nitro-auth"
-
-  static func set(_ value: String, for key: String) {
-    guard let data = value.data(using: .utf8) else { return }
-    let baseQuery: [String: Any] = [
-      kSecClass as String: kSecClassGenericPassword,
-      kSecAttrService as String: service,
-      kSecAttrAccount as String: key
-    ]
-    SecItemDelete(baseQuery as CFDictionary)
-    var attributes = baseQuery
-    attributes[kSecValueData as String] = data
-    attributes[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly
-    SecItemAdd(attributes as CFDictionary, nil)
-  }
-
-  static func get(_ key: String) -> String? {
-    let query: [String: Any] = [
-      kSecClass as String: kSecClassGenericPassword,
-      kSecAttrService as String: service,
-      kSecAttrAccount as String: key,
-      kSecReturnData as String: kCFBooleanTrue as Any,
-      kSecMatchLimit as String: kSecMatchLimitOne
-    ]
-    var item: CFTypeRef?
-    let status = SecItemCopyMatching(query as CFDictionary, &item)
-    guard status == errSecSuccess, let data = item as? Data else { return nil }
-    return String(data: data, encoding: .utf8)
-  }
-
-  static func remove(_ key: String) {
-    let query: [String: Any] = [
-      kSecClass as String: kSecClassGenericPassword,
-      kSecAttrService as String: service,
-      kSecAttrAccount as String: key
-    ]
-    SecItemDelete(query as CFDictionary)
-  }
-}

package/lib/commonjs/AuthStorage.nitro.js

@@ -1,6 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-//# sourceMappingURL=AuthStorage.nitro.js.map

package/lib/commonjs/AuthStorage.nitro.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sourceRoot":"../../src","sources":["AuthStorage.nitro.ts"],"mappings":"","ignoreList":[]}

package/lib/module/AuthStorage.nitro.js

@@ -1,4 +0,0 @@
-"use strict";
-
-export {};
-//# sourceMappingURL=AuthStorage.nitro.js.map

package/lib/module/AuthStorage.nitro.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sourceRoot":"../../src","sources":["AuthStorage.nitro.ts"],"mappings":"","ignoreList":[]}

package/lib/typescript/commonjs/AuthStorage.nitro.d.ts

@@ -1,26 +0,0 @@
-import type { HybridObject } from "react-native-nitro-modules";
-/**
- * Custom storage adapter for persisting auth state.
- *
- * On native platforms, this must be a native HybridObject (Swift/Kotlin).
- * For JS-based storage (AsyncStorage, MMKV), use the JS wrapper approach
- * documented in the README.
- */
-export interface AuthStorageAdapter extends HybridObject<{
-    ios: "c++";
-    android: "c++";
-}> {
-    /**
-     * Called to save a value to the custom storage.
-     */
-    save(key: string, value: string): void;
-    /**
-     * Called to load a value from the custom storage.
-     */
-    load(key: string): string | undefined;
-    /**
-     * Called to remove a value from the custom storage.
-     */
-    remove(key: string): void;
-}
-//# sourceMappingURL=AuthStorage.nitro.d.ts.map

package/lib/typescript/commonjs/AuthStorage.nitro.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AuthStorage.nitro.d.ts","sourceRoot":"","sources":["../../../src/AuthStorage.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D;;;;;;GAMG;AACH,MAAM,WAAW,kBAAmB,SAAQ,YAAY,CAAC;IACvD,GAAG,EAAE,KAAK,CAAC;IACX,OAAO,EAAE,KAAK,CAAC;CAChB,CAAC;IACA;;OAEG;IACH,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC;;OAEG;IACH,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACtC;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B"}

package/lib/typescript/module/AuthStorage.nitro.d.ts

@@ -1,26 +0,0 @@
-import type { HybridObject } from "react-native-nitro-modules";
-/**
- * Custom storage adapter for persisting auth state.
- *
- * On native platforms, this must be a native HybridObject (Swift/Kotlin).
- * For JS-based storage (AsyncStorage, MMKV), use the JS wrapper approach
- * documented in the README.
- */
-export interface AuthStorageAdapter extends HybridObject<{
-    ios: "c++";
-    android: "c++";
-}> {
-    /**
-     * Called to save a value to the custom storage.
-     */
-    save(key: string, value: string): void;
-    /**
-     * Called to load a value from the custom storage.
-     */
-    load(key: string): string | undefined;
-    /**
-     * Called to remove a value from the custom storage.
-     */
-    remove(key: string): void;
-}
-//# sourceMappingURL=AuthStorage.nitro.d.ts.map

package/lib/typescript/module/AuthStorage.nitro.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AuthStorage.nitro.d.ts","sourceRoot":"","sources":["../../../src/AuthStorage.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D;;;;;;GAMG;AACH,MAAM,WAAW,kBAAmB,SAAQ,YAAY,CAAC;IACvD,GAAG,EAAE,KAAK,CAAC;IACX,OAAO,EAAE,KAAK,CAAC;CAChB,CAAC;IACA;;OAEG;IACH,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC;;OAEG;IACH,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACtC;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B"}

package/nitrogen/generated/shared/c++/HybridAuthStorageAdapterSpec.cpp

@@ -1,23 +0,0 @@
-///
-/// HybridAuthStorageAdapterSpec.cpp
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © Marc Rousavy @ Margelo
-///
-
-#include "HybridAuthStorageAdapterSpec.hpp"
-
-namespace margelo::nitro::NitroAuth {
-
-  void HybridAuthStorageAdapterSpec::loadHybridMethods() {
-    // load base methods/properties
-    HybridObject::loadHybridMethods();
-    // load custom methods/properties
-    registerHybrids(this, [](Prototype& prototype) {
-      prototype.registerHybridMethod("save", &HybridAuthStorageAdapterSpec::save);
-      prototype.registerHybridMethod("load", &HybridAuthStorageAdapterSpec::load);
-      prototype.registerHybridMethod("remove", &HybridAuthStorageAdapterSpec::remove);
-    });
-  }
-
-} // namespace margelo::nitro::NitroAuth

package/nitrogen/generated/shared/c++/HybridAuthStorageAdapterSpec.hpp

@@ -1,65 +0,0 @@
-///
-/// HybridAuthStorageAdapterSpec.hpp
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © Marc Rousavy @ Margelo
-///
-
-#pragma once
-
-#if __has_include(<NitroModules/HybridObject.hpp>)
-#include <NitroModules/HybridObject.hpp>
-#else
-#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
-#endif
-
-
-
-#include <string>
-#include <optional>
-
-namespace margelo::nitro::NitroAuth {
-
-  using namespace margelo::nitro;
-
-  /**
-   * An abstract base class for `AuthStorageAdapter`
-   * Inherit this class to create instances of `HybridAuthStorageAdapterSpec` in C++.
-   * You must explicitly call `HybridObject`'s constructor yourself, because it is virtual.
-   * @example
-   * ```cpp
-   * class HybridAuthStorageAdapter: public HybridAuthStorageAdapterSpec {
-   * public:
-   *   HybridAuthStorageAdapter(...): HybridObject(TAG) { ... }
-   *   // ...
-   * };
-   * ```
-   */
-  class HybridAuthStorageAdapterSpec: public virtual HybridObject {
-    public:
-      // Constructor
-      explicit HybridAuthStorageAdapterSpec(): HybridObject(TAG) { }
-
-      // Destructor
-      ~HybridAuthStorageAdapterSpec() override = default;
-
-    public:
-      // Properties
-      
-
-    public:
-      // Methods
-      virtual void save(const std::string& key, const std::string& value) = 0;
-      virtual std::optional<std::string> load(const std::string& key) = 0;
-      virtual void remove(const std::string& key) = 0;
-
-    protected:
-      // Hybrid Setup
-      void loadHybridMethods() override;
-
-    protected:
-      // Tag for logging
-      static constexpr auto TAG = "AuthStorageAdapter";
-  };
-
-} // namespace margelo::nitro::NitroAuth

package/src/AuthStorage.nitro.ts

@@ -1,26 +0,0 @@
-import type { HybridObject } from "react-native-nitro-modules";
-
-/**
- * Custom storage adapter for persisting auth state.
- *
- * On native platforms, this must be a native HybridObject (Swift/Kotlin).
- * For JS-based storage (AsyncStorage, MMKV), use the JS wrapper approach
- * documented in the README.
- */
-export interface AuthStorageAdapter extends HybridObject<{
-  ios: "c++";
-  android: "c++";
-}> {
-  /**
-   * Called to save a value to the custom storage.
-   */
-  save(key: string, value: string): void;
-  /**
-   * Called to load a value from the custom storage.
-   */
-  load(key: string): string | undefined;
-  /**
-   * Called to remove a value from the custom storage.
-   */
-  remove(key: string): void;
-}