@explorins/pers-sdk-react-native 1.5.8 → 1.5.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorins/pers-sdk-react-native",
-  "version": "1.5.8",
+  "version": "1.5.11",
   "description": "React Native SDK for PERS Platform - Tourism Loyalty System with Manager Pattern Architecture",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/hooks/useTransactionSigner.ts

@@ -142,20 +142,55 @@ export const useTransactionSigner = () => {
     if (isInitialized && isAuthenticated && user && !isSignerInitialized && sdk && authProvider) {
       console.log('[useTransactionSigner] Auto-initializing PERS transaction signer...');
       
-      // Get configuration from the PERS SDK
-      const sdkConfig = (sdk as any).config || {};
-      console.log('[useTransactionSigner] SDK config:', sdkConfig);
-      const apiProjectKey = sdkConfig.apiProjectKey || 'demo-project-key';
-      console.log('[useTransactionSigner] Extracted API project key:', apiProjectKey);
-      const tenantId = sdkConfig.tenantId || 'vq-demo';
+      // Async auto-initialization function
+      const autoInitialize = async () => {
+        try {
+          // Get configuration from the PERS SDK
+          const sdkConfig = (sdk as any).config || {};
+          console.log('[useTransactionSigner] SDK config:', sdkConfig);
+          
+          // Try to extract tenantId from JWT token if available
+          let tenantIdFromJWT: string | undefined;
+          if (authProvider.getToken) {
+            try {
+              const token = await authProvider.getToken();
+              if (token) {
+                // Decode JWT to get tenant information
+                const tokenParts = token.split('.');
+                if (tokenParts.length >= 2) {
+                  const payload = JSON.parse(atob(tokenParts[1]));
+                  console.log('[useTransactionSigner] JWT payload decoded:', payload);
+                  
+                  // Look for tenant ID in various possible fields
+                  tenantIdFromJWT = payload.tenantId || payload.tenant_id || payload.tenant;
+                  if (tenantIdFromJWT) {
+                    console.log('[useTransactionSigner] Found tenant ID in JWT:', tenantIdFromJWT);
+                  }
+                }
+              }
+            } catch (e) {
+              console.warn('[useTransactionSigner] Failed to decode JWT for tenant ID:', e);
+            }
+          }
+          
+          // For React Native, we should get tenantId from JWT, then user/auth context, then config
+          const userTenantId = (user as any).tenantId || (user as any).tenant_id;
+          const configTenantId = sdkConfig.tenantId || 'vq-demo';
+          const tenantId = tenantIdFromJWT || userTenantId || configTenantId;
+          
+          console.log('[useTransactionSigner] Extracted tenant ID:', tenantId, 'from JWT:', tenantIdFromJWT, 'user:', userTenantId, 'or config:', configTenantId);
+          
+          // Don't use apiProjectKey since we'll get it via tenant initialization
+          await initializeSigner({
+            tenantId: tenantId,
+            ethersProviderUrl: DEFAULT_ETHERS_PROVIDER
+          });
+        } catch (error) {
+          console.error('[useTransactionSigner] Auto-initialization failed:', error);
+        }
+      };
       
-      initializeSigner({
-        tenantId: tenantId,
-        projectKey: apiProjectKey,
-        ethersProviderUrl: DEFAULT_ETHERS_PROVIDER
-      }).catch((error) => {
-        console.error('[useTransactionSigner] Auto-initialization failed:', error);
-      });
+      autoInitialize();
     }
   }, [isInitialized, isAuthenticated, user, isSignerInitialized, sdk, authProvider]);
 
@@ -188,7 +223,7 @@ export const useTransactionSigner = () => {
     try {
       console.log('[useTransactionSigner] Initializing PERS transaction signer...');
       
-      // Configure the PERS service with the project key before creating SDK
+      // Configure the PERS service before creating SDK
       if (config?.projectKey) {
         console.log('[useTransactionSigner] Configuring PERS service with project key:', config.projectKey);
         try {
@@ -206,6 +241,37 @@ export const useTransactionSigner = () => {
         } catch (configError) {
           console.error('[useTransactionSigner] Failed to configure PERS service:', configError);
         }
+      } else if (config?.tenantId) {
+        console.log('[useTransactionSigner] No project key provided, will initialize tenant with tenantId:', config.tenantId);
+        try {
+          // Import and initialize tenant environment to get project key
+          const { PersService } = await import('@explorins/pers-signer/react-native');
+          console.log('[useTransactionSigner] Initializing tenant for tenantId:', config.tenantId);
+          
+          // We need to set the auth token first for tenant initialization
+          if (authProvider) {
+            try {
+              const token = await authProvider.getToken();
+              if (token) {
+                console.log('[useTransactionSigner] Setting auth token for tenant initialization');
+                (PersService as any).configure({
+                  token: token
+                });
+              }
+            } catch (tokenError) {
+              console.warn('[useTransactionSigner] Could not get auth token for tenant initialization:', tokenError);
+            }
+          }
+          
+          await (PersService as any).initializeTenant(config.tenantId);
+          console.log('[useTransactionSigner] Tenant initialized successfully');
+          
+          // Verify configuration
+          const persConfig = (PersService as any).getConfig();
+          console.log('[useTransactionSigner] PERS service config after tenant initialization:', persConfig);
+        } catch (configError) {
+          console.error('[useTransactionSigner] Failed to initialize tenant:', configError);
+        }
       }
       
       const signerSDK = await createPersSignerSDK({
@@ -221,7 +287,7 @@ export const useTransactionSigner = () => {
       console.error('[useTransactionSigner] Failed to initialize transaction signer:', error);
       throw new Error(`Signer initialization failed: ${error}`);
     }
-  }, []);
+  }, [authProvider]);
 
   /**
    * Sign a blockchain transaction using WebAuthn authentication