Merge pull request #225 from Adyen/develop

KadoBOT · web-flow · commit bd8fa55cef1b · 2020-01-17T13:33:11.000+01:00
Release v2.2.1
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adyen/api-library",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "The Adyen API Library for NodeJS enables you to work with Adyen APIs.",
   "main": "dist/lib/src/index.js",
   "types": "dist/lib/src/index.d.ts",
@@ -38,24 +38,22 @@
   "author": "Ricardo Ambrogi",
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "7.7.7",
-    "@babel/plugin-proposal-class-properties": "7.7.4",
-    "@babel/plugin-proposal-object-rest-spread": "7.7.7",
-    "@babel/plugin-transform-runtime": "7.7.6",
-    "@babel/plugin-transform-typescript": "7.7.4",
-    "@babel/preset-env": "7.7.7",
-    "@babel/preset-typescript": "7.7.7",
-    "@babel/runtime": "7.7.7",
-    "@types/jest": "24.0.25",
+    "@babel/core": "7.8.3",
+    "@babel/plugin-proposal-class-properties": "7.8.3",
+    "@babel/plugin-proposal-object-rest-spread": "7.8.3",
+    "@babel/plugin-transform-runtime": "7.8.3",
+    "@babel/plugin-transform-typescript": "7.8.3",
+    "@babel/preset-env": "7.8.3",
+    "@babel/preset-typescript": "7.8.3",
+    "@babel/runtime": "7.8.3",
     "@types/nock": "10.0.3",
-    "@types/node": "13.1.4",
-    "@typescript-eslint/eslint-plugin": "2.15.0",
-    "@typescript-eslint/parser": "2.15.0",
+    "@typescript-eslint/eslint-plugin": "2.16.0",
+    "@typescript-eslint/parser": "2.16.0",
     "babel-loader": "8.0.6",
     "coveralls": "3.0.9",
     "eslint": "6.8.0",
     "jest": "24.9.0",
-    "nock": "11.7.1",
+    "nock": "11.7.2",
     "release-it": "12.4.3",
     "ts-jest": "24.3.0",
     "ts-loader": "6.2.1",
@@ -64,6 +62,8 @@
     "webpack-cli": "3.3.10"
   },
   "dependencies": {
+    "@types/node": "13.1.7",
+    "@types/jest": "24.0.25",
     "https-proxy-agent": "4.0.0"
   }
 }
diff --git a/src/__tests__/checkout.spec.ts b/src/__tests__/checkout.spec.ts
@@ -180,20 +180,16 @@ describe("Checkout", (): void => {
     });
 
     it("should have payment session success", async (): Promise<void> => {
-        const client: Client = createMockClientFromResponse();
         scope.post("/paymentSession")
             .reply(200, paymentSessionSuccess);
-        const checkout: Checkout = new Checkout(client);
         const paymentSessionRequest: ICheckout.PaymentSetupRequest = createPaymentSessionRequest();
         const paymentSessionResponse = await checkout.paymentSession(paymentSessionRequest);
         expect(paymentSessionResponse.paymentSession).not.toBeUndefined();
     });
 
     it("should have payments result", async (): Promise<void> => {
-        const client = createMockClientFromResponse();
         scope.post("/payments/result")
             .reply(200, paymentsResultSuccess);
-        const checkout = new Checkout(client);
         const paymentResultRequest: ICheckout.PaymentVerificationRequest = {
             payload: "This is a test payload",
         };
@@ -202,22 +198,20 @@ describe("Checkout", (): void => {
     });
 
     it("should have missing identifier on live", async (): Promise<void> => {
-        const client = createMockClientFromResponse();
         client.setEnvironment("LIVE");
         try {
             new Checkout(client);
+            fail();
         } catch (e) {
             expect(e.message).toEqual("Please provide your unique live url prefix on the setEnvironment() call on the Client or provide checkoutEndpoint in your config object.");
         }
     });
 
 
     it("should succeed on multibanco payment", async (): Promise<void> => {
-        const client: Client = createMockClientFromResponse();
         scope.post("/payments")
             .reply(200, paymentsResultMultibancoSuccess);
 
-        const checkout: Checkout = new Checkout(client);
         const paymentsRequest: ICheckout.PaymentRequest = createPaymentsCheckoutRequest();
         const paymentsResponse: ICheckout.PaymentResponse = await checkout.payments(paymentsRequest);
         expect(paymentsResponse.pspReference).toEqual("8111111111111111");
diff --git a/src/__tests__/hmacValidator.spec.ts b/src/__tests__/hmacValidator.spec.ts
@@ -19,31 +19,30 @@ const notificationRequestItem: NotificationRequestItem = {
 };
 
 describe("HMAC Validator", function (): void {
+    let hmacValidator: HmacValidator;
+    beforeEach(() => {
+        hmacValidator = new HmacValidator();
+    });
+
     it("should get correct data", function (): void {
-        const hmacValidator = new HmacValidator();
         const dataToSign = hmacValidator.getDataToSign({merchantAccount: "ACC", currencyCode: "EUR"});
         expect(dataToSign).toEqual("currencyCode:merchantAccount:EUR:ACC");
     });
     it("should get correct data with escaped characters", function (): void {
-        const hmacValidator = new HmacValidator();
         const dataToSign = hmacValidator.getDataToSign({currencyCode: "EUR", merchantAccount: "ACC:\\", sessionValidity: "2019-09-21T11:45:24.637Z"});
         expect(dataToSign).toEqual("currencyCode:merchantAccount:sessionValidity:EUR:ACC\\:\\\\:2019-09-21T11\\:45\\:24.637Z");
     });
     it("should encrypt correctly", function (): void {
         const data = "countryCode:currencyCode:merchantAccount:merchantReference:paymentAmount:sessionValidity:skinCode:NL:EUR:MagentoMerchantTest2:TEST-PAYMENT-2017-02-01-14\\:02\\:05:199:2017-02-02T14\\:02\\:05+01\\:00:PKz2KML1";
-        const key = "DFB1EB5485895CFA84146406857104ABB4CBCABDC8AAF103A624C8F6A3EAAB00";
-        const hmacValidator = new HmacValidator();
-        const encrypted = hmacValidator.calculateHmac(data, key);
+        const encrypted = hmacValidator.calculateHmac(data, "DFB1EB5485895CFA84146406857104ABB4CBCABDC8AAF103A624C8F6A3EAAB00");
         expect(encrypted).toEqual("34oR8T1whkQWTv9P+SzKyp8zhusf9n0dpqrm9nsqSJs=");
     });
     it("should get correct data to sign", function (): void {
-        const hmacValidator = new HmacValidator();
         const data = hmacValidator.getDataToSign(notificationRequestItem);
         expect(data).toEqual("pspReference:originalReference:merchantAccount:reference:1000:EUR:EVENT:true");
     });
 
     it("should have valid hmac", function (): void {
-        const hmacValidator = new HmacValidator();
         const encrypted = hmacValidator.calculateHmac(notificationRequestItem, key);
         expect(expectedSign).toEqual(encrypted);
         expect(hmacValidator.validateHMAC(notificationRequestItem, key)).toBeTruthy();
@@ -54,7 +53,6 @@ describe("HMAC Validator", function (): void {
             ...notificationRequestItem,
             additionalData: { [ApiConstants.HMAC_SIGNATURE]: "notValidSign" }
         };
-        const hmacValidator = new HmacValidator();
         const result = hmacValidator.validateHMAC(invalidNotification, key);
         expect(result).toBeFalsy();
     });
diff --git a/src/helpers/getJsonResponse.ts b/src/helpers/getJsonResponse.ts
@@ -22,6 +22,7 @@
 import Resource from "../services/resource";
 import HttpClientException from "../httpClient/httpClientException";
 import ApiException from "../services/exception/apiException";
+import {IRequest} from "../typings/requestOptions";
 
 async function getJsonResponse<T>(resource: Resource, jsonRequest: T | string, requestOptions?: IRequest.Options): Promise<string>;
 async function getJsonResponse<T, R>(resource: Resource, jsonRequest: T | string, requestOptions?: IRequest.Options): Promise<R>;
diff --git a/src/httpClient/clientInterface.ts b/src/httpClient/clientInterface.ts
@@ -22,6 +22,7 @@ import { AgentOptions } from "https";
 import HttpClientException from "./httpClientException";
 import ApiException from "../services/exception/apiException";
 import {Config} from "../index";
+import {IRequest} from "../typings/requestOptions";
 
 interface ClientInterface {
     request(
diff --git a/src/httpClient/httpURLConnectionClient.ts b/src/httpClient/httpURLConnectionClient.ts
@@ -33,6 +33,7 @@ import {ApiError} from "../typings/apiError";
 import ApiException from "../services/exception/apiException";
 import ClientInterface from "./clientInterface";
 import {ApiConstants} from "../constants/apiConstants";
+import {IRequest} from "../typings/requestOptions";
 
 class HttpURLConnectionClient implements ClientInterface {
     private static CHARSET = "utf-8";
diff --git a/src/index.ts b/src/index.ts
@@ -19,6 +19,8 @@
  * See the LICENSE file for more info.
  */
 
+import "./typings";
+
 export { default as Client } from "./client";
 export { default as Config } from "./config";
 export * from "./services/";
diff --git a/src/services/checkout.ts b/src/services/checkout.ts
@@ -29,6 +29,7 @@ import PaymentSession from "./resource/checkout/paymentSession";
 import PaymentsResult from "./resource/checkout/paymentsResult";
 import PaymentLinks from "./resource/checkout/paymentLinks";
 import setApplicationInfo from "../helpers/setApplicationInfo";
+import {IRequest} from "../typings/requestOptions";
 
 class Checkout extends ApiKeyAuthenticatedService {
     private readonly _payments: Payments;
diff --git a/src/services/modification.ts b/src/services/modification.ts
@@ -29,6 +29,7 @@ import Refund from "./resource/modification/refund";
 import TechnicalCancel from "./resource/modification/technicalCancel";
 import setApplicationInfo from "../helpers/setApplicationInfo";
 import {ApplicationInfo} from "../typings/applicationInfo";
+import {IRequest} from "../typings/requestOptions";
 
 interface AppInfo { applicationInfo?: ApplicationInfo }
 type GenericRequest<T> = T & AppInfo;
diff --git a/src/services/resource.ts b/src/services/resource.ts
@@ -24,6 +24,7 @@ import Service from "../service";
 import HttpClientException from "../httpClient/httpClientException";
 import ApiException from "./exception/apiException";
 import ClientInterface from "../httpClient/clientInterface";
+import {IRequest} from "../typings/requestOptions";
 
 abstract class Resource {
     protected endpoint: string;
diff --git a/src/typings/applicationInfo.ts b/src/typings/applicationInfo.ts
@@ -40,22 +40,22 @@ export class ApplicationInfo {
     }
 }
 
-export interface CommonField {
+declare interface CommonField {
     name?: string;
     version?: string;
 }
 
-export interface ExternalPlatform extends CommonField {
+declare interface ExternalPlatform extends CommonField {
     integrator?: string;
 }
 
-export interface MerchantDevice {
+declare interface MerchantDevice {
     os?: string;
     osVersion?: string;
     reference?: string;
 }
 
-export interface ShopperInteractionDevice {
+declare interface ShopperInteractionDevice {
     os?: string;
     osVersion?: string;
     locale?: string;
diff --git a/src/typings/index.ts b/src/typings/index.ts
@@ -0,0 +1,20 @@
+/// <reference path="amount.ts" />
+/// <reference path="apiError.ts" />
+/// <reference path="applicationInfo.ts" />
+/// <reference path="binLookup.ts" />
+/// <reference path="checkout.ts" />
+/// <reference path="checkoutUtility.ts" />
+/// <reference path="enums/environment.ts" />
+/// <reference path="enums/vatCategory.ts" />
+/// <reference path="marketPayAccount.ts" />
+/// <reference path="marketPayFund.ts" />
+/// <reference path="marketPayHostedOnboardingPage.ts" />
+/// <reference path="marketPayNotificationConfiguration.ts" />
+/// <reference path="marketPayNotifications.ts" />
+/// <reference path="nexo.ts" />
+/// <reference path="notification.ts" />
+/// <reference path="payments.ts" />
+/// <reference path="payouts.ts" />
+/// <reference path="recurring.ts" />
+/// <reference path="requestOptions.ts" />
+/// <reference path="terminal.ts" />
diff --git a/src/typings/requestOptions.ts b/src/typings/requestOptions.ts
@@ -20,8 +20,13 @@
  */
 
 // Generated using typescript-generator version 2.14.505 on 2019-06-03 16:13:35.
-declare namespace IRequest {
-    export type Options = HttpsRequestOptions & {
+
+/// <reference types="node"/>
+
+import * as https from "https";
+
+export namespace IRequest {
+    export type Options = https.RequestOptions & {
         idempotencyKey?: string;
     }
 }
diff --git a/yarn.lock b/yarn.lock
