@smartsoft001/revolut 2.116.0 → 2.118.0

package/README.md

@@ -6,6 +6,8 @@
 
 `npm i @smartsoft001/revolut`
 
+Supported Revolut Merchant API version: **`2024-09-01`**.
+
 ## 🛠️ Services & Methods
 
 ### PaypalService

package/index.js

@@ -16,6 +16,7 @@ var RevolutConfig = class {
   test;
   token;
 };
+var REVOLUT_API_VERSION = "2024-09-01";
 var REVOLUT_CONFIG_PROVIDER = "REVOLUT_CONFIG_PROVIDER";
 var IRevolutConfigProvider = class {
 };
@@ -32,34 +33,36 @@ var RevolutService = class {
     const config = await this.getConfig(obj.data);
     const data = {
       amount: obj.amount,
+      currency: "PLN",
       description: obj.name,
-      capture_mode: "AUTOMATIC",
-      merchant_order_ext_ref: obj.id,
-      customer_email: obj.email,
-      currency: "PLN"
+      capture_mode: "automatic",
+      merchant_order_ext_ref: obj.id
     };
-    const response = await this.httpService.post(this.getBaseUrl(config) + "/api/1.0/orders", data, {
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: "Bearer " + config.token
-      },
+    const hasCustomer = !!obj.email || !!obj.firstName || !!obj.lastName || !!obj.contactPhone;
+    if (hasCustomer) {
+      const fullName = [obj.firstName, obj.lastName].filter(Boolean).join(" ");
+      data.customer = {
+        email: obj.email,
+        full_name: fullName || void 0,
+        phone: obj.contactPhone
+      };
+    }
+    const response = await this.httpService.post(this.getBaseUrl(config) + "/api/orders", data, {
+      headers: this.getHeaders(config),
       maxRedirects: 0
     }).toPromise();
     return {
       responseData: response.data,
-      orderId: response.data["public_id"]
+      orderId: response.data.token
     };
   }
   async getStatus(trans) {
     const config = await this.getConfig(trans.data);
     const historyItem = trans.history.find((h) => h.status === "started");
     const response = await this.httpService.get(
-      this.getBaseUrl(config) + "/api/1.0/orders/" + historyItem.data.responseData.id,
+      this.getBaseUrl(config) + "/api/orders/" + historyItem.data.responseData.id,
       {
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + config.token
-        },
+        headers: this.getHeaders(config),
         maxRedirects: 0
       }
     ).toPromise();
@@ -74,7 +77,15 @@ var RevolutService = class {
   getBaseUrl(config) {
     if (config.test)
       return "https://sandbox-merchant.revolut.com";
-    return "https://merchant.revolut.com/api";
+    return "https://merchant.revolut.com";
+  }
+  getHeaders(config) {
+    return {
+      "Content-Type": "application/json",
+      Accept: "application/json",
+      Authorization: "Bearer " + config.token,
+      "Revolut-Api-Version": REVOLUT_API_VERSION
+    };
   }
   async getConfig(data) {
     try {
@@ -90,14 +101,18 @@ var RevolutService = class {
   }
   getStatusFromExternal(status) {
     switch (status) {
-      case "PROCESSING":
+      case "pending":
+        return "pending";
+      case "processing":
+        return "pending";
+      case "authorised":
         return "completed";
-      case "CANCELLED":
+      case "completed":
+        return "completed";
+      case "cancelled":
         return "canceled";
-      case "FAILED":
+      case "failed":
         return "canceled";
-      case "PENDING":
-        return "pending";
       default:
         return status;
     }
@@ -109,6 +124,7 @@ RevolutService = __decorateClass([
 ], RevolutService);
 export {
   IRevolutConfigProvider,
+  REVOLUT_API_VERSION,
   REVOLUT_CONFIG_PROVIDER,
   RevolutConfig,
   RevolutService

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartsoft001/revolut",
-  "version": "2.116.0",
+  "version": "2.118.0",
   "description": "Utils for revolut",
   "repository": {
     "type": "git",

package/src/lib/revolut.config.d.ts

@@ -2,6 +2,7 @@ export declare class RevolutConfig {
     test?: boolean;
     token: string;
 }
+export declare const REVOLUT_API_VERSION = "2024-09-01";
 export declare const REVOLUT_CONFIG_PROVIDER = "REVOLUT_CONFIG_PROVIDER";
 export declare abstract class IRevolutConfigProvider {
     abstract get(data: any): Promise<RevolutConfig>;

package/src/lib/revolut.service.d.ts

@@ -27,6 +27,7 @@ export declare class RevolutService implements ITransPaymentSingleService {
     }>;
     refund(trans: Trans<any>, comment: string): Promise<any>;
     private getBaseUrl;
+    private getHeaders;
     private getConfig;
     private getStatusFromExternal;
 }