@yosle/tropipayjs 0.1.27 → 0.2.0

package/index.d.ts

@@ -40,6 +40,7 @@ interface UserHookSubscribed extends UserHook {
     updatedAt: string;
 }
 interface PaymentLinkPayload {
+    accountId: number;
     reference: string;
     concept: string;
     favorite: boolean;
@@ -413,7 +414,9 @@ declare class ServerSideUtils {
     private tropipay;
     constructor(tropipayInstance: Tropipay);
     /**
-     * Verify Topipay's signature on webhooks.
+     * DEPRECATED Verify Topipay's signature on API V2 webhooks.
+     * @deprecated This method is deprecated and will be removed in future versions.
+     * Use the `verifySignatureV3` method from the `ServerSideUtils` class instead.
      * @param credentials Credential object or Tropipay instance
      * @param {String} originalCurrencyAmount
      * @param bankOrderCode
@@ -452,6 +455,17 @@ declare class ServerSideUtils {
      * @return {Promise<string>} the valid base64 image
      */
     static isValidImage(base64Image: string): boolean;
+    /**
+     * Verify Topipay's signature on API V3 webhooks.
+     * @param {string} originalCurrencyAmount
+     * @param {string} bankOrderCode
+     * @param {string} signature signaturev3 field to be verified
+     * @returns {boolean}
+     */
+    static verifySignatureV3(credentials: {
+        clientId: string;
+        clientSecret: string;
+    } | Tropipay, originalCurrencyAmount: string, bankOrderCode: string, signature: string): boolean;
 }
 
 declare const SERVER_MODE: ServerMode$1;

package/index.js

@@ -220,7 +220,7 @@ class PaymentCard {
             await this.tropipay.login();
         }
         try {
-            const paylink = await this.tropipay.request.post("/api/v2/paymentcards", payload, {
+            const paylink = await this.tropipay.request.post("/api/v3/paymentcards", payload, {
                 headers: {
                     "Content-Type": "application/json",
                     Authorization: `Bearer ${Tropipay.accessToken}`,
@@ -243,7 +243,7 @@ class PaymentCard {
             await this.tropipay.login();
         }
         try {
-            const paymentcards = await this.tropipay.request.get(`/api/v2/paymentcards`, {
+            const paymentcards = await this.tropipay.request.get(`/api/v3/paymentcards`, {
                 headers: {
                     "Content-Type": "application/json",
                     Authorization: `Bearer ${Tropipay.accessToken}`,
@@ -268,7 +268,7 @@ class PaymentCard {
             await this.tropipay.login();
         }
         try {
-            const paymentcard = await this.tropipay.request.get(`/api/v2/paymentcards/${id}`, {
+            const paymentcard = await this.tropipay.request.get(`/api/v3/paymentcards/${id}`, {
                 headers: {
                     "Content-Type": "application/json",
                     Authorization: `Bearer ${Tropipay.accessToken}`,
@@ -294,7 +294,7 @@ class PaymentCard {
             await this.tropipay.login();
         }
         try {
-            const paymentcard = await this.tropipay.request.delete(`/api/v2/paymentcards/`, {
+            const paymentcard = await this.tropipay.request.delete(`/api/v3/paymentcards/`, {
                 headers: {
                     "Content-Type": "application/json",
                     Authorization: `Bearer ${Tropipay.accessToken}`,
@@ -360,7 +360,7 @@ class DepositAccounts {
             await this.tropipay.login();
         }
         try {
-            const deposit = await this.tropipay.request.get(`/api/v2/deposit_accounts`, {
+            const deposit = await this.tropipay.request.get(`/api/v3/deposit_accounts`, {
                 headers: {
                     "Content-Type": "application/json",
                     Authorization: `Bearer ${Tropipay.accessToken}`,
@@ -383,7 +383,7 @@ class DepositAccounts {
             await this.tropipay.login();
         }
         try {
-            const deposit = await this.tropipay.request.post("/api/v2/deposit_accounts", depositAccountObj, {
+            const deposit = await this.tropipay.request.post("/api/v3/deposit_accounts", depositAccountObj, {
                 headers: {
                     "Content-Type": "application/json",
                     Authorization: `Bearer ${Tropipay.accessToken}`,
@@ -407,7 +407,7 @@ class DepositAccounts {
             await this.tropipay.login();
         }
         try {
-            const deposit = await this.tropipay.request.get(`/api/v2/deposit_accounts/${id}`, {
+            const deposit = await this.tropipay.request.get(`/api/v3/deposit_accounts/${id}`, {
                 headers: {
                     "Content-Type": "application/json",
                     Authorization: `Bearer ${Tropipay.accessToken}`,
@@ -430,7 +430,7 @@ class DepositAccounts {
             await this.tropipay.login();
         }
         try {
-            const deposit = await this.tropipay.request.put(`/api/v2/deposit_accounts/`, {
+            const deposit = await this.tropipay.request.put(`/api/v3/deposit_accounts/`, {
                 headers: {
                     "Content-Type": "application/json",
                     Authorization: `Bearer ${Tropipay.accessToken}`,
@@ -453,7 +453,7 @@ class DepositAccounts {
             await this.tropipay.login();
         }
         try {
-            const deposit = await this.tropipay.request.delete(`/api/v2/deposit_accounts/${id}`, {
+            const deposit = await this.tropipay.request.delete(`/api/v3/deposit_accounts/${id}`, {
                 headers: {
                     "Content-Type": "application/json",
                     Authorization: `Bearer ${Tropipay.accessToken}`,
@@ -519,7 +519,7 @@ class Tropipay {
         this.serverMode = config.serverMode || "Development";
         const tpp_env = this.serverMode === "Production"
             ? "https://www.tropipay.com"
-            : "https://tropipay-dev.herokuapp.com";
+            : "https://sandbox.tropipay.me";
         this.request = axios__default["default"].create({
             baseURL: config.customTropipayUrl || tpp_env,
             headers: {
@@ -534,24 +534,22 @@ class Tropipay {
             headers: {
                 "Content-Type": "application/json",
                 Accept: "application/json",
-                Authorization: `Bearer ${Tropipay.accessToken}`,
             },
         });
         // Add request interceptor for Token expired
         this.request.interceptors.request.use(async (config) => {
-            const currentTimestamp = Math.floor(Date.now() / 1000); // Current time in seconds
+            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);
@@ -563,26 +561,8 @@ class Tropipay {
     }
     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("/api/v2/access/token", {
+            const { data } = await this.loginRequest.post("/api/v3/access/token", {
                 client_id: this.clientId,
                 client_secret: this.clientSecret,
                 grant_type: "client_credentials",
@@ -594,8 +574,6 @@ class Tropipay {
                 },
             });
             Tropipay.accessToken = data.access_token;
-            Tropipay.refreshToken = data.refresh_token;
-            Tropipay.expiresIn = data.expires_in;
             Tropipay.expiresIn = data.expires_in;
             return data;
         }
@@ -790,7 +768,9 @@ class ServerSideUtils {
         this.tropipay = tropipayInstance;
     }
     /**
-     * Verify Topipay's signature on webhooks.
+     * DEPRECATED Verify Topipay's signature on API V2 webhooks.
+     * @deprecated This method is deprecated and will be removed in future versions.
+     * Use the `verifySignatureV3` method from the `ServerSideUtils` class instead.
      * @param credentials Credential object or Tropipay instance
      * @param {String} originalCurrencyAmount
      * @param bankOrderCode
@@ -880,6 +860,28 @@ class ServerSideUtils {
             throw new Error(`Error checking base64 image`);
         }
     }
+    /**
+     * Verify Topipay's signature on API V3 webhooks.
+     * @param {string} originalCurrencyAmount
+     * @param {string} bankOrderCode
+     * @param {string} signature signaturev3 field to be verified
+     * @returns {boolean}
+     */
+    static verifySignatureV3(credentials, originalCurrencyAmount, bankOrderCode, signature) {
+        const sha1Secret = crypto__namespace
+            .createHash("sha1")
+            .update(credentials.clientSecret)
+            .digest("hex");
+        const dataToHash = bankOrderCode +
+            credentials.clientId +
+            sha1Secret +
+            originalCurrencyAmount;
+        const localSignature = crypto__namespace
+            .createHash("sha256")
+            .update(dataToHash)
+            .digest("hex");
+        return localSignature === signature;
+    }
 }
 
 const SERVER_MODE = "Development"; // Move the constant here

package/interfaces/index.d.ts

@@ -36,6 +36,7 @@ export interface UserHookSubscribed extends UserHook {
     updatedAt: string;
 }
 export interface PaymentLinkPayload {
+    accountId: number;
     reference: string;
     concept: string;
     favorite: boolean;

package/interfaces/paymentlink/index.d.ts

@@ -46,6 +46,7 @@ declare enum Reasons {
     SENDING_YOU_A_KISS = 80
 }
 export interface PaymentLinkPayload {
+    accountId: number;
     reference: string;
     concept: string;
     favorite: boolean;
@@ -60,9 +61,6 @@ export interface PaymentLinkPayload {
     urlFailed: string;
     urlNotification: string;
     serviceDate: string;
-    /**
-     * fgfsgdfgdfgd
-     */
     client?: {
         name: string;
         lastName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yosle/tropipayjs",
-  "version": "0.1.27",
+  "version": "0.2.0",
   "description": "Javascript / Typescript SDK for the Tropipay API",
   "main": "index.js",
   "scripts": {
@@ -46,4 +46,4 @@
     "type": "individual",
     "url": "https://tppay.me/l94qaa3h"
   }
-}
+}

package/src/api/TropipayAPI.ts

@@ -27,7 +27,7 @@ export class Tropipay {
   readonly clientSecret: string;
   readonly scopes: String[];
   public request: Axios;
-  public loginRequest: Axios; 
+  public loginRequest: Axios;
   public static accessToken: string | null;
   public static refreshToken: string | null;
   public static expiresIn: number | null;
@@ -73,11 +73,12 @@ export class Tropipay {
     this.clientSecret = config.clientSecret;
     this.serverMode = config.serverMode || "Development";
 
-    const tpp_env = this.serverMode === "Production"
-    ? "https://www.tropipay.com"
-    : "https://tropipay-dev.herokuapp.com";
+    const tpp_env =
+      this.serverMode === "Production"
+        ? "https://www.tropipay.com"
+        : "https://sandbox.tropipay.me";
     this.request = axios.create({
-      baseURL: config.customTropipayUrl || tpp_env,                
+      baseURL: config.customTropipayUrl || tpp_env,
       headers: {
         "Content-Type": "application/json",
         Accept: "application/json",
@@ -85,36 +86,33 @@ export class Tropipay {
       },
     });
 
-      // Create a separate instance for login requests
-      this.loginRequest = axios.create({
-        baseURL: config.customTropipayUrl || tpp_env,
-        headers: {
-          "Content-Type": "application/json",
-          Accept: "application/json",
-          Authorization: `Bearer ${Tropipay.accessToken}`,
-        },
-      });
+    // Create a separate instance for login requests
+    this.loginRequest = axios.create({
+      baseURL: config.customTropipayUrl || tpp_env,
+      headers: {
+        "Content-Type": "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
+    // Add request interceptor for Token expired
+    this.request.interceptors.request.use(
+      async (config) => {
+        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);
       }
     );
@@ -124,36 +122,13 @@ export class Tropipay {
     this.mediationPaymentCard = new MediationPaymentCard(this);
 
     this.depositAccounts = new DepositAccounts(this);
-
-    
-
-    
   }
 
   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",
+        "/api/v3/access/token",
         {
           client_id: this.clientId,
           client_secret: this.clientSecret,
@@ -169,8 +144,6 @@ 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) {

package/src/depositAccount/depositAccounts.ts

@@ -18,7 +18,7 @@ export default class DepositAccounts {
     }
     try {
       const deposit = await this.tropipay.request.get(
-        `/api/v2/deposit_accounts`,
+        `/api/v3/deposit_accounts`,
         {
           headers: {
             "Content-Type": "application/json",
@@ -43,7 +43,7 @@ export default class DepositAccounts {
     }
     try {
       const deposit = await this.tropipay.request.post(
-        "/api/v2/deposit_accounts",
+        "/api/v3/deposit_accounts",
         depositAccountObj,
         {
           headers: {
@@ -70,7 +70,7 @@ export default class DepositAccounts {
     }
     try {
       const deposit = await this.tropipay.request.get(
-        `/api/v2/deposit_accounts/${id}`,
+        `/api/v3/deposit_accounts/${id}`,
         {
           headers: {
             "Content-Type": "application/json",
@@ -96,7 +96,7 @@ export default class DepositAccounts {
     }
     try {
       const deposit = await this.tropipay.request.put(
-        `/api/v2/deposit_accounts/`,
+        `/api/v3/deposit_accounts/`,
         {
           headers: {
             "Content-Type": "application/json",
@@ -122,7 +122,7 @@ export default class DepositAccounts {
     }
     try {
       const deposit = await this.tropipay.request.delete(
-        `/api/v2/deposit_accounts/${id}`,
+        `/api/v3/deposit_accounts/${id}`,
         {
           headers: {
             "Content-Type": "application/json",

package/src/interfaces/index.ts

@@ -64,6 +64,7 @@ export interface UserHookSubscribed extends UserHook {
 }
 
 export interface PaymentLinkPayload {
+  accountId: number;
   reference: string;
   concept: string;
   favorite: boolean;

package/src/interfaces/paymentlink/index.d.ts

@@ -1,36 +1,37 @@
 export interface PaymentLinkPayload {
-    reference: string;
-    concept: string;
-    favorite: boolean;
-    amount: number;
-    currency: string;
-    description: string;
-    singleUse: boolean;
-    reasonId: number;
-    expirationDays: number;
-    lang: string;
-    urlSuccess: string;
-    urlFailed: string;
-    urlNotification: string;
-    serviceDate: string;
-    client: {
-        name: string;
-        lastName: string;
-        address: string;
-        phone: string;
-        email: string;
-        countryId: number;
-        termsAndConditions: boolean;
-    };
-    directPayment: boolean;
-    paymentMethods?: string[];
+  accountId: number;
+  reference: string;
+  concept: string;
+  favorite: boolean;
+  amount: number;
+  currency: string;
+  description: string;
+  singleUse: boolean;
+  reasonId: number;
+  expirationDays: number;
+  lang: string;
+  urlSuccess: string;
+  urlFailed: string;
+  urlNotification: string;
+  serviceDate: string;
+  client: {
+    name: string;
+    lastName: string;
+    address: string;
+    phone: string;
+    email: string;
+    countryId: number;
+    termsAndConditions: boolean;
+  };
+  directPayment: boolean;
+  paymentMethods?: string[];
 }
 export interface PaymentLink extends PaymentLinkPayload {
-    expirationDate: string;
-    hasClient: boolean;
-    updatedAt: string;
-    createdAt: string;
-    qrImage: string;
-    shortUrl: string;
-    paymentUrl: string;
+  expirationDate: string;
+  hasClient: boolean;
+  updatedAt: string;
+  createdAt: string;
+  qrImage: string;
+  shortUrl: string;
+  paymentUrl: string;
 }

package/src/interfaces/paymentlink/index.ts

@@ -50,6 +50,7 @@ enum Reasons {
 }
 
 export interface PaymentLinkPayload {
+  accountId: number;
   reference: string;
   concept: string;
   favorite: boolean;
@@ -64,9 +65,6 @@ export interface PaymentLinkPayload {
   urlFailed: string;
   urlNotification: string;
   serviceDate: string;
-  /**
-   * fgfsgdfgdfgd
-   */
   client?: {
     name: string;
     lastName: string;

package/src/paymentcard/PaymentCard.ts

@@ -20,7 +20,7 @@ export default class PaymentCard {
     }
     try {
       const paylink = await this.tropipay.request.post(
-        "/api/v2/paymentcards",
+        "/api/v3/paymentcards",
         payload,
         {
           headers: {
@@ -46,7 +46,7 @@ export default class PaymentCard {
     }
     try {
       const paymentcards = await this.tropipay.request.get(
-        `/api/v2/paymentcards`,
+        `/api/v3/paymentcards`,
         {
           headers: {
             "Content-Type": "application/json",
@@ -74,7 +74,7 @@ export default class PaymentCard {
     }
     try {
       const paymentcard = await this.tropipay.request.get(
-        `/api/v2/paymentcards/${id}`,
+        `/api/v3/paymentcards/${id}`,
         {
           headers: {
             "Content-Type": "application/json",
@@ -103,7 +103,7 @@ export default class PaymentCard {
     }
     try {
       const paymentcard = await this.tropipay.request.delete(
-        `/api/v2/paymentcards/`,
+        `/api/v3/paymentcards/`,
         {
           headers: {
             "Content-Type": "application/json",

package/src/utils/TropipayUtils.ts

@@ -11,7 +11,9 @@ export class ServerSideUtils {
   }
 
   /**
-   * Verify Topipay's signature on webhooks.
+   * DEPRECATED Verify Topipay's signature on API V2 webhooks.
+   * @deprecated This method is deprecated and will be removed in future versions.
+   * Use the `verifySignatureV3` method from the `ServerSideUtils` class instead.
    * @param credentials Credential object or Tropipay instance
    * @param {String} originalCurrencyAmount
    * @param bankOrderCode
@@ -123,4 +125,41 @@ export class ServerSideUtils {
       throw new Error(`Error checking base64 image`);
     }
   }
+
+  /**
+   * Verify Topipay's signature on API V3 webhooks.
+   * @param {string} originalCurrencyAmount
+   * @param {string} bankOrderCode
+   * @param {string} signature signaturev3 field to be verified
+   * @returns {boolean}
+   */
+  public static verifySignatureV3(
+    credentials:
+      | {
+          clientId: string;
+          clientSecret: string;
+        }
+      | Tropipay,
+    originalCurrencyAmount: string,
+    bankOrderCode: string,
+    signature: string
+  ): boolean {
+    const sha1Secret = crypto
+      .createHash("sha1")
+      .update(credentials.clientSecret)
+      .digest("hex");
+
+    const dataToHash =
+      bankOrderCode +
+      credentials.clientId +
+      sha1Secret +
+      originalCurrencyAmount;
+
+    const localSignature = crypto
+      .createHash("sha256")
+      .update(dataToHash)
+      .digest("hex");
+
+    return localSignature === signature;
+  }
 }

package/utils/TropipayUtils.d.ts

@@ -3,7 +3,9 @@ export declare class ServerSideUtils {
     private tropipay;
     constructor(tropipayInstance: Tropipay);
     /**
-     * Verify Topipay's signature on webhooks.
+     * DEPRECATED Verify Topipay's signature on API V2 webhooks.
+     * @deprecated This method is deprecated and will be removed in future versions.
+     * Use the `verifySignatureV3` method from the `ServerSideUtils` class instead.
      * @param credentials Credential object or Tropipay instance
      * @param {String} originalCurrencyAmount
      * @param bankOrderCode
@@ -42,4 +44,15 @@ export declare class ServerSideUtils {
      * @return {Promise<string>} the valid base64 image
      */
     static isValidImage(base64Image: string): boolean;
+    /**
+     * Verify Topipay's signature on API V3 webhooks.
+     * @param {string} originalCurrencyAmount
+     * @param {string} bankOrderCode
+     * @param {string} signature signaturev3 field to be verified
+     * @returns {boolean}
+     */
+    static verifySignatureV3(credentials: {
+        clientId: string;
+        clientSecret: string;
+    } | Tropipay, originalCurrencyAmount: string, bankOrderCode: string, signature: string): boolean;
 }

package/paymentcard/paymentcard.spec.d.ts

@@ -1 +0,0 @@
-declare function sum(a: number, b: number): number;