@yosle/tropipayjs 0.1.25 → 0.1.28

package/index.js

@@ -533,24 +533,24 @@ class Tropipay {
             baseURL: config.customTropipayUrl || tpp_env,
             headers: {
                 "Content-Type": "application/json",
-                Accept: "application/json",
+                Accept: "application/json"
             },
         });
         // Add request interceptor for Token expired
         this.request.interceptors.request.use(async (config) => {
-            const currentTimestamp = Math.floor(Date.now() / 1000); // Current time in seconds
+            console.log("Executing interceptor!!");
+            const currentTimestamp = Math.floor(Date.now() / 1000);
             if (Tropipay.expiresIn && Tropipay.expiresIn < currentTimestamp) {
-                // Token has expired, attempt to refresh it
+                console.debug("Token expired, attempting to log in");
                 try {
                     await this.login();
                 }
                 catch (error) {
-                    // Handle token refresh error
-                    Tropipay.accessToken = null;
-                    Tropipay.refreshToken = null;
                     throw handleExceptions(error);
                 }
             }
+            // Update the Authorization header in the config
+            config.headers.Authorization = `Bearer ${Tropipay.accessToken}`;
             return config;
         }, (error) => {
             return Promise.reject(error);
@@ -562,20 +562,6 @@ class Tropipay {
     }
     async login() {
         try {
-            if (Tropipay.refreshToken) {
-                const { data } = await this.loginRequest.post("/api/v2/access/token", {
-                    client_id: this.clientId,
-                    client_secret: this.clientSecret,
-                    grant_type: "refresh_token",
-                    refresh_token: Tropipay.refreshToken,
-                }, {
-                    headers: {
-                        "Content-Type": "application/json",
-                        Accept: "application/json",
-                    },
-                });
-                return data;
-            }
             // normal credetials login
             const { data } = await this.loginRequest.post("/api/v2/access/token", {
                 client_id: this.clientId,
@@ -589,12 +575,11 @@ class Tropipay {
                 },
             });
             Tropipay.accessToken = data.access_token;
-            Tropipay.refreshToken = data.refresh_token;
-            Tropipay.expiresIn = data.expires_in;
             Tropipay.expiresIn = data.expires_in;
             return data;
         }
         catch (error) {
+            console.log("RAW login error ", error);
             Tropipay.accessToken = null;
             Tropipay.refreshToken = null;
             Tropipay.expiresIn = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yosle/tropipayjs",
-  "version": "0.1.25",
+  "version": "0.1.28",
   "description": "Javascript / Typescript SDK for the Tropipay API",
   "main": "index.js",
   "scripts": {

package/src/api/TropipayAPI.ts

@@ -90,33 +90,33 @@ export class Tropipay {
         baseURL: config.customTropipayUrl || tpp_env,
         headers: {
           "Content-Type": "application/json",
-          Accept: "application/json",
+          Accept: "application/json"
         },
       });
 
      // Add request interceptor for Token expired
      this.request.interceptors.request.use(
-      async (config: any) => {
-        const currentTimestamp = Math.floor(Date.now() / 1000); // Current time in seconds
-
+      async (config) => {
+        console.log("Executing interceptor!!");
+        const currentTimestamp = Math.floor(Date.now() / 1000);
+    
         if (Tropipay.expiresIn && Tropipay.expiresIn < currentTimestamp) {
-          // Token has expired, attempt to refresh it
+          console.debug("Token expired, attempting to log in");
           try {
-             await this.login();
+            await this.login();
           } catch (error) {
-            // Handle token refresh error
-            Tropipay.accessToken = null;
-            Tropipay.refreshToken = null;
-            throw handleExceptions(error as any);
+            throw handleExceptions(error as Error);
           }
-        }
-
+        }    
+        // Update the Authorization header in the config
+        config.headers.Authorization = `Bearer ${Tropipay.accessToken}`;    
         return config;
       },
-      (error: AxiosError) => {
+      (error) => {
         return Promise.reject(error);
       }
     );
+    
 
     this.hooks = new TropipayHooks(this);
     this.paymentCards = new PaymentCard(this);
@@ -131,25 +131,7 @@ export class Tropipay {
 
   public async login() {
     try {
-      if (Tropipay.refreshToken) {
-        const { data } = await this.loginRequest.post<LoginResponse>(
-          "/api/v2/access/token",
-          {
-            client_id: this.clientId,
-            client_secret: this.clientSecret,
-            grant_type: "refresh_token",
-            refresh_token: Tropipay.refreshToken,
-          },
-          {
-            headers: {
-              "Content-Type": "application/json",
-              Accept: "application/json",
-            },
-          }
-        );
-        return data;
-      }
-
+     
       // normal credetials login
       const { data } = await this.loginRequest.post<LoginResponse>(
         "/api/v2/access/token",
@@ -167,12 +149,13 @@ export class Tropipay {
         }
       );
 
+      
       Tropipay.accessToken = data.access_token;
-      Tropipay.refreshToken = data.refresh_token;
-      Tropipay.expiresIn = data.expires_in;
       Tropipay.expiresIn = data.expires_in;
       return data;
     } catch (error) {
+
+      console.log("RAW login error ", error)
       Tropipay.accessToken = null;
       Tropipay.refreshToken = null;
       Tropipay.expiresIn = null;