react-native-fpay 0.4.5 → 0.4.7

package/lib/module/core/api/client.js

@@ -8,6 +8,8 @@ import axios from 'axios';
 import { getFPStore } from "../../store/FPStore.js";
 const DEFAULT_BASE_URL = 'https://kenisha-happiest-nan.ngrok-free.dev/sdk/v1/fpip/';
 let _client = null;
+let _isRefreshing = false;
+let _retryQueue = [];
 export function initClient(apiKey, options = {}) {
   _client = axios.create({
     baseURL: options.baseUrl ?? DEFAULT_BASE_URL,
@@ -26,12 +28,67 @@ export function initClient(apiKey, options = {}) {
   // store each time so it's always current after login
   _client.interceptors.request.use(config => {
     const accessToken = getFPStore().accessToken;
+    console.log('[FPay HTTP] Token on request:', accessToken ? 'present' : 'NULL');
     if (accessToken) {
       config.headers.Authorization = `Bearer ${accessToken}`;
     }
     return config;
   });
-  _client.interceptors.response.use(r => r, err => {
+  _client.interceptors.response.use(r => r, async err => {
+    const originalRequest = err.config;
+
+    // Handle 401 — token expired
+    if (err.response?.status === 401 && !originalRequest._retry) {
+      originalRequest._retry = true; // prevent infinite loop
+
+      if (_isRefreshing) {
+        // Another request already refreshing — queue this one
+        return new Promise(resolve => {
+          _retryQueue.push(newToken => {
+            originalRequest.headers.Authorization = `Bearer ${newToken}`;
+            resolve(_client.request(originalRequest));
+          });
+        });
+      }
+      _isRefreshing = true;
+      try {
+        console.log('[FPay HTTP] Token expired — re-authenticating...');
+
+        // Clear expired token first
+        getFPStore().clearAccessToken();
+
+        // Re-authenticate with the stored API key
+        const apiKey = originalRequest.headers['x-api-key'];
+        const response = await _client.post('/auth', {
+          api_key: apiKey
+        });
+        if (response.data?.status && response.data?.payload?.access_token) {
+          const newToken = response.data.payload.access_token;
+          const expiresIn = response.data.payload.expires_in;
+
+          // Save new token to store
+          getFPStore().setAccessToken(newToken, expiresIn);
+          console.log('[FPay HTTP] Re-authenticated successfully.');
+
+          // Retry queued requests with new token
+          _retryQueue.forEach(cb => cb(newToken));
+          _retryQueue = [];
+
+          // Retry original request with new token
+          originalRequest.headers.Authorization = `Bearer ${newToken}`;
+          return _client.request(originalRequest);
+        }
+      } catch (refreshErr) {
+        console.error('[FPay HTTP] Re-authentication failed:', refreshErr);
+        _retryQueue = [];
+        getFPStore().clearAccessToken();
+        getFPStore().setAuthenticated(false, 'Session expired. Please restart the app.');
+      } finally {
+        _isRefreshing = false;
+      }
+    }
+
+    // All other errors — normalize and reject
     const e = {
       code: 'UNKNOWN',
       message: 'An error occurred'
@@ -44,10 +101,6 @@ export function initClient(apiKey, options = {}) {
       e.code = d.code ?? `HTTP_${err.response.status}`;
       e.message = d.message ?? err.message;
       e.statusCode = err.response.status;
-      if (err.response.status === 401) {
-        e.code = 'INVALID_API_KEY';
-        e.message = 'Invalid API key.';
-      }
     }
     return Promise.reject(e);
   });

package/lib/module/core/api/client.js.map

@@ -1 +1 @@
-{"version":3,"names":["axios","getFPStore","DEFAULT_BASE_URL","_client","initClient","apiKey","options","create","baseURL","baseUrl","timeout","headers","environment","interceptors","request","use","config","accessToken","Authorization","response","r","err","e","code","message","d","data","status","statusCode","Promise","reject","http","Error"],"sourceRoot":"../../../../src","sources":["core/api/client.ts"],"mappings":";;AAAA;AACA;AACA;;AAEA,OAAOA,KAAK,MAA8B,OAAO;AAEjD,SAASC,UAAU,QAAQ,wBAAqB;AAEhD,MAAMC,gBAAgB,GACpB,0DAA0D;AAE5D,IAAIC,OAA6B,GAAG,IAAI;AAExC,OAAO,SAASC,UAAUA,CACxBC,MAAc,EACdC,OAAmD,GAAG,CAAC,CAAC,EAClD;EACNH,OAAO,GAAGH,KAAK,CAACO,MAAM,CAAC;IACrBC,OAAO,EAAEF,OAAO,CAACG,OAAO,IAAIP,gBAAgB;IAC5CQ,OAAO,EAAE,KAAK;IACdC,OAAO,EAAE;MACP,cAAc,EAAE,kBAAkB;MAClC,WAAW,EAAEN,MAAM;MACnB,cAAc,EAAE,OAAO;MACvB,OAAO,EAAE,8BAA8B;MACvC,eAAe,EAAE,OAAO;MACxB,OAAO,EAAEC,OAAO,CAACM,WAAW,IAAI;IAClC;EACF,CAAC,CAAC;;EAEF;EACA;EACAT,OAAO,CAACU,YAAY,CAACC,OAAO,CAACC,GAAG,CAAEC,MAAM,IAAK;IAC3C,MAAMC,WAAW,GAAGhB,UAAU,CAAC,CAAC,CAACgB,WAAW;IAC5C,IAAIA,WAAW,EAAE;MACfD,MAAM,CAACL,OAAO,CAACO,aAAa,GAAG,UAAUD,WAAW,EAAE;IACxD;IACA,OAAOD,MAAM;EACf,CAAC,CAAC;EAEFb,OAAO,CAACU,YAAY,CAACM,QAAQ,CAACJ,GAAG,CAC9BK,CAAC,IAAKA,CAAC,EACPC,GAAG,IAAK;IACP,MAAMC,CAAU,GAAG;MAAEC,IAAI,EAAE,SAAS;MAAEC,OAAO,EAAE;IAAoB,CAAC;IACpE,IAAI,CAACH,GAAG,CAACF,QAAQ,EAAE;MACjBG,CAAC,CAACC,IAAI,GAAG,eAAe;MACxBD,CAAC,CAACE,OAAO,GAAG,uCAAuC;IACrD,CAAC,MAAM;MACL,MAAMC,CAAC,GAAGJ,GAAG,CAACF,QAAQ,CAACO,IAAI,IAAI,CAAC,CAAC;MACjCJ,CAAC,CAACC,IAAI,GAAGE,CAAC,CAACF,IAAI,IAAI,QAAQF,GAAG,CAACF,QAAQ,CAACQ,MAAM,EAAE;MAChDL,CAAC,CAACE,OAAO,GAAGC,CAAC,CAACD,OAAO,IAAIH,GAAG,CAACG,OAAO;MACpCF,CAAC,CAACM,UAAU,GAAGP,GAAG,CAACF,QAAQ,CAACQ,MAAM;MAClC,IAAIN,GAAG,CAACF,QAAQ,CAACQ,MAAM,KAAK,GAAG,EAAE;QAC/BL,CAAC,CAACC,IAAI,GAAG,iBAAiB;QAC1BD,CAAC,CAACE,OAAO,GAAG,kBAAkB;MAChC;IACF;IACA,OAAOK,OAAO,CAACC,MAAM,CAACR,CAAC,CAAC;EAC1B,CACF,CAAC;AACH;AAEA,OAAO,SAASS,IAAIA,CAAA,EAAkB;EACpC,IAAI,CAAC5B,OAAO,EACV,MAAM,IAAI6B,KAAK,CACb,oEACF,CAAC;EACH,OAAO7B,OAAO;AAChB","ignoreList":[]}
+{"version":3,"names":["axios","getFPStore","DEFAULT_BASE_URL","_client","_isRefreshing","_retryQueue","initClient","apiKey","options","create","baseURL","baseUrl","timeout","headers","environment","interceptors","request","use","config","accessToken","console","log","Authorization","response","r","err","originalRequest","status","_retry","Promise","resolve","push","newToken","clearAccessToken","post","api_key","data","payload","access_token","expiresIn","expires_in","setAccessToken","forEach","cb","refreshErr","error","setAuthenticated","e","code","message","d","statusCode","reject","http","Error"],"sourceRoot":"../../../../src","sources":["core/api/client.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/core/api/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/client.ts"],"names":[],"mappings":"AAIA,OAAc,EAAE,KAAK,aAAa,EAAE,MAAM,OAAO,CAAC;AASlD,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAO,GACvD,IAAI,CA4CN;AAED,wBAAgB,IAAI,IAAI,aAAa,CAMpC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/client.ts"],"names":[],"mappings":"AAIA,OAAc,EAAE,KAAK,aAAa,EAAE,MAAM,OAAO,CAAC;AAWlD,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAO,GACvD,IAAI,CAgGN;AAED,wBAAgB,IAAI,IAAI,aAAa,CAMpC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-fpay",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "Fountain Pay react-native sdk library",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",

package/src/core/api/client.ts

@@ -10,6 +10,8 @@ const DEFAULT_BASE_URL =
   'https://kenisha-happiest-nan.ngrok-free.dev/sdk/v1/fpip/';
 
 let _client: AxiosInstance | null = null;
+let _isRefreshing = false;
+let _retryQueue: Array<(token: string) => void> = [];
 
 export function initClient(
   apiKey: string,
@@ -32,6 +34,7 @@ export function initClient(
   // store each time so it's always current after login
   _client.interceptors.request.use((config) => {
     const accessToken = getFPStore().accessToken;
+    console.log('[FPay HTTP] Token on request:', accessToken ? 'present' : 'NULL');
     if (accessToken) {
       config.headers.Authorization = `Bearer ${accessToken}`;
     }
@@ -40,7 +43,62 @@ export function initClient(
 
   _client.interceptors.response.use(
     (r) => r,
-    (err) => {
+    async (err) => {
+      const originalRequest = err.config;
+
+      // Handle 401 — token expired
+      if (err.response?.status === 401 && !originalRequest._retry) {
+        originalRequest._retry = true;  // prevent infinite loop
+
+        if (_isRefreshing) {
+          // Another request already refreshing — queue this one
+          return new Promise((resolve) => {
+            _retryQueue.push((newToken: string) => {
+              originalRequest.headers.Authorization = `Bearer ${newToken}`;
+              resolve(_client!.request(originalRequest));
+            });
+          });
+        }
+
+        _isRefreshing = true;
+
+        try {
+          console.log('[FPay HTTP] Token expired — re-authenticating...');
+
+          // Clear expired token first
+          getFPStore().clearAccessToken();
+
+          // Re-authenticate with the stored API key
+          const apiKey = originalRequest.headers['x-api-key'];
+          const response = await _client!.post('/auth', { api_key: apiKey });
+
+          if (response.data?.status && response.data?.payload?.access_token) {
+            const newToken = response.data.payload.access_token;
+            const expiresIn = response.data.payload.expires_in;
+
+            // Save new token to store
+            getFPStore().setAccessToken(newToken, expiresIn);
+            console.log('[FPay HTTP] Re-authenticated successfully.');
+
+            // Retry queued requests with new token
+            _retryQueue.forEach(cb => cb(newToken));
+            _retryQueue = [];
+
+            // Retry original request with new token
+            originalRequest.headers.Authorization = `Bearer ${newToken}`;
+            return _client!.request(originalRequest);
+          }
+        } catch (refreshErr) {
+          console.error('[FPay HTTP] Re-authentication failed:', refreshErr);
+          _retryQueue = [];
+          getFPStore().clearAccessToken();
+          getFPStore().setAuthenticated(false, 'Session expired. Please restart the app.');
+        } finally {
+          _isRefreshing = false;
+        }
+      }
+
+      // All other errors — normalize and reject
       const e: FPError = { code: 'UNKNOWN', message: 'An error occurred' };
       if (!err.response) {
         e.code = 'NETWORK_ERROR';
@@ -50,10 +108,6 @@ export function initClient(
         e.code = d.code ?? `HTTP_${err.response.status}`;
         e.message = d.message ?? err.message;
         e.statusCode = err.response.status;
-        if (err.response.status === 401) {
-          e.code = 'INVALID_API_KEY';
-          e.message = 'Invalid API key.';
-        }
       }
       return Promise.reject(e);
     }