@explorins/pers-sdk-react-native 1.5.27 → 1.5.29

package/dist/providers/PersSDKProvider.d.ts

@@ -28,6 +28,7 @@ export interface PersSDKContext {
 }
 export declare const PersSDKProvider: React.FC<{
     children: ReactNode;
+    config?: PersConfig;
 }>;
 export declare const usePersSDK: () => PersSDKContext;
 //# sourceMappingURL=PersSDKProvider.d.ts.map

package/dist/providers/PersSDKProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PersSDKProvider.d.ts","sourceRoot":"","sources":["../../src/providers/PersSDKProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAuC,SAAS,EAAuB,MAAM,OAAO,CAAC;AAEnG,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAsB,MAAM,0BAA0B,CAAC;AAIxG,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAG3D,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,YAAY,EACZ,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,gBAAgB,EAChB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAGlC,YAAY,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,MAAM,WAAW,cAAc;IAE7B,GAAG,EAAE,OAAO,GAAG,IAAI,CAAC;IAGpB,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,WAAW,GAAG,IAAI,CAAC;IAC1B,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,eAAe,GAAG,IAAI,CAAC;IACnC,SAAS,EAAE,eAAe,GAAG,IAAI,CAAC;IAClC,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACtC,YAAY,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACxC,SAAS,EAAE,eAAe,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACnC,SAAS,EAAE,eAAe,GAAG,IAAI,CAAC;IAGlC,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IAGjC,YAAY,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAGzC,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAG9B,UAAU,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,sBAAsB,EAAE,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,eAAe,EAAE,OAAO,KAAK,IAAI,CAAC;IAC3H,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAMD,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC;IACrC,QAAQ,EAAE,SAAS,CAAC;CACrB,CA4HA,CAAC;AAGF,eAAO,MAAM,UAAU,QAAO,cAQ7B,CAAC"}
+{"version":3,"file":"PersSDKProvider.d.ts","sourceRoot":"","sources":["../../src/providers/PersSDKProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAuC,SAAS,EAAkC,MAAM,OAAO,CAAC;AAE9G,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAsB,MAAM,0BAA0B,CAAC;AAIxG,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAG3D,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,YAAY,EACZ,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,gBAAgB,EAChB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAGlC,YAAY,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,MAAM,WAAW,cAAc;IAE7B,GAAG,EAAE,OAAO,GAAG,IAAI,CAAC;IAGpB,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,WAAW,GAAG,IAAI,CAAC;IAC1B,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,eAAe,GAAG,IAAI,CAAC;IACnC,SAAS,EAAE,eAAe,GAAG,IAAI,CAAC;IAClC,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACtC,YAAY,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACxC,SAAS,EAAE,eAAe,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACnC,SAAS,EAAE,eAAe,GAAG,IAAI,CAAC;IAGlC,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IAGjC,YAAY,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAGzC,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAG9B,UAAU,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,sBAAsB,EAAE,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,eAAe,EAAE,OAAO,KAAK,IAAI,CAAC;IAC3H,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAMD,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC;IACrC,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB,CAqIA,CAAC;AAGF,eAAO,MAAM,UAAU,QAAO,cAQ7B,CAAC"}

package/dist/providers/PersSDKProvider.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createContext, useContext, useState, useCallback, useRef } from 'react';
+import { createContext, useContext, useState, useCallback, useRef, useEffect } from 'react';
 import { Platform } from 'react-native';
 import { PersSDK } from '@explorins/pers-sdk/core';
 import { ReactNativeHttpClient } from './react-native-http-client';
@@ -8,7 +8,7 @@ import { ReactNativeDPoPProvider } from './rn-dpop-provider';
 // Create the context
 const SDKContext = createContext(null);
 // Provider component
-export const PersSDKProvider = ({ children }) => {
+export const PersSDKProvider = ({ children, config }) => {
     const initializingRef = useRef(false);
     const [sdk, setSdk] = useState(null);
     const [authProvider, setAuthProvider] = useState(null);
@@ -64,7 +64,15 @@ export const PersSDKProvider = ({ children }) => {
         finally {
             initializingRef.current = false;
         }
-    }, []);
+    }, [isInitialized]);
+    // Auto-initialize if config is provided
+    useEffect(() => {
+        if (config && !isInitialized && !initializingRef.current) {
+            initialize(config).catch(err => {
+                console.error('Auto-initialization failed:', err);
+            });
+        }
+    }, [config, isInitialized, initialize]);
     const setAuthenticationState = useCallback((user, accountAddress, isAuthenticated) => {
         setUser(user);
         setAccountAddress(accountAddress);

package/dist/providers/rn-dpop-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rn-dpop-provider.d.ts","sourceRoot":"","sources":["../../src/providers/rn-dpop-provider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE3E,qBAAa,uBAAwB,YAAW,kBAAkB;IAChE;;;;;;;OAOG;IACG,eAAe,CAAC,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAoB1E,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAmC9E,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAO3D,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,eAAe;CAQxB"}
+{"version":3,"file":"rn-dpop-provider.d.ts","sourceRoot":"","sources":["../../src/providers/rn-dpop-provider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAkB3E,qBAAa,uBAAwB,YAAW,kBAAkB;IAChE;;;;;;;OAOG;IACG,eAAe,CAAC,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAoB1E,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAmC9E,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAO3D,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,eAAe;CAQxB"}

package/dist/providers/rn-dpop-provider.js

@@ -1,5 +1,22 @@
-import crypto from 'react-native-quick-crypto';
+import { Platform } from 'react-native';
 import { Buffer } from 'buffer';
+// Conditionally require quick-crypto for Native platforms only
+let crypto;
+if (Platform.OS !== 'web') {
+    try {
+        crypto = require('react-native-quick-crypto').default || require('react-native-quick-crypto');
+    }
+    catch (e) {
+        console.warn('ReactNativeDPoPProvider: Failed to load react-native-quick-crypto', e);
+    }
+}
+else {
+    // on Web, we shouldn't be using this provider anyway (Core SDK has WebDPoPProvider)
+    // But to be safe, we can mock or throw
+    crypto = {
+        generateKeyPair: () => { throw new Error('ReactNativeDPoPProvider not supported on Web'); }
+    };
+}
 export class ReactNativeDPoPProvider {
     /**
      * Generates a new key pair (ES256 recommended)

package/dist/storage/rn-secure-storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rn-secure-storage.d.ts","sourceRoot":"","sources":["../../src/storage/rn-secure-storage.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAGb,MAAM,0BAA0B,CAAC;AAElC;;;GAGG;AACH,qBAAa,wBAAyB,YAAW,YAAY;IAY/C,OAAO,CAAC,SAAS;IAV7B,QAAQ,CAAC,eAAe,SAAS;IAGjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAKzB;gBAEiB,SAAS,GAAE,MAAuB;IAEhD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB/C,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAyBzC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUlC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB5B,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,QAAQ;CAOjB"}
+{"version":3,"file":"rn-secure-storage.d.ts","sourceRoot":"","sources":["../../src/storage/rn-secure-storage.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAGb,MAAM,0BAA0B,CAAC;AAYlC;;;GAGG;AACH,qBAAa,wBAAyB,YAAW,YAAY;IAY/C,OAAO,CAAC,SAAS;IAV7B,QAAQ,CAAC,eAAe,SAAS;IAGjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAKzB;gBAEiB,SAAS,GAAE,MAAuB;IAEhD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B/C,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAkCzC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBlC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAwB5B,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,QAAQ;CAOjB"}

package/dist/storage/rn-secure-storage.js

@@ -1,6 +1,16 @@
-import * as Keychain from 'react-native-keychain';
+import { Platform } from 'react-native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { DPOP_STORAGE_KEYS, AUTH_STORAGE_KEYS } from '@explorins/pers-sdk/core';
+// Conditionally require Keychain to avoid Web bundler errors
+let Keychain;
+if (Platform.OS !== 'web') {
+    try {
+        Keychain = require('react-native-keychain');
+    }
+    catch (e) {
+        console.warn('ReactNativeSecureStorage: Failed to load react-native-keychain', e);
+    }
+}
 /**
  * Secure Storage implementation for React Native
  * Uses Keychain/Keystore for sensitive data and AsyncStorage for non-sensitive data.
@@ -25,8 +35,20 @@ export class ReactNativeSecureStorage {
         // In runtime, 'key' is just a string, so this is safe.
         if (this.SECURE_KEYS.has(key)) {
             // Store in Keychain/Keystore
-            // Service name acts as the key identifier in simple usage
-            await Keychain.setGenericPassword(prefixedKey, stringValue, { service: prefixedKey });
+            try {
+                if (Keychain) {
+                    // Service name acts as the key identifier in simple usage
+                    await Keychain.setGenericPassword(prefixedKey, stringValue, { service: prefixedKey });
+                }
+                else {
+                    throw new Error('RN Keychain not available');
+                }
+            }
+            catch (e) {
+                console.warn(`[ReactNativeSecureStorage] Keychain set failed for ${key}, falling back to AsyncStorage`, e);
+                // Fallback to AsyncStorage if Keychain fails
+                await AsyncStorage.setItem(prefixedKey, stringValue);
+            }
         }
         else {
             // Store standard config/metadata in AsyncStorage
@@ -37,15 +59,24 @@ export class ReactNativeSecureStorage {
         const prefixedKey = this.getKeyName(key);
         if (this.SECURE_KEYS.has(key)) {
             try {
-                const credentials = await Keychain.getGenericPassword({ service: prefixedKey });
-                if (credentials) {
-                    return this.tryParse(credentials.password);
+                if (Keychain) {
+                    const credentials = await Keychain.getGenericPassword({ service: prefixedKey });
+                    if (credentials) {
+                        return this.tryParse(credentials.password);
+                    }
                 }
-                return null;
             }
             catch (e) {
                 console.warn(`[ReactNativeSecureStorage] Failed to access keychain for ${key}`, e);
-                return null; // Key not found or access denied
+                // Continue to fallback check...
+            }
+            // Fallback: Check AsyncStorage if not found in Keychain or Keychain failed
+            try {
+                const val = await AsyncStorage.getItem(prefixedKey);
+                return val ? this.tryParse(val) : null;
+            }
+            catch (e) {
+                return null;
             }
         }
         else {
@@ -62,7 +93,16 @@ export class ReactNativeSecureStorage {
     async remove(key) {
         const prefixedKey = this.getKeyName(key);
         if (this.SECURE_KEYS.has(key)) {
-            await Keychain.resetGenericPassword({ service: prefixedKey });
+            try {
+                if (Keychain) {
+                    await Keychain.resetGenericPassword({ service: prefixedKey });
+                }
+            }
+            catch (e) {
+                console.warn(`[ReactNativeSecureStorage] Failed to reset keychain for ${key}`, e);
+            }
+            // Always remove from fallback storage too, just in case
+            await AsyncStorage.removeItem(prefixedKey);
         }
         else {
             await AsyncStorage.removeItem(prefixedKey);
@@ -71,7 +111,14 @@ export class ReactNativeSecureStorage {
     async clear() {
         // Clear all known secure keys
         for (const key of this.SECURE_KEYS) {
-            await Keychain.resetGenericPassword({ service: this.getKeyName(key) });
+            try {
+                if (Keychain) {
+                    await Keychain.resetGenericPassword({ service: this.getKeyName(key) });
+                }
+            }
+            catch (e) {
+                console.warn(`[ReactNativeSecureStorage] Failed to clear keychain key ${key}`, e);
+            }
         }
         // Clear AsyncStorage keys related to PERS
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorins/pers-sdk-react-native",
-  "version": "1.5.27",
+  "version": "1.5.29",
   "description": "React Native SDK for PERS Platform - Tourism Loyalty System with Blockchain Transaction Signing and WebAuthn Authentication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,7 +37,7 @@
   "author": "eXplorins",
   "license": "MIT",
   "dependencies": {
-    "@explorins/pers-sdk": "file:.yalc/@explorins/pers-sdk",
+    "@explorins/pers-sdk": "^1.6.36",
     "@explorins/pers-shared": "^2.1.52",
     "@explorins/pers-signer": "^1.0.32",
     "@explorins/web3-ts": "^0.3.75",

package/src/providers/PersSDKProvider.tsx

@@ -1,4 +1,4 @@
-import React, { createContext, useContext, useState, ReactNode, useCallback, useRef } from 'react';
+import React, { createContext, useContext, useState, ReactNode, useCallback, useRef, useEffect } from 'react';
 import { Platform } from 'react-native';
 import { PersSDK, PersConfig, DefaultAuthProvider, DPoPCryptoProvider } from '@explorins/pers-sdk/core';
 import { ReactNativeHttpClient } from './react-native-http-client';
@@ -65,7 +65,8 @@ const SDKContext = createContext<PersSDKContext | null>(null);
 // Provider component
 export const PersSDKProvider: React.FC<{
   children: ReactNode;
-}> = ({ children }) => {
+  config?: PersConfig;
+}> = ({ children, config }) => {
   const initializingRef = useRef(false);
   const [sdk, setSdk] = useState<PersSDK | null>(null);
   const [authProvider, setAuthProvider] = useState<DefaultAuthProvider | null>(null);
@@ -127,7 +128,16 @@ export const PersSDKProvider: React.FC<{
     } finally {
       initializingRef.current = false;
     }
-  }, []);
+  }, [isInitialized]);
+
+  // Auto-initialize if config is provided
+  useEffect(() => {
+    if (config && !isInitialized && !initializingRef.current) {
+      initialize(config).catch(err => {
+        console.error('Auto-initialization failed:', err);
+      });
+    }
+  }, [config, isInitialized, initialize]);
 
   const setAuthenticationState = useCallback((user: UserDTO | AdminDTO | null, accountAddress: string | null, isAuthenticated: boolean) => {
     setUser(user);

package/src/providers/rn-dpop-provider.ts

@@ -1,7 +1,23 @@
-import crypto from 'react-native-quick-crypto';
+import { Platform } from 'react-native';
 import { Buffer } from 'buffer';
 import { DPoPCryptoProvider, DPoPKeyPair } from '@explorins/pers-sdk/core';
 
+// Conditionally require quick-crypto for Native platforms only
+let crypto: any;
+if (Platform.OS !== 'web') {
+  try {
+    crypto = require('react-native-quick-crypto').default || require('react-native-quick-crypto');
+  } catch (e) {
+    console.warn('ReactNativeDPoPProvider: Failed to load react-native-quick-crypto', e);
+  }
+} else {
+  // on Web, we shouldn't be using this provider anyway (Core SDK has WebDPoPProvider)
+  // But to be safe, we can mock or throw
+  crypto = {
+    generateKeyPair: () => { throw new Error('ReactNativeDPoPProvider not supported on Web'); }
+  };
+}
+
 export class ReactNativeDPoPProvider implements DPoPCryptoProvider {
   /**
    * Generates a new key pair (ES256 recommended)

package/src/storage/rn-secure-storage.ts

@@ -1,4 +1,4 @@
-import * as Keychain from 'react-native-keychain';
+import { Platform } from 'react-native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { 
   TokenStorage, 
@@ -6,6 +6,16 @@ import {
   AUTH_STORAGE_KEYS 
 } from '@explorins/pers-sdk/core';
 
+// Conditionally require Keychain to avoid Web bundler errors
+let Keychain: any;
+if (Platform.OS !== 'web') {
+  try {
+    Keychain = require('react-native-keychain');
+  } catch (e) {
+    console.warn('ReactNativeSecureStorage: Failed to load react-native-keychain', e);
+  }
+}
+
 /**
  * Secure Storage implementation for React Native
  * Uses Keychain/Keystore for sensitive data and AsyncStorage for non-sensitive data.
@@ -32,8 +42,18 @@ export class ReactNativeSecureStorage implements TokenStorage {
     // In runtime, 'key' is just a string, so this is safe.
     if (this.SECURE_KEYS.has(key as any)) {
       // Store in Keychain/Keystore
-      // Service name acts as the key identifier in simple usage
-      await Keychain.setGenericPassword(prefixedKey, stringValue, { service: prefixedKey });
+      try {
+        if (Keychain) {
+          // Service name acts as the key identifier in simple usage
+          await Keychain.setGenericPassword(prefixedKey, stringValue, { service: prefixedKey });
+        } else {
+          throw new Error('RN Keychain not available');
+        }
+      } catch (e) {
+        console.warn(`[ReactNativeSecureStorage] Keychain set failed for ${key}, falling back to AsyncStorage`, e);
+        // Fallback to AsyncStorage if Keychain fails
+        await AsyncStorage.setItem(prefixedKey, stringValue);
+      }
     } else {
       // Store standard config/metadata in AsyncStorage
       await AsyncStorage.setItem(prefixedKey, stringValue);
@@ -45,14 +65,23 @@ export class ReactNativeSecureStorage implements TokenStorage {
 
     if (this.SECURE_KEYS.has(key as any)) {
       try {
-        const credentials = await Keychain.getGenericPassword({ service: prefixedKey });
-        if (credentials) {
+        if (Keychain) {
+          const credentials = await Keychain.getGenericPassword({ service: prefixedKey });
+          if (credentials) {
             return this.tryParse(credentials.password);
+          }
         }
-        return null;
       } catch (e) {
         console.warn(`[ReactNativeSecureStorage] Failed to access keychain for ${key}`, e);
-        return null; // Key not found or access denied
+        // Continue to fallback check...
+      }
+      
+      // Fallback: Check AsyncStorage if not found in Keychain or Keychain failed
+      try {
+        const val = await AsyncStorage.getItem(prefixedKey);
+        return val ? this.tryParse(val) : null;
+      } catch (e) {
+        return null;
       }
     } else {
       try {
@@ -69,7 +98,15 @@ export class ReactNativeSecureStorage implements TokenStorage {
     const prefixedKey = this.getKeyName(key);
 
     if (this.SECURE_KEYS.has(key as any)) {
-      await Keychain.resetGenericPassword({ service: prefixedKey });
+      try {
+        if (Keychain) {
+          await Keychain.resetGenericPassword({ service: prefixedKey });
+        }
+      } catch (e) {
+        console.warn(`[ReactNativeSecureStorage] Failed to reset keychain for ${key}`, e);
+      }
+      // Always remove from fallback storage too, just in case
+      await AsyncStorage.removeItem(prefixedKey);
     } else {
       await AsyncStorage.removeItem(prefixedKey);
     }
@@ -78,7 +115,13 @@ export class ReactNativeSecureStorage implements TokenStorage {
   async clear(): Promise<void> {
     // Clear all known secure keys
     for (const key of this.SECURE_KEYS) {
-        await Keychain.resetGenericPassword({ service: this.getKeyName(key) });
+       try {
+         if (Keychain) {
+           await Keychain.resetGenericPassword({ service: this.getKeyName(key) });
+         }
+       } catch (e) {
+         console.warn(`[ReactNativeSecureStorage] Failed to clear keychain key ${key}`, e);
+       }
     }
     
     // Clear AsyncStorage keys related to PERS