react-native-fpay 0.4.20 → 0.4.22

package/src/FountainPayProvider.tsx

@@ -6,7 +6,7 @@
 // the SAME instance — no re-initialization, no prop drilling.
 //
 // Usage:
-//   <FountainPayProvider apiKey="fp_live_...">
+//   <FountainPayProvider appId="...">
 //     <YourApp />
 //   </FountainPayProvider>
 // ─────────────────────────────────────────────────────────────────────────────
@@ -32,7 +32,7 @@ import type {
   FPAccount,
   FPBalance,
 } from './core/types';
-import { authenticateAPI, transferAPI } from './core/api';
+import { accountAPI, authenticateAPI, transferAPI } from './core/api';
 
 // ── Context ───────────────────────────────────────────────────────────────────
 
@@ -54,26 +54,23 @@ export function useFountainPay(): FPInstance {
   if (!instance) {
     throw new Error(
       '[FountainPay] useFountainPay() must be called inside <FountainPayProvider>.\n' +
-        'Make sure you have wrapped your app root with <FountainPayProvider apiKey="...">.'
+        'Make sure you have wrapped your app root with <FountainPayProvider appId="...">.'
     );
   }
   return instance;
 }
-
 // ── Provider ──────────────────────────────────────────────────────────────────
 
 interface ProviderProps {
-  apiKey?: string;
-  accessToken?: string;
+  appId: string;
   options?: FPSDKOptions;
   children: ReactNode;
-  onAuthReady?: () => void;
+  onAuthReady?: (account?: any) => void;
   onAuthError?: (error: string) => void;
 }
 
 export function FountainPayProvider({
-  apiKey,
-  accessToken,
+  appId,
   options,
   children,
   onAuthReady,
@@ -89,9 +86,8 @@ export function FountainPayProvider({
   const account = useFPStore((s) => s.account);
   const user = useFPStore((s) => s.user);
   const balance = useFPStore((s) => s.balance);
-  // const resetToken = useFPStore((s) => s.clearAccessToken);
-  // const clearUser = useFPStore((s) => s.clearUser);
-
+  const resetToken = useFPStore((s) => s.clearAccessToken);
+  const clearUser = useFPStore((s) => s.clearUser);
 
 
   useEffect(() => {
@@ -100,11 +96,8 @@ export function FountainPayProvider({
     // Make sure client is initialized before any API call
     console.log('[FountainPay] Provider mounted. HTTP client ready.', options);
     if (!clientBooted.current) {
-      if (options?.userType === 'AGENT' && accessToken) {
-        getFPStore().setAccessToken(accessToken);
-      }
-      if (apiKey) {
-        getFPStore().setApiKey(apiKey);  // ← store it
+      if (appId) {
+        getFPStore().setAppId(appId);  // ← store it
       }
 
       initClient({
@@ -118,109 +111,59 @@ export function FountainPayProvider({
     const authenticate = async () => {
       // await resetToken();
       // await clearUser();
-       const userType = options?.userType ?? 'USER';
-
-      // ── AGENT mode ────────────────────────────────────────
-      if (userType === 'AGENT') {
-        if (!accessToken) {
-          onAuthError?.('accessToken is required for AGENT mode');
-          return;
-        }
-
-        try {
-          console.log('[FountainPay] Agent mode — validating token...');
-
-          // Store the token first so the HTTP interceptor picks it up
-          getFPStore().setAccessToken(accessToken);
-
-          // Fetch agent profile from backend
-          const response = await authenticateAPI.validateToken();
-          if (cancelled) return;
-
-          if (response.status) {
-            const agent = response.payload;
-
-            // Build FPUserInfo from agent model
-            const user: FPUserInfo = {
-              firstName: agent.firstName,
-              lastName:  agent.lastName,
-              email:     agent.email,
-              phone:     agent.phone ?? '',
-              bvn:       agent.bvn,
-              userId:    agent.id,
-            };
-
-            // Build FPAccount from agent model
-            const account: FPAccount = {
-              id:            agent.id,
-              firstName: agent.firstName,
-              lastName: agent.lastName,
-              phone: agent.phone,
-              accountName:   `${agent.firstName} ${agent.lastName}`.toUpperCase(),
-              accountNumber: agent.accountNumber,
-              bankName:      agent.bankName,
-              bankCode:      agent.bankCode,   // populate if backend returns it
-            };
-
-            // Store everything — no need to call _resolveAccount
-            getFPStore().setUser(user);
-            getFPStore().setPsspId(agent.id);
-            getFPStore().setAccount(account);
-
-            await getFPStore().setAccessToken(accessToken, 86400);
-
-            const banks: any = await transferAPI.getBanks();
-            if (banks.status) {
-              getFPStore().setBanks(banks.payload);
-              console.log('[FountainPay] Banks cached:', banks.payload.length);
-            }
-
-            setAuthenticated(true);
-            console.log('[FountainPay] Agent validated:', agent.firstName, agent.lastName);
-            
-            onAuthReady?.();
-          } else {
-            getFPStore().clearAccessToken();
-            setAuthenticated(false, response.message);
-            onAuthError?.(response.message);
-          }
-        } catch (err: any) {
-          if (cancelled) return;
-          getFPStore().clearAccessToken();
-          setAuthenticated(false, err.message);
-          onAuthError?.(err.message);
-        }
-
-        return;  // ← don't fall through to PSSP auth
-      }
-      
-      if (isTokenValid()) {
-        console.log('[FountainPay] Valid token found — skipping auth.');
-        setAuthenticated(true);
-        onAuthReady?.();
+      if (!appId) {
+        console.log('[FountainPay] No appId — new user flow. Waiting for initializeSDK.');
+        // Boot client without token — initializeSDK will handle everything
+        setAuthenticated(false);
+        onAuthReady?.(null);
         return;
       }
 
       try {
         console.log('[FountainPay] Verifying API key...');
-        const response = await authenticateAPI.login(apiKey || "");
+        const response = await authenticateAPI.login(appId);
         if (cancelled) return;
 
         if (response.status) {
           console.log('[FountainPay] Auth successful.');
-          if (response.payload?.access_token) {
-            getFPStore().setAccessToken(
-              response.payload.access_token,
-              response.payload.expires_in
-            );
+          const { access_token, expires_in } = response.payload;
 
-            const banks: any = await transferAPI.getBanks();
-            if (banks.status) {
-              getFPStore().setBanks(banks.payload);
-            }
+          // Store token
+          getFPStore().setAccessToken(access_token, expires_in ?? 86400);
+
+          const agentDetails = await authenticateAPI.profile();
+          if (agentDetails.status) {
+            
           }
+
+          
+          // Build and store user
+          const user: any = agentDetails;
+          getFPStore().setUser(user);
+          getFPStore().setPsspId(agentDetails.uuid);
+
+          const agentAccount: any = await accountAPI.getAccount();
+          // Build and store account
+          const account: FPAccount = {
+            id:            agentAccount.uuid,
+            ownerId:       agentAccount.ownerId,
+            ownerType:     agentAccount.ownerType,
+            accountName:   agentAccount.accountName,
+            accountNumber: agentAccount.accountNumber,
+            bankName:      agentAccount.bankName,
+            bankCode:      agentAccount.bankCode,
+            currency:      agentAccount.currency
+          };
+          getFPStore().setAccount(account);
+
+          try {
+            const banks: any = await transferAPI.getBanks();
+            if (banks.status) getFPStore().setBanks(banks.payload);
+          } catch { /* non-fatal */ }
+
+          
           setAuthenticated(true);
-          onAuthReady?.();
+          onAuthReady?.(account);
         } else {
           console.error('[FountainPay] Auth failed:', response.message);
           setAuthenticated(false, response.message);
@@ -234,64 +177,33 @@ export function FountainPayProvider({
       }
     };
 
-    console.log('Calling authentication');
+    console.log('Calling authentication with appId:', appId);
     authenticate();
     return () => {
       cancelled = true;
     };
-  }, [apiKey, accessToken]);
+  }, [appId]);
 
-  useEffect(() => {
-    if (options?.userType !== 'AGENT') return;
-    if (!isAuthenticated) return;
-
-    const autoInitialize = async () => {
-      const store = getFPStore();
-      if (!store.user || !store.account) return;
-
-      console.log('[FountainPay] Agent mode — auto-initializing from stored data...');
-      await FPEngine.initialize(
-        store.user,
-        options ?? {},
-        {}   // empty callbacks — host app sets these via initializeSDK if they want
-      );
-      console.log('[FountainPay] Agent auto-initialized.');
-    };
 
-    autoInitialize();
-  }, [isAuthenticated, options?.userType]);
-
-  // Build the instance once per provider lifetime.
-  // All components that call useFountainPay() share this exact object.
   const instance = useMemo<FPInstance>(() => {
     console.log(
-      '[FountainPay] Creating shared FPInstance for apiKey:',
-      apiKey?.toString().slice(0, 8) + '...'
+      '[FountainPay] Creating shared FPInstance for appId:',
+      appId?.toString().slice(0, 8) + '...'
     );
 
     return {
-      /**
-       * Call once after the user logs in.
-       * Starts BLE advertising, proximity broadcast, and the payment listener.
-       */
+
       async initializeSDK(
-        user: FPUserInfo,
+        userObj: FPUserInfo | null,
         callbacks?: FPCallbacks
       ): Promise<void> {
-        console.log(
-          '[FountainPay] initializeSDK() called for user:',
-          user.firstName
-        );
+        console.log( '[FountainPay] initializeSDK() called for user:', user?.firstName);
 
-        if (options?.userType === 'AGENT') {
-          if (callbacks) {
-            FPEngine.updateCallbacks(callbacks);  // just register callbacks
-          }
-          console.log('[FountainPay] Agent already initialized — callbacks updated.');
-          return;
-        }
+        
         try {
-          
+          if(!userObj){
+            userObj = user;
+          }
           await FPEngine.initialize(user, options ?? {}, {
             ...callbacks,
             onPaymentSent: async (tx) => {
@@ -390,7 +302,7 @@ export function FountainPayProvider({
         return balance;
       },
     };
-  }, [apiKey, isAuthenticated, authError, account, user, balance]);
+  }, [appId, isAuthenticated, authError, account, user, balance]);
 
   return (
     <FountainPayContext.Provider value={instance}>

package/src/core/api/client.ts

@@ -7,7 +7,7 @@ import type { FPError } from '../types';
 import { getFPStore } from '../../store/FPStore';
 
 const DEFAULT_BASE_URL =
-  'https://kenisha-happiest-nan.ngrok-free.dev/modal/sdk/v1/fpip/';
+  'https://kenisha-happiest-nan.ngrok-free.dev/modal/sdk/v1/fpay/';
 
 let _client: AxiosInstance | null = null;
 let _isRefreshing = false;

package/src/core/api/index.ts

@@ -1,17 +1,19 @@
 // FountainPay SDK — All API calls
 import { http } from './client';
-import type {
-  FPBankItem,
-  FPTransaction,
-  FPNQRData,
-  FPTxStatus,
-  FPProximityPeer,
-  FPSendPaymentRequest,
-  FPUserInfo,
-  FPAccount,
-  FPSendWalletPaymentRequest,
-  FPTransactionResponse,
-  FPBalance,
+import {
+  type FPBankItem,
+  type FPTransaction,
+  type FPNQRData,
+  type FPTxStatus,
+  type FPProximityPeer,
+  type FPSendPaymentRequest,
+  type FPUserInfo,
+  type FPAccount,
+  type FPSendWalletPaymentRequest,
+  type FPTransactionResponse,
+  type FPBalance,
+  type HttpCallResponseFormat,
+  BUSINESSID,
 } from '../types';
 
 export const healthAPI = {
@@ -22,15 +24,15 @@ export const healthAPI = {
 };
 
 export const authenticateAPI = {
-  login: (apiKey: string) =>
+  login: (appId: string) =>
     http()
-      .post('/auth', { api_key: apiKey })
+      .post('/auth', { user_id: appId })
       .then((r) => r.data),
 
-  profile: (userId: string) =>
+  profile: () =>
     http()
-      .get(`/get-user-details/${userId}`)
-      .then((r) => r.data),
+      .get(`/get-user-details`)
+      .then((r) => r.data.payload),
 
   logout: () =>
     http()
@@ -43,28 +45,38 @@ export const authenticateAPI = {
       .then((r) => r.data),
 
   validateToken: () =>
-    http().get<{
-      status:  boolean;
-      message: string;
-      payload: {
-        id:                 string;
-        firstName:            string;
-        lastName:             string;
-        email:                string;
-        phone:                string;
-        bvn?:                 string;
-        accountNumber:        string;
-        bankName:             string;
-        bankCode?:            string;
-        tradeName?:           string;
-      };
-    }>('/auth/agent/validate-token').then(r => r.data),
+    http().get<{response: HttpCallResponseFormat}>('/auth/agent/validate-token').then(r => r.data),
+
+  sendSmsOtp: async(payload: any)=>
+    http()
+      .post<{
+        status:  boolean;
+        message: string;
+        payload:any
+      }>("shared/send-sms-otp", payload)
+      .then((r)=>r.data),
+  
+  verifyBvn: async() => 
+    http()
+      .get<{response: HttpCallResponseFormat}>("verify-bvn")
+      .then((r)=>r.data),
+
+  verifySms: async(payload: any)=>
+     http()
+      .post<{response: HttpCallResponseFormat}>("verify-bvn", payload)
+      .then((r)=>r.data),
+
+  updateProfile: async(payload: any)=>
+     http()
+      .put<{response: HttpCallResponseFormat}>("update-user-agent", payload)
+      .then((r)=>r.data),
 };
 
 export const accountAPI = {
   generate: (user: FPUserInfo) =>
     http()
-      .post<{ payload: FPAccount }>('/generate-virtual-account', {
+      .post<{ payload: FPAccount }>('/auth/create-agent', {
+        business_id: BUSINESSID,
         first_name: user.firstName,
         last_name: user.lastName,
         phone_no: user.phone,
@@ -75,29 +87,16 @@ export const accountAPI = {
       })
       .then((r) => r.data.payload),
 
-  // Get user profile using PSSP id
-  getUser: (psspId: string) =>
-    http()
-      .get<{ payload: FPAccount }>(`/get-user-details/${psspId}`)
-      .then((r) => r.data.payload),
-
   // Get account details using PSSP id
-  getAccount: (psspId: string) =>
+  getAccount: () =>
     http()
-      .get<{ payload: FPAccount }>(`/get-accounts-details/${psspId}`)
+      .get<{ payload: FPAccount }>(`/get-accounts-details`)
       .then((r) => r.data.payload),
 
-  getAgentBalance: (psspId: string) =>
-    http().get<{ payload: FPBalance }>(`/get-agent-balance/${psspId}`)
+  getAgentBalance: () =>
+    http().get<{ payload: FPBalance }>(`/get-balance`)
       .then(r => r.data.payload),
       
-  // Get balance using PSSP id
-  getBalance: (psspId: string) =>
-    http()
-      .get<{ payload: FPBalance }>(
-        `/get-balance/${psspId}`
-      )
-      .then((r) => r.data.payload as FPBalance),
 };
 
 export const transferAPI = {
@@ -129,15 +128,16 @@ export const transferAPI = {
       }>('/wallet-name-enquiry', { account_number: accountNumber })
       .then((r) => r.data),
 
-  validateTransfer: (pin: string, userId: string) =>
+  validateTransfer: (pin: string, userId: string, receiverId: string) =>
     http()
       .post<{ status: boolean; message: string }>('/validate-transaction', {
         pin,
-        user_id: userId,
+        sender_type: 'AGENT',
+        receiver_id: receiverId,
       })
       .then((r) => r.data),
 
-  sendToWallet: (payload: FPSendWalletPaymentRequest, temptId: string) =>
+  sendToWallet: (payload: any, temptId: string) =>
     http()
       .post<{ payload: FPTransactionResponse }>('/wallet-transfer-funds', {
         ...payload,

package/src/core/types/index.ts

@@ -2,6 +2,8 @@
 
 import type { Device } from 'react-native-ble-plx';
 
+export const BUSINESSID = "1678aa7d-741a-4a4b-98dd-2fb406a3df3d";
+
 export type FPCurrency = 'NGN' | 'USD' | 'GBP' | 'EUR' | string;
 export type FPChannel = 'transfer' | 'nqr' | 'proximity' | 'bluetooth' | 'nfc';
 export type FPTxStatus =
@@ -21,6 +23,7 @@ export interface FPUserInfo {
   nin?: string;
   dateOfBirth?: string;
   userId: string;
+  terminalId?: string;
 }
 
 export interface FPSDKOptions {
@@ -31,10 +34,15 @@ export interface FPSDKOptions {
   userType?: 'USER' | 'AGENT';
 }
 
+export interface FPInternalTransferRecipient {
+  id: string;
+  type: 'AGENT' | 'TERMINAL';
+}
+
 export interface FPTransferRecipient {
   accountNumber: string;
   accountName: string;
-  bankCode: string;
+  bankCode?: string;
   bankName: string;
 }
 
@@ -84,6 +92,7 @@ export interface FPSendPaymentRequest {
   channel: 'transfer' | 'proximity' | 'bluetooth' | 'nfc' | 'nqr';
   currency?: string;
   recipient:
+    | FPInternalTransferRecipient
     | FPTransferRecipient
     | FPNfcRecipient
     | FPNqrRecipient
@@ -110,6 +119,11 @@ export interface FPNfcTransfer {
   channel: 'nfc';
 }
 
+export interface HttpCallResponseFormat {
+  status: string;
+  message: string;
+  payload: any;
+}
 export interface FPTransactionResponse {
   status: string;
   message: string;
@@ -167,11 +181,10 @@ export interface FPBankItem {
 
 export interface FPAccount {
   id: string; // PSSP-assigned — stored internally, host app never needs this
+  ownerId: string;
+  ownerType: string;
   accountNumber: string;
   accountName: string;
-  firstName: string;
-  lastName?: string;
-  phone: string;
   bankName?: string;
   bankCode?: string;
   balance?: FPBalance | null;
@@ -184,7 +197,7 @@ export interface FPCallbacks {
   onPaymentDeclined?: (request: FPBluetoothPaymentRequest) => void;
   onPaymentSent?: (transaction: FPTransaction) => void;
   onError?: (error: FPError) => void;
-  onAccountReady?: (account: FPAccount) => void;
+  onAccountReady?: (account: any) => void;
   onAccountError?: (error: FPError, user: FPUserInfo) => void;
 }
 

package/src/engine/FPEngine.ts

@@ -11,7 +11,7 @@ import {
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import Geolocation from '@react-native-community/geolocation';
 import { initClient } from '../core/api/client';
-import { proximityAPI, accountAPI } from '../core/api';
+import { proximityAPI, accountAPI, authenticateAPI } from '../core/api';
 import type {
   FPUserInfo,
   FPSDKOptions,
@@ -124,7 +124,7 @@ async function _startProximityBroadcast(): Promise<void> {
     const session = await proximityAPI.broadcast(psspId, {
       latitude: loc.lat,
       longitude: loc.lng,
-      user_type: 'VIRTUAL_ACCOUNT_USER',
+      user_type: 'AGENT',
     });
 
     // Save new position to store
@@ -161,7 +161,7 @@ async function _startProximityBroadcast(): Promise<void> {
             await proximityAPI.broadcast(psspId, {
               latitude: current.lat,
               longitude: current.lng,
-              user_type: 'VIRTUAL_ACCOUNT_USER',
+              user_type: 'AGENT',
             });
             getFPStore().setLastBroadcastPosition({
               latitude: current.lat,
@@ -307,15 +307,20 @@ async function _resolveAccount(
 
   console.log('[FPay Engine] _resolveAccount callbacks:', 
   'onAccountReady:', !!callbacks.onAccountReady,
-  'onAccountError:', !!callbacks.onAccountError
+  'onAccountError:', !!callbacks.onAccountError,
+  'user: ', user,
+  'psspId:', psspId,
+  'user.userId:', user.userId,
+  'store.psspId:', store.psspId
 );
 
   try {
     if (psspId) {
       // ← use the saved value, not store.psspId
+
       console.log('[FPay Engine] Existing PSSP id found — fetching account...');
       try {
-        const account = await accountAPI.getAccount(psspId);
+        const account = await accountAPI.getAccount();
         store.setAccount(account);
         store.setUser(user);
         console.log('[FPay Engine] Account loaded:', account);
@@ -332,7 +337,7 @@ async function _resolveAccount(
     // Create new account
     const account: any = await accountAPI.generate(user);
     console.log('[FPay Engine] Account creation response:', account);
-    if (account) {
+    if (account) {      
       store.setPsspId(account.id);
       store.setAccount(account);
       store.setUser(user);
@@ -356,10 +361,7 @@ async function _fetchBalance(): Promise<void> {
   }
 
   try {
-    const userType = _options.userType ?? 'USER';
-    const balance: FPBalance = userType === 'AGENT'
-      ? await accountAPI.getAgentBalance(psspId)
-      : await accountAPI.getBalance(psspId);
+    const balance: FPBalance = await accountAPI.getAgentBalance();
     
     getFPStore().setBalance(balance);
     console.log('[FPay Engine] Balance fetched:', balance);
@@ -437,16 +439,6 @@ export const FPEngine = {
     _isReady = true;
     console.log('[FPay Engine] Initialized. Advertising as:', displayName);
 
-    // AGENT — account already stored by provider, skip resolve
-    if (options.userType === 'AGENT') {
-      const account = getFPStore().account;
-      if (account) {
-        callbacks.onAccountReady?.(account);
-        _fetchBalance();
-      }
-      return;
-    }
-
     // Resolve account first — sets psspId in store
     // Then broadcast proximity — needs psspId to be set
     await _resolveAccount(user, callbacks);
@@ -591,6 +583,27 @@ export const FPEngine = {
     await _fetchBalance();
   },
 
+  async verifyBvn(): Promise<void> {
+    const response: any = await authenticateAPI.verifyBvn();
+    getFPStore().setTempId(response?.payload?.temp_id);
+  },
+
+  async verifySmsOtp(payload: any): Promise<void> {
+    const response: any = await authenticateAPI.verifySms(payload);
+    if(response.status){
+      await authenticateAPI.updateProfile({verifyBvn: true});
+      const profile = await authenticateAPI.profile();
+      getFPStore().setUser(profile);
+      getFPStore().clearTempId();
+    }
+  },
+
+  async createUserTransactionPin(payload: any): Promise<void> {
+    await authenticateAPI.updateProfile(payload);
+    const profile = await authenticateAPI.profile();
+    getFPStore().setUser(profile);
+  },
+
   closeSend(): void {
     _emitEvent('close_send');
   },