@kushki/js 1.39.6 → 1.39.7

package/lib/KushkiInfo.js

@@ -12,7 +12,7 @@ const UtilsService_1 = require("./../lib/service/UtilsService");
  */
 class KInfo {
     static buildKushkiInfo(kushkiInfo) {
-        const kushki_js_version = "1.39.6";
+        const kushki_js_version = "1.39.7";
         if (kushkiInfo) {
             if (UtilsService_1.UtilsService.sIsEmpty(kushkiInfo.platformVersion))
                 kushkiInfo.platformVersion = kushki_js_version;

package/lib/service/CardService.d.ts

@@ -39,6 +39,8 @@ export declare class CardService implements ICardService {
     private readonly _3Dsecure;
     private readonly _cardNumber;
     private _sandboxEnable;
+    private readonly _paymentValidatedEvent;
+    private readonly _paymentSetupCompleteEvent;
     constructor(gateway: IKushkiGateway, authService: IAuthService, antiFraud: IAntiFraud);
     requestToken(request: TokenRequest | TokenKPayRequest, mid: string, isTest: boolean, regional: boolean, callback: (value: TokenResponse | ErrorResponse) => void): void;
     requestDeviceToken(request: SubscriptionIdRequest, mid: string, isTest: boolean, regional: boolean, callback: (value: TokenResponse | ErrorResponse) => void): void;
@@ -49,7 +51,6 @@ export declare class CardService implements ICardService {
     requestSecureInit(request: SecureInitRequest, mid: string, isTest: boolean, regional: boolean, callback: (value: SecureInitResponse | ErrorResponse) => void): void;
     private _getCreateSubscriptionDataToTransform;
     private _request3DSToken;
-    private _setupCompleteCardinal;
     private _requestTokenGateway;
     private _getMerchantSettings;
     private _validateParameters;
@@ -66,12 +67,11 @@ export declare class CardService implements ICardService {
     private _isSandboxEnabled;
     private _getCybersourceJwtSubscription;
     private _is3DSSecureEnabled;
+    private _loadCardinalScript;
     private _initCybersource;
     private _initializeCardinal;
     private _initCybersourceSubscription;
     private _completeCardinal;
-    private static _initCardinal;
-    private static _isCardinalInitialized;
     private static _ccaCardinal;
     private static _is3dsValid;
     private _setSandboxEnable;

package/lib/service/CardService.js

@@ -46,6 +46,8 @@ let CardService = CardService_1 = class CardService {
         this._3Dsecure = "active_3dsecure";
         this._cardNumber = "card.number";
         this._sandboxEnable = false;
+        this._paymentValidatedEvent = "payments.validated";
+        this._paymentSetupCompleteEvent = "payments.setupComplete";
         this._gateway = gateway;
         this._antiFraud = antiFraud;
         this._authService = authService;
@@ -108,7 +110,7 @@ let CardService = CardService_1 = class CardService {
             error: (err) => Kushki_1.Kushki.callbackError(err, callback),
             next: ([final_request, authorization, merchant]) => {
                 if (final_request.jwt && !merchant.sandboxEnable)
-                    this._request3DSToken(isTest, () => {
+                    this._request3DSToken(() => {
                         this._requestTokenGateway(final_request, mid, isTest, regional, callback, authorization);
                     });
                 else
@@ -135,7 +137,7 @@ let CardService = CardService_1 = class CardService {
                     delete sift_science_obj.sessionId;
                 if (jwt && !this._sandboxEnable) {
                     sift_science_obj = Object.assign(Object.assign({}, sift_science_obj), { jwt, amount: request.amount, cardHolderName: request.cardHolderName, currency: request.currency });
-                    this._request3DSToken(isTest, () => {
+                    this._request3DSToken(() => {
                         sift_science_obj = Object.assign(Object.assign({}, sift_science_obj), { jwt });
                         this._requestDeviceToken(Object.assign({ subscriptionId: request.subscriptionId }, sift_science_obj), mid, isTest, regional, callback);
                     });
@@ -174,7 +176,7 @@ let CardService = CardService_1 = class CardService {
             error: (err) => Kushki_1.Kushki.callbackError(err, callback),
             next: ([body, jwt, merchant]) => {
                 if (body.jwt && !merchant.sandboxEnable)
-                    this._request3DSToken(isTest, () => {
+                    this._request3DSToken(() => {
                         this._requestSubscriptionTokenGateway(body, mid, isTest, regional, callback, jwt);
                     });
                 else
@@ -205,24 +207,8 @@ let CardService = CardService_1 = class CardService {
             return this._ccaSandbox(body, mid, isTest, regional, callback);
         if (this._isInvalidSpecificationVersion(body, this._sandboxEnable))
             return Kushki_1.Kushki.callbackError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E012), callback);
-        if (isTest) {
-            // tslint:disable-next-line:no-duplicate-string
-            Promise.resolve().then(() => require("./../../lib/libs/cardinal/staging")).then(() => {
-                CardService_1._ccaCardinal(body);
-            });
-            Promise.resolve().then(() => require("./../../lib/libs/cardinal/staging")).then(() => {
-                this._completeCardinal(body.secureId, mid, isTest, regional, callback);
-            });
-        }
-        else {
-            // tslint:disable-next-line:no-duplicate-string
-            Promise.resolve().then(() => require("./../../lib/libs/cardinal/prod")).then(() => {
-                CardService_1._ccaCardinal(body);
-            });
-            Promise.resolve().then(() => require("./../../lib/libs/cardinal/prod")).then(() => {
-                this._completeCardinal(body.secureId, mid, isTest, regional, callback);
-            });
-        }
+        CardService_1._ccaCardinal(body);
+        this._completeCardinal(body.secureId, mid, isTest, regional, callback);
     }
     requestSecureInit(request, mid, isTest, regional, callback) {
         rxjs_1.of(1)
@@ -235,7 +221,7 @@ let CardService = CardService_1 = class CardService {
                     callback(jwt);
                     return;
                 }
-                this._request3DSToken(isTest, () => {
+                this._request3DSToken(() => {
                     callback(jwt);
                 });
             },
@@ -246,25 +232,11 @@ let CardService = CardService_1 = class CardService {
             return Object.assign({}, subscriptionTokenRequest);
         return Object.assign(Object.assign({}, subscriptionTokenRequest), siftObject);
     }
-    _request3DSToken(isTest, callback) {
-        if (isTest)
-            Promise.resolve().then(() => require("./../../lib/libs/cardinal/staging")).then(() => {
-                this._setupCompleteCardinal(callback);
-            });
-        else
-            Promise.resolve().then(() => require("./../../lib/libs/cardinal/prod")).then(() => {
-                this._setupCompleteCardinal(callback);
-            });
-    }
     // istanbul ignore next
-    _setupCompleteCardinal(callback) {
-        // tslint:disable-next-line:early-exit
-        if (CardService_1._isCardinalInitialized())
+    _request3DSToken(callback) {
+        window.Cardinal.on(this._paymentSetupCompleteEvent, () => {
             callback();
-        else
-            window.Cardinal.on("payments.setupComplete", () => {
-                callback();
-            });
+        });
     }
     // istanbul ignore next
     _requestTokenGateway(body, mid, testEnv, regional, callback, authorization) {
@@ -356,36 +328,53 @@ let CardService = CardService_1 = class CardService {
     _is3DSSecureEnabled(merchantSettings) {
         return merchantSettings[this._3Dsecure] === true;
     }
+    _loadCardinalScript(isTest) {
+        const last_script = document.getElementById("cardinal_sc_id");
+        if (last_script)
+            last_script.remove();
+        const head = document.getElementsByTagName("head")[0];
+        const script = document.createElement("script");
+        script.id = "cardinal_sc_id";
+        script.src = isTest
+            ? "https://songbirdstag.cardinalcommerce.com/cardinalcruise/v1/songbird.js"
+            : "https://songbird.cardinalcommerce.com/cardinalcruise/v1/songbird.js";
+        head.appendChild(script);
+    }
     _initCybersource(cardNumber, mid, isTest, regional) {
+        this._loadCardinalScript(isTest);
         return rxjs_1.of(1).pipe(operators_1.switchMap(() => this._gateway.cybersourceJwt(mid, isTest, regional)), operators_1.map((jwtResponse) => {
-            this._initializeCardinal(isTest, jwtResponse.jwt, cardNumber);
+            this._initializeCardinal(jwtResponse.jwt, cardNumber);
             return jwtResponse.jwt;
         }));
     }
-    _initializeCardinal(isTest, jwt, identifier) {
-        if (isTest)
-            Promise.resolve().then(() => require("./../../lib/libs/cardinal/staging")).then(() => {
-                CardService_1._initCardinal(jwt, identifier);
-            });
-        else
-            Promise.resolve().then(() => require("./../../lib/libs/cardinal/prod")).then(() => {
-                CardService_1._initCardinal(jwt, identifier);
-            });
+    _initializeCardinal(jwt, cardNumber) {
+        window.Cardinal.setup("init", {
+            jwt,
+            order: {
+                Consumer: {
+                    Account: {
+                        AccountNumber: UtilsService_1.getBinFromCreditCardNumber(cardNumber),
+                    },
+                },
+            },
+        });
     }
     _initCybersourceSubscription(subscriptionId, mid, isTest, regional) {
+        this._loadCardinalScript(isTest);
         return rxjs_1.of(1).pipe(operators_1.switchMap(() => this._gateway.cybersourceJwt(mid, isTest, regional, subscriptionId)), operators_1.map((jwtResponse) => {
             const bin = buffer_1.Buffer.from(jwtResponse.identifier, "base64").toString("ascii");
-            this._initializeCardinal(isTest, jwtResponse.jwt, bin);
+            this._initializeCardinal(jwtResponse.jwt, bin);
             return jwtResponse.jwt;
         }));
     }
     // istanbul ignore next
     _completeCardinal(secureServiceId, mid, isTest, regional, callback) {
-        return window.Cardinal.on(
-        // tslint:disable-next-line:no-duplicate-string
-        "payments.validated", (data) => __awaiter(this, void 0, void 0, function* () {
-            if (data.ActionCode === CardinalValidated_1.ActionCodeEnum.FAIL && !data.Validated)
+        return window.Cardinal.on(this._paymentValidatedEvent, (data) => __awaiter(this, void 0, void 0, function* () {
+            if (data.ActionCode === CardinalValidated_1.ActionCodeEnum.FAIL && !data.Validated) {
+                window.Cardinal.off(this._paymentSetupCompleteEvent);
+                window.Cardinal.off(this._paymentValidatedEvent);
                 return Kushki_1.Kushki.callbackError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E012), callback);
+            }
             const otp_request = {
                 secureServiceId,
                 otpValue: "",
@@ -393,8 +382,8 @@ let CardService = CardService_1 = class CardService {
             const secure = this._gateway.requestSecureServiceValidation(mid, otp_request, isTest, regional);
             return secure.subscribe({
                 complete: () => {
-                    window.Cardinal.off("payments.setupComplete");
-                    window.Cardinal.off("payments.validated");
+                    window.Cardinal.off(this._paymentSetupCompleteEvent);
+                    window.Cardinal.off(this._paymentValidatedEvent);
                 },
                 error: (err) => Kushki_1.Kushki.callbackError(err, callback),
                 next: (response) => {
@@ -405,30 +394,6 @@ let CardService = CardService_1 = class CardService {
             });
         }));
     }
-    // istanbul ignore next
-    static _initCardinal(jwt, cardNumber) {
-        if (CardService_1._isCardinalInitialized()) {
-            window.Cardinal.trigger("accountNumber.update", UtilsService_1.getBinFromCreditCardNumber(cardNumber));
-            window.Cardinal.trigger("jwt.update", jwt);
-        }
-        else
-            window.Cardinal.setup("init", {
-                jwt,
-                order: {
-                    Consumer: {
-                        Account: {
-                            AccountNumber: UtilsService_1.getBinFromCreditCardNumber(cardNumber),
-                        },
-                    },
-                },
-            });
-    }
-    static _isCardinalInitialized() {
-        const cardinal_status = window.Cardinal.complete({
-            Status: "Success",
-        });
-        return !!cardinal_status;
-    }
     static _ccaCardinal(tokenResponse) {
         window.Cardinal.continue("cca", {
             AcsUrl: tokenResponse.security.acsURL,
@@ -466,7 +431,7 @@ let CardService = CardService_1 = class CardService {
             },
         });
         // istanbul ignore next
-        cardinal_sandbox_js_1.KushkiCardinalSandbox.on("payments.validated", (isErrorFlow) => __awaiter(this, void 0, void 0, function* () {
+        cardinal_sandbox_js_1.KushkiCardinalSandbox.on(this._paymentValidatedEvent, (isErrorFlow) => __awaiter(this, void 0, void 0, function* () {
             if (isErrorFlow === true)
                 return Kushki_1.Kushki.callbackError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E008), callback);
             const otp_request = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kushki/js",
-  "version": "1.39.6",
+  "version": "1.39.7",
   "description": "kushki-js",
   "main": "lib/lib.js",
   "types": "lib/lib.d.ts",