Merge 7e80e05 into dc4e902

paypay · Sep 28, 2020 · 4fb6b76 · 4fb6b76
2 parents dc4e902 + 7e80e05
commit 4fb6b76
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 3 deletions.
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
@@ -7,7 +7,7 @@
 class Auth {
   clientId: string;
   clientSecret: string;
-  merchantId: string;
+  merchantId?: string;
   /**
    * Set intial values to empty string
    */
@@ -22,7 +22,7 @@ class Auth {
    * @param  {String}   clientId      API_KEY provided by client
    * @param  {String}   clientSecret  API_SECRET provided by client
    */
-  setAuth(clientId: string, clientSecret: string, merchantId: string) {
+  setAuth(clientId: string, clientSecret: string, merchantId?: string) {
     this.clientId = clientId;
     this.clientSecret = clientSecret;
     this.merchantId = merchantId;

diff --git a/src/lib/paypay-rest-sdk.ts b/src/lib/paypay-rest-sdk.ts
@@ -27,7 +27,7 @@ class PayPayRestSDK {
    * @param {string}  clientSecret  API_SECRET provided by end-user
    * @param {string}  merchantId    MERCHANT_ID provided by end-user
    */
-  public configure = (clientConfig: { clientId: string; clientSecret: string; merchantId: string; productionMode: boolean;}) => {
+  public configure = (clientConfig: { clientId: string; clientSecret: string; merchantId?: string; productionMode: boolean;}) => {
     auth.setAuth(clientConfig.clientId, clientConfig.clientSecret, clientConfig.merchantId);
     if (clientConfig.productionMode) {
       this.productionMode = clientConfig.productionMode
@@ -67,12 +67,18 @@ class PayPayRestSDK {
   }
 
   private setHttpsOptions(header: string) {
+    let isempty : any = [undefined, null, "", 'undefined', 'null'];
     this.options.hostname = this.config.getHostname(),
     this.options.port = this.config.getPortNumber(),
     this.options.headers = {
         "Authorization": header,
         "X-ASSUME-MERCHANT": auth.merchantId,
       };
+    if(isempty.includes(auth.merchantId)){
+      this.options.headers = {
+        "Authorization": header,
+      };
+    }
    this.config.setHttpsOptions(this.options);
   }
 

diff --git a/test/qrCodeCreateWithMerchantNotSpecified.test.ts b/test/qrCodeCreateWithMerchantNotSpecified.test.ts
@@ -0,0 +1,79 @@
+import { payPayRestSDK } from "../src/lib/paypay-rest-sdk";
+import { httpsClient } from '../src/lib/httpsClient';
+
+const conf = {
+    clientId: '5345435fsdfsr54353454',
+    clientSecret: 'dgfgdfgt46435gsdr35tte5',
+    productionMode: false
+};
+
+payPayRestSDK.configure(conf);
+
+test('Unit Test - Create QR code without specifying the merchant id', async () => {
+
+    const payload = {
+        merchantPaymentId: '2312324',
+        amount: {
+            amount: 1,
+            currency: 'JPY',
+        },
+        codeType: 'ORDER_QR',
+        orderDescription: 'Test Description',
+        isAuthorization: false,
+        redirectUrl: 'https://test.redirect.url/',
+        redirectType: 'WEB_LINK',
+        userAgent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1'
+    };
+
+    const response = {
+        "resultInfo": {
+            "code": "SUCCESS",
+            "message": "Success",
+            "codeId": "08100001"
+        },
+        "data": {
+            "codeId": "08100001",
+            "url": "https://test.url/",
+            "deeplink": "https://test.deeplink",
+            "expiryDate": 3213232,
+            "merchantPaymentId": "342423423",
+            "amount": {
+                "amount": 10.50,
+                "currency": "JPY"
+            },
+            "orderDescription": "Test Description",
+            "orderItems": [
+                {
+                    "name": "Test Item",
+                    "category": "Test Category",
+                    "quantity": 1,
+                    "productId": "349329",
+                    "unit_price": {
+                        "amount": 10.50,
+                        "currency": "JPY"
+                    }
+                }
+            ],
+            "metadata": {},
+            "requestedAt": 2131312,
+            "redirectUrl": "https://test.redirect.url/",
+            "redirectType": "WEB_LINK",
+            "isAuthorization": true,
+            "authorizationExpiry": null
+        }
+    };
+
+    const mockHttpsCall = jest.spyOn(httpsClient, 'httpsCall');
+    mockHttpsCall.mockImplementation(jest.fn((_options: any, _payload = '', _callback: any) => {
+        _callback(response);
+    }));
+
+    await payPayRestSDK.qrCodeCreate(payload, (result: any) => {
+        expect(result).toEqual(response);
+    });
+
+    expect(mockHttpsCall).toHaveBeenCalledTimes(1);
+    expect(mockHttpsCall).toHaveBeenCalledWith(expect.anything(), payload, expect.anything());
+
+    mockHttpsCall.mockClear();
+});