react-native-nitro-auth 0.1.3 → 0.1.5

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

@@ -0,0 +1,23 @@
+///
+/// HybridAuthStorageAdapterSpec.cpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 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

@@ -0,0 +1,65 @@
+///
+/// HybridAuthStorageAdapterSpec.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 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/nitrogen/generated/shared/c++/LoginOptions.hpp

@@ -38,10 +38,11 @@ namespace margelo::nitro::NitroAuth {
   public:
     std::optional<std::vector<std::string>> scopes     SWIFT_PRIVATE;
     std::optional<std::string> loginHint     SWIFT_PRIVATE;
+    std::optional<bool> useOneTap     SWIFT_PRIVATE;
 
   public:
     LoginOptions() = default;
-    explicit LoginOptions(std::optional<std::vector<std::string>> scopes, std::optional<std::string> loginHint): scopes(scopes), loginHint(loginHint) {}
+    explicit LoginOptions(std::optional<std::vector<std::string>> scopes, std::optional<std::string> loginHint, std::optional<bool> useOneTap): scopes(scopes), loginHint(loginHint), useOneTap(useOneTap) {}
   };
 
 } // namespace margelo::nitro::NitroAuth
@@ -55,13 +56,15 @@ namespace margelo::nitro {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::NitroAuth::LoginOptions(
         JSIConverter<std::optional<std::vector<std::string>>>::fromJSI(runtime, obj.getProperty(runtime, "scopes")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "loginHint"))
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "loginHint")),
+        JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "useOneTap"))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::NitroAuth::LoginOptions& arg) {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, "scopes", JSIConverter<std::optional<std::vector<std::string>>>::toJSI(runtime, arg.scopes));
       obj.setProperty(runtime, "loginHint", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.loginHint));
+      obj.setProperty(runtime, "useOneTap", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.useOneTap));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -74,6 +77,7 @@ namespace margelo::nitro {
       }
       if (!JSIConverter<std::optional<std::vector<std::string>>>::canConvert(runtime, obj.getProperty(runtime, "scopes"))) return false;
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "loginHint"))) return false;
+      if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "useOneTap"))) return false;
       return true;
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-auth",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "High-performance authentication library for React Native with Google Sign-In and Apple Sign-In support, powered by Nitro Modules (JSI)",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -78,9 +78,8 @@
   "devDependencies": {
     "@expo/config-plugins": "^54.0.4",
     "@react-native/babel-preset": "^0.81.0",
-    "@testing-library/react": "^16.3.1",
-    "@testing-library/react-hooks": "^8.0.1",
-    "@testing-library/react-native": "^13.3.3",
+    "@testing-library/react": "^16.1.0",
+    "jest-environment-jsdom": "^29.7.0",
     "react": "19.1.0",
     "react-native": "0.81.5",
     "react-native-nitro-modules": "^0.32.0",

package/react-native-nitro-auth.podspec

@@ -33,7 +33,7 @@ Pod::Spec.new do |s|
   }
 
   s.dependency "React-Core"
-  s.dependency "GoogleSignIn"
+  s.dependency "GoogleSignIn", "~> 8.0"
   
   load 'nitrogen/generated/ios/NitroAuth+autolinking.rb'
   add_nitrogen_files(s)

package/src/Auth.nitro.ts

@@ -1,5 +1,7 @@
 import type { HybridObject } from "react-native-nitro-modules";
 
+import type { AuthStorageAdapter } from "./AuthStorage.nitro";
+
 export type AuthProvider = "google" | "apple";
 
 export type AuthErrorCode =
@@ -12,6 +14,7 @@ export type AuthErrorCode =
 export interface LoginOptions {
   scopes?: string[];
   loginHint?: string;
+  useOneTap?: boolean;
 }
 
 export interface AuthTokens {
@@ -48,4 +51,7 @@ export interface Auth extends HybridObject<{ ios: "c++"; android: "c++" }> {
   onAuthStateChanged(
     callback: (user: AuthUser | undefined) => void
   ): () => void;
+  onTokensRefreshed(callback: (tokens: AuthTokens) => void): () => void;
+  setLoggingEnabled(enabled: boolean): void;
+  setStorageAdapter(adapter: AuthStorageAdapter | undefined): void;
 }

package/src/Auth.web.ts

@@ -1,4 +1,12 @@
-import type { Auth, AuthUser, AuthProvider, LoginOptions } from "./Auth.nitro";
+import type {
+  Auth,
+  AuthUser,
+  AuthProvider,
+  LoginOptions,
+  AuthTokens,
+} from "./Auth.nitro";
+import type { AuthStorageAdapter } from "./AuthStorage.nitro";
+import { logger } from "./utils/logger";
 
 const CACHE_KEY = "nitro_auth_user";
 const SCOPES_KEY = "nitro_auth_scopes";
@@ -17,26 +25,47 @@ class AuthWeb implements Auth {
   private _currentUser: AuthUser | undefined;
   private _grantedScopes: string[] = [];
   private _listeners: ((user: AuthUser | undefined) => void)[] = [];
+  private _tokenListeners: ((tokens: AuthTokens) => void)[] = [];
+  private _storageAdapter: AuthStorageAdapter | undefined;
 
   constructor() {
-    const cached = localStorage.getItem(CACHE_KEY);
+    this.loadFromCache();
+  }
+
+  private loadFromCache() {
+    const cached = this._storageAdapter
+      ? this._storageAdapter.load(CACHE_KEY)
+      : localStorage.getItem(CACHE_KEY);
+
     if (cached) {
       try {
         this._currentUser = JSON.parse(cached);
       } catch {
-        localStorage.removeItem(CACHE_KEY);
+        this.removeFromCache(CACHE_KEY);
       }
     }
-    const scopes = localStorage.getItem(SCOPES_KEY);
+
+    const scopes = this._storageAdapter
+      ? this._storageAdapter.load(SCOPES_KEY)
+      : localStorage.getItem(SCOPES_KEY);
+
     if (scopes) {
       try {
         this._grantedScopes = JSON.parse(scopes);
       } catch {
-        localStorage.removeItem(SCOPES_KEY);
+        this.removeFromCache(SCOPES_KEY);
       }
     }
   }
 
+  private removeFromCache(key: string) {
+    if (this._storageAdapter) {
+      this._storageAdapter.remove(key);
+    } else {
+      localStorage.removeItem(key);
+    }
+  }
+
   get currentUser(): AuthUser | undefined {
     return this._currentUser;
   }
@@ -59,6 +88,13 @@ class AuthWeb implements Auth {
     };
   }
 
+  onTokensRefreshed(callback: (tokens: AuthTokens) => void): () => void {
+    this._tokenListeners.push(callback);
+    return () => {
+      this._tokenListeners = this._tokenListeners.filter((l) => l !== callback);
+    };
+  }
+
   private notify() {
     this._listeners.forEach((l) => l(this._currentUser));
   }
@@ -66,13 +102,18 @@ class AuthWeb implements Auth {
   async login(provider: AuthProvider, options?: LoginOptions): Promise<void> {
     const scopes = options?.scopes ?? DEFAULT_SCOPES;
     const loginHint = options?.loginHint;
+    logger.log(`Starting login with ${provider}`, { scopes });
     try {
       if (provider === "google") {
-        return await this.loginGoogle(scopes, loginHint);
+        await this.loginGoogle(scopes, loginHint);
+      } else {
+        await this.loginApple();
       }
-      return await this.loginApple();
+      logger.log(`Login successful with ${provider}`);
     } catch (e: unknown) {
-      throw this.mapError(e);
+      const error = this.mapError(e);
+      logger.error(`Login failed for ${provider}:`, error.message);
+      throw error;
     }
   }
 
@@ -83,17 +124,28 @@ class AuthWeb implements Auth {
     if (this._currentUser.provider !== "google") {
       throw new Error("Scope management only supported for Google");
     }
+    logger.log("Requesting additional scopes:", scopes);
     const newScopes = [...new Set([...this._grantedScopes, ...scopes])];
     return this.loginGoogle(newScopes).catch((e) => {
-      throw this.mapError(e);
+      const error = this.mapError(e);
+      logger.error("Requesting scopes failed:", error.message);
+      throw error;
     });
   }
 
   async revokeScopes(scopes: string[]): Promise<void> {
+    logger.log("Revoking scopes:", scopes);
     this._grantedScopes = this._grantedScopes.filter(
       (s) => !scopes.includes(s)
     );
-    localStorage.setItem(SCOPES_KEY, JSON.stringify(this._grantedScopes));
+    if (this._storageAdapter) {
+      this._storageAdapter.save(
+        SCOPES_KEY,
+        JSON.stringify(this._grantedScopes)
+      );
+    } else {
+      localStorage.setItem(SCOPES_KEY, JSON.stringify(this._grantedScopes));
+    }
     if (this._currentUser) {
       this._currentUser.scopes = this._grantedScopes;
       this.updateUser(this._currentUser);
@@ -104,6 +156,7 @@ class AuthWeb implements Auth {
     if (this._currentUser?.expirationTime) {
       const now = Date.now();
       if (now + 300000 > this._currentUser.expirationTime) {
+        logger.log("Token about to expire, refreshing...");
         await this.refreshToken();
       }
     }
@@ -117,27 +170,38 @@ class AuthWeb implements Auth {
     if (this._currentUser.provider !== "google") {
       throw new Error("Token refresh only supported for Google");
     }
+    logger.log("Refreshing tokens...");
     await this.loginGoogle(
       this._grantedScopes.length > 0 ? this._grantedScopes : DEFAULT_SCOPES
     );
-    return {
+    const tokens = {
       accessToken: this._currentUser.accessToken,
       idToken: this._currentUser.idToken,
     };
+    this._tokenListeners.forEach((l) => l(tokens));
+    return tokens;
   }
 
   private mapError(error: unknown): Error {
-    const msg = (error as any)?.message?.toLowerCase() ?? "";
+    if (error instanceof Error) {
+      const msg = error.message.toLowerCase();
+      if (msg.includes("cancel") || msg.includes("popup_closed")) {
+        return new Error("cancelled");
+      }
+      if (msg.includes("network")) {
+        return new Error("network_error");
+      }
+      if (msg.includes("client id") || msg.includes("config")) {
+        return new Error("configuration_error");
+      }
+      return error;
+    }
+
+    const msg = String(error).toLowerCase();
     if (msg.includes("cancel") || msg.includes("popup_closed")) {
       return new Error("cancelled");
     }
-    if (msg.includes("network")) {
-      return new Error("network_error");
-    }
-    if (msg.includes("client id") || msg.includes("config")) {
-      return new Error("configuration_error");
-    }
-    return error as Error;
+    return new Error(String(error));
   }
 
   private async loginGoogle(
@@ -158,9 +222,13 @@ class AuthWeb implements Auth {
       const authUrl = new URL("https://accounts.google.com/o/oauth2/v2/auth");
       authUrl.searchParams.set("client_id", clientId);
       authUrl.searchParams.set("redirect_uri", redirectUri);
-      authUrl.searchParams.set("response_type", "id_token token");
+      // Requesting code alongside tokens for server-side verification if needed
+      authUrl.searchParams.set("response_type", "id_token token code");
       authUrl.searchParams.set("scope", scopes.join(" "));
       authUrl.searchParams.set("nonce", Math.random().toString(36).slice(2));
+      authUrl.searchParams.set("access_type", "offline"); // Needed for server auth code flow
+      authUrl.searchParams.set("prompt", "consent"); // Force consent to get refresh token/code sometimes
+
       if (loginHint) {
         authUrl.searchParams.set("login_hint", loginHint);
       }
@@ -199,15 +267,21 @@ class AuthWeb implements Auth {
             const idToken = params.get("id_token");
             const accessToken = params.get("access_token");
             const expiresIn = params.get("expires_in");
+            const code = params.get("code");
 
             if (idToken) {
               this._grantedScopes = scopes;
-              localStorage.setItem(SCOPES_KEY, JSON.stringify(scopes));
+              if (this._storageAdapter) {
+                this._storageAdapter.save(SCOPES_KEY, JSON.stringify(scopes));
+              } else {
+                localStorage.setItem(SCOPES_KEY, JSON.stringify(scopes));
+              }
 
               const user: AuthUser = {
                 provider: "google",
                 idToken,
                 accessToken: accessToken ?? undefined,
+                serverAuthCode: code ?? undefined,
                 scopes,
                 expirationTime: expiresIn
                   ? Date.now() + parseInt(expiresIn) * 1000
@@ -289,17 +363,33 @@ class AuthWeb implements Auth {
   logout(): void {
     this._currentUser = undefined;
     this._grantedScopes = [];
-    localStorage.removeItem(CACHE_KEY);
-    localStorage.removeItem(SCOPES_KEY);
+    this.removeFromCache(CACHE_KEY);
+    this.removeFromCache(SCOPES_KEY);
     this.notify();
   }
 
   private updateUser(user: AuthUser) {
     this._currentUser = user;
-    localStorage.setItem(CACHE_KEY, JSON.stringify(user));
+    if (this._storageAdapter) {
+      this._storageAdapter.save(CACHE_KEY, JSON.stringify(user));
+    } else {
+      localStorage.setItem(CACHE_KEY, JSON.stringify(user));
+    }
     this.notify();
   }
 
+  setLoggingEnabled(enabled: boolean): void {
+    logger.setEnabled(enabled);
+  }
+
+  setStorageAdapter(adapter: AuthStorageAdapter | undefined): void {
+    this._storageAdapter = adapter;
+    if (adapter) {
+      this.loadFromCache();
+      this.notify();
+    }
+  }
+
   name = "Auth";
   dispose() {}
   equals(other: any) {

package/src/AuthStorage.nitro.ts

@@ -0,0 +1,17 @@
+import type { HybridObject } from "react-native-nitro-modules";
+
+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;
+}

package/src/index.ts

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

package/src/index.web.ts

@@ -1,4 +1,5 @@
 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/ui/social-button.tsx

@@ -23,10 +23,9 @@ interface SocialButtonProps {
   onPress?: () => void;
 }
 
-async function performLogin(provider: AuthProvider): Promise<AuthUser | null> {
+async function performLogin(provider: AuthProvider): Promise<void> {
   const auth = NitroModules.createHybridObject<Auth>("Auth");
   await auth.login(provider);
-  return auth.currentUser ?? null;
 }
 
 export const SocialButton: React.FC<SocialButtonProps> = ({
@@ -50,8 +49,9 @@ export const SocialButton: React.FC<SocialButtonProps> = ({
     }
     setLoading(true);
     performLogin(provider)
-      .then((user) => {
+      .then(() => {
         setLoading(false);
+        const user = NitroModules.createHybridObject<Auth>("Auth").currentUser;
         if (user) onSuccess?.(user);
       })
       .catch((e) => {

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

@@ -23,9 +23,8 @@ interface SocialButtonProps {
   onPress?: () => void;
 }
 
-async function performLogin(provider: AuthProvider): Promise<AuthUser | null> {
+async function performLogin(provider: AuthProvider): Promise<void> {
   await AuthModule.login(provider);
-  return AuthModule.currentUser ?? null;
 }
 
 export const SocialButton: React.FC<SocialButtonProps> = ({
@@ -49,8 +48,9 @@ export const SocialButton: React.FC<SocialButtonProps> = ({
     }
     setLoading(true);
     performLogin(provider)
-      .then((user) => {
+      .then(() => {
         setLoading(false);
+        const user = AuthModule.currentUser;
         if (user) onSuccess?.(user);
       })
       .catch((e) => {

package/src/utils/logger.ts

@@ -0,0 +1,11 @@
+let enabled = false;
+
+export const logger = {
+  setEnabled: (value: boolean) => {
+    enabled = value;
+  },
+  log: (...args: any[]) => enabled && console.log("[NitroAuth]", ...args),
+  warn: (...args: any[]) => enabled && console.warn("[NitroAuth]", ...args),
+  error: (...args: any[]) => enabled && console.error("[NitroAuth]", ...args),
+  debug: (...args: any[]) => enabled && console.debug("[NitroAuth]", ...args),
+};