@kushki/js 1.40.1-alpha.14317.3 → 1.40.2-alpha

package/lib/service/ApplePayService.js

@@ -0,0 +1,189 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var ApplePayService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApplePayService = void 0;
+/**
+ * Apple Pay Service file
+ */
+const Identifiers_1 = require("./../../lib/constant/Identifiers");
+const KushkiError_1 = require("./../../lib/generic/KushkiError");
+const CardBrandsEnum_1 = require("./../../lib/infrastructure/CardBrandsEnum");
+const ErrorEnum_1 = require("./../../lib/infrastructure/ErrorEnum");
+const inversify_1 = require("inversify");
+require("reflect-metadata");
+const Kushki_1 = require("./../../lib/Kushki");
+/**
+ * Implementation
+ */
+let ApplePayService = ApplePayService_1 = class ApplePayService {
+    constructor(gateway) {
+        this._appleSdkCdn = "https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js";
+        this._appleSdkId = "apple-pay-sdk";
+        this._appleButtonElement = "apple-pay-button";
+        this._appleButtonContainer = "kushki-apple-pay-button";
+        this._requiredMerchantCapabilities = "supports3DS";
+        this._maxCompatibleVersion = 16;
+        this._gateway = gateway;
+    }
+    initApplePayButton(options, mid, isTest, regional, onInit, onClick, onError) {
+        this._validateAppleDomain(mid, isTest, regional).then((isValid) => {
+            if (!isValid) {
+                Kushki_1.Kushki.callbackError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E020), onError);
+                return;
+            }
+            this._loadAppleSdk(() => this._buildAppleButton(options, onInit, onClick, onError), () => Kushki_1.Kushki.callbackError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E019), onError));
+        });
+    }
+    requestApplePayToken(options, mid, isTest, regional, callback, onCancel) {
+        if (this._isNotPaymentAvailable()) {
+            Kushki_1.Kushki.callbackError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E020), callback);
+            return;
+        }
+        const session_params = Object.assign({ countryCode: options.countryCode, currencyCode: options.currencyCode, merchantCapabilities: [this._requiredMerchantCapabilities], supportedNetworks: [CardBrandsEnum_1.CardBrandsEnum.VISA, CardBrandsEnum_1.CardBrandsEnum.MASTER_CARD], total: {
+                amount: options.amount.toString(),
+                label: options.displayName,
+            } }, options.optionalApplePayFields);
+        const session = new window.ApplePaySession(this._getSupportedApplePayVersion(), session_params);
+        session.onvalidatemerchant = (event) => this._onValidateMerchant(event, mid, session, options, isTest, regional, callback);
+        session.onpaymentauthorized = (event) => this._onPaymentAuthorized(event, mid, session, isTest, regional, callback);
+        session.oncancel = () => {
+            onCancel();
+        };
+        session.begin();
+    }
+    _validateAppleDomain(mid, isTest, regional) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const { isValid: is_valid } = yield this._gateway
+                    .validateAppleDomain(ApplePayService_1.getClientDomain(), mid, isTest, regional)
+                    .toPromise();
+                return !!is_valid;
+            }
+            catch (e) {
+                return false;
+            }
+        });
+    }
+    _isNotPaymentAvailable() {
+        return !window.ApplePaySession || !window.ApplePaySession.canMakePayments();
+    }
+    _getSupportedApplePayVersion() {
+        for (let v = this._maxCompatibleVersion; v >= 1; v--)
+            if (window.ApplePaySession.supportsVersion(v))
+                return v;
+        return 0;
+    }
+    _loadAppleSdk(onLoad, onError) {
+        const last_script = document.getElementById(this._appleSdkId);
+        if (last_script) {
+            onLoad();
+            return;
+        }
+        const script = document.createElement("script");
+        script.id = this._appleSdkId;
+        script.src = this._appleSdkCdn;
+        script.crossOrigin = "anonymous";
+        document.head.appendChild(script);
+        script.onload = onLoad;
+        script.onerror = onError;
+    }
+    _buildAppleButton(options, onInit, onClick, onError) {
+        try {
+            if (this._isNotPaymentAvailable()) {
+                Kushki_1.Kushki.callbackError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E020), onError);
+                return;
+            }
+            const container = document.getElementById(this._appleButtonContainer);
+            if (!container) {
+                Kushki_1.Kushki.callbackError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E019), onError);
+                return;
+            }
+            const button = document.createElement(this._appleButtonElement);
+            button.setAttribute("buttonstyle", options.style);
+            button.setAttribute("type", options.type);
+            button.setAttribute("locale", options.locale);
+            button.addEventListener("click", onClick);
+            container.textContent = "";
+            container.appendChild(button);
+            onInit();
+        }
+        catch (error) {
+            onError(error);
+        }
+    }
+    _onValidateMerchant(event, mid, session, options, isTest, regional, onError) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const merchant_session = yield this._gateway
+                    .startApplePaySession({
+                    clientDomain: ApplePayService_1.getClientDomain(),
+                    displayName: options.displayName,
+                    validationURL: event.validationURL,
+                }, mid, isTest, regional)
+                    .toPromise();
+                session.completeMerchantValidation(merchant_session);
+            }
+            catch (err) {
+                Kushki_1.Kushki.callbackError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E007), onError);
+                session.abort();
+            }
+        });
+    }
+    _onPaymentAuthorized(event, mid, session, isTest, regional, callback) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const apple_token = event.payment.token.paymentData;
+                const kushki_token = yield this._gateway
+                    .getApplePayToken(apple_token, mid, isTest, regional)
+                    .toPromise();
+                const billing_contact = event.payment.billingContact;
+                const shipping_contact = event.payment.shippingContact;
+                session.completePayment(window.ApplePaySession.STATUS_SUCCESS);
+                callback(Object.assign(Object.assign(Object.assign({}, (billing_contact ? { billingContact: billing_contact } : {})), (shipping_contact ? { shippingContact: shipping_contact } : {})), kushki_token));
+            }
+            catch (err) {
+                Kushki_1.Kushki.callbackError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E006), callback);
+                session.abort();
+            }
+        });
+    }
+    static getClientDomain() {
+        let domain = window.location.href;
+        const is_in_iframe = window.self !== window.top;
+        const parent_ref = window.location.ancestorOrigins;
+        const have_parent = parent_ref && parent_ref.length;
+        if (is_in_iframe)
+            if (have_parent)
+                domain = parent_ref[parent_ref.length - 1];
+            else
+                domain = document.referrer;
+        return new URL(domain).hostname;
+    }
+};
+ApplePayService = ApplePayService_1 = __decorate([
+    inversify_1.injectable(),
+    __param(0, inversify_1.inject(Identifiers_1.IDENTIFIERS.KushkiGateway)),
+    __metadata("design:paramtypes", [Object])
+], ApplePayService);
+exports.ApplePayService = ApplePayService;

package/lib/service/CardService.d.ts

@@ -4,7 +4,6 @@
  */
 import "reflect-metadata";
 import { IAntiFraud } from "./../../lib/repository/IAntiFraud";
-import { IAuthService } from "./../../lib/repository/IAuthService";
 import { ICardService } from "./../../lib/repository/ICardService";
 import { IKushkiGateway } from "./../../lib/repository/IKushkiGateway";
 import { Observable } from "rxjs";
@@ -15,10 +14,8 @@ import { IDeferredResponse } from "./../../lib/types/remote/deferred_response";
 import { TokenResponse } from "./../../lib/types/remote/token_response";
 import { SecureInitRequest } from "./../../lib/types/secure_init_request";
 import { SecureInitResponse } from "./../../lib/types/secure_init_response";
-import { SubscriptionTokenKPayRequest } from "./../../lib/types/subscription_token_kpay_request";
 import { SubscriptionTokenRequest } from "./../../lib/types/subscription_token_request";
 import { SubscriptionIdRequest } from "./../../lib/types/subscriptionId_request";
-import { TokenKPayRequest } from "./../../lib/types/token_kpay_request";
 import { TokenRequest } from "./../../lib/types/token_request";
 import { Validate3DSRequest } from "./../../lib/types/validate_3ds_request";
 import { Validate3DsResponse } from "./../../lib/types/validate_3ds_response";
@@ -35,27 +32,28 @@ export declare class CardService implements ICardService {
     private readonly _gateway;
     private readonly _receipt;
     private readonly _antiFraud;
-    private readonly _authService;
     private readonly _3Dsecure;
     private readonly _cardNumber;
     private _sandboxEnable;
-    constructor(gateway: IKushkiGateway, authService: IAuthService, antiFraud: IAntiFraud);
-    requestToken(request: TokenRequest | TokenKPayRequest, mid: string, isTest: boolean, regional: boolean, callback: (value: TokenResponse | ErrorResponse) => void): void;
+    private readonly _paymentValidatedEvent;
+    private readonly _paymentSetupCompleteEvent;
+    constructor(gateway: IKushkiGateway, antiFraud: IAntiFraud);
+    requestToken(request: TokenRequest, 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;
-    requestSubscriptionToken(subscriptionTokenRequest: SubscriptionTokenRequest | SubscriptionTokenKPayRequest, mid: string, isTest: boolean, regional: boolean, callback: (value: TokenResponse | ErrorResponse) => void): void;
+    requestSubscriptionToken(subscriptionTokenRequest: SubscriptionTokenRequest, mid: string, isTest: boolean, regional: boolean, callback: (value: TokenResponse | ErrorResponse) => void): void;
     requestDeferred(binBody: BinBody, mid: string, isTest: boolean, regional: boolean): Observable<IDeferredResponse[]>;
     requestBinInfo(binBody: BinBody, mid: string, isTest: boolean, regional: boolean): Observable<BinInfoResponse>;
     validate3DS(body: Validate3DSRequest, mid: string, isTest: boolean, regional: boolean, callback: (value: Validate3DsResponse | ErrorResponse) => void): void;
     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;
     private _getDeviceTokenSiftScienceObject;
     private _createSubscriptionSiftScienceSession;
     private _checkCardLength;
+    private _checkSecureInitCardLength;
     private _getScienceSession;
     private _checkCurrency;
     private _getRequestSiftObject;
@@ -65,11 +63,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 _ccaCardinal;
     private static _is3dsValid;
     private _setSandboxEnable;
@@ -78,4 +76,5 @@ export declare class CardService implements ICardService {
     private _getUserId;
     private _requestSubscriptionTokenGateway;
     private _requestDeviceToken;
+    private _isInvalidSpecificationVersion;
 }

package/lib/service/CardService.js

@@ -28,9 +28,11 @@ var CardService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CardService = void 0;
 const cardinal_sandbox_js_1 = require("@kushki/cardinal-sandbox-js");
+const buffer_1 = require("buffer");
 const Identifiers_1 = require("./../../lib/constant/Identifiers");
 const dot = require("dot-object");
 const KushkiError_1 = require("./../../lib/generic/KushkiError");
+const CardinalValidated_1 = require("./../../lib/infrastructure/CardinalValidated");
 const ErrorEnum_1 = require("./../../lib/infrastructure/ErrorEnum");
 const ThreeDSEnum_1 = require("./../../lib/infrastructure/ThreeDSEnum");
 const inversify_1 = require("inversify");
@@ -40,13 +42,14 @@ const operators_1 = require("rxjs/operators");
 const UtilsService_1 = require("./../../lib/service/UtilsService");
 const Kushki_1 = require("./../../lib/Kushki");
 let CardService = CardService_1 = class CardService {
-    constructor(gateway, authService, antiFraud) {
+    constructor(gateway, antiFraud) {
         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;
         this._receipt = {
             amount: "totalAmount",
             "card.cvc": "card.cvv",
@@ -80,37 +83,28 @@ let CardService = CardService_1 = class CardService {
             this._setSandboxEnable(!!merchant.sandboxEnable);
             return rxjs_1.forkJoin([
                 this._getScienceSession(request, mid, isTest, merchant),
-                this._getCybersourceJwt(merchant, mid, isTest, regional, Object.prototype.hasOwnProperty.call(request, "card")
-                    ? request.card.number
-                    : undefined),
+                this._getCybersourceJwt(merchant, mid, isTest, regional, request.card.number),
                 rxjs_1.of(merchant),
             ]);
         }), operators_1.mergeMap(([sift_object, jwt, merchant]) => {
             request.isDeferred =
                 request.isDeferred === undefined ? false : request.isDeferred;
-            if (Boolean(request.cvv))
-                request.card = { cvc: request.cvv };
             this._checkRequestBody(request);
             const data_to_transform = Object.assign(Object.assign({}, request), sift_object);
             if (jwt !== undefined)
                 data_to_transform.jwt = jwt;
-            return rxjs_1.forkJoin([
-                rxjs_1.of(dot.transform(this._receipt, Object.assign(Object.assign({}, data_to_transform), { merchantName: merchant.merchant_name }))),
-                request.walletId
-                    ? this._authService.getAuthorizationToken()
-                    : rxjs_1.of(undefined),
-                rxjs_1.of(merchant),
-            ]);
+            const final_request = dot.transform(this._receipt, Object.assign(Object.assign({}, data_to_transform), { merchantName: merchant.merchant_name }));
+            return rxjs_1.of({ final_request, merchant });
         }))
             .subscribe({
             error: (err) => Kushki_1.Kushki.callbackError(err, callback),
-            next: ([final_request, authorization, merchant]) => {
+            next: ({ final_request, merchant, }) => {
                 if (final_request.jwt && !merchant.sandboxEnable)
-                    this._request3DSToken(isTest, () => {
-                        this._requestTokenGateway(final_request, mid, isTest, regional, callback, authorization);
+                    this._request3DSToken(() => {
+                        this._requestTokenGateway(final_request, mid, isTest, regional, callback);
                     });
                 else
-                    this._requestTokenGateway(final_request, mid, isTest, regional, callback, authorization);
+                    this._requestTokenGateway(final_request, mid, isTest, regional, callback);
             },
         });
     }
@@ -133,7 +127,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);
                     });
@@ -160,23 +154,18 @@ let CardService = CardService_1 = class CardService {
             const data_to_transform = this._getCreateSubscriptionDataToTransform(sift_object, subscriptionTokenRequest);
             if (jwt !== undefined)
                 data_to_transform.jwt = jwt;
-            return rxjs_1.forkJoin([
-                rxjs_1.of(dot.transform(this._receipt, Object.assign(Object.assign({}, data_to_transform), { merchantName: merchant.merchant_name }))),
-                subscriptionTokenRequest.walletId
-                    ? this._authService.getAuthorizationToken()
-                    : rxjs_1.of(undefined),
-                rxjs_1.of(merchant),
-            ]);
+            const body = dot.transform(this._receipt, Object.assign(Object.assign({}, data_to_transform), { merchantName: merchant.merchant_name }));
+            return rxjs_1.of({ body, merchant });
         }))
             .subscribe({
             error: (err) => Kushki_1.Kushki.callbackError(err, callback),
-            next: ([body, jwt, merchant]) => {
+            next: ({ body, merchant, }) => {
                 if (body.jwt && !merchant.sandboxEnable)
-                    this._request3DSToken(isTest, () => {
-                        this._requestSubscriptionTokenGateway(body, mid, isTest, regional, callback, jwt);
+                    this._request3DSToken(() => {
+                        this._requestSubscriptionTokenGateway(body, mid, isTest, regional, callback);
                     });
                 else
-                    this._requestSubscriptionTokenGateway(body, mid, isTest, regional, callback, jwt);
+                    this._requestSubscriptionTokenGateway(body, mid, isTest, regional, callback);
             },
         });
     }
@@ -201,35 +190,24 @@ let CardService = CardService_1 = class CardService {
             UtilsService_1.UtilsService.sGet(body, "security.paReq", ThreeDSEnum_1.ThreeDSEnum.SANDBOX) ===
                 ThreeDSEnum_1.ThreeDSEnum.SANDBOX)
             return this._ccaSandbox(body, mid, isTest, regional, 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);
-            });
-        }
+        if (this._isInvalidSpecificationVersion(body, this._sandboxEnable))
+            return Kushki_1.Kushki.callbackError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E012), callback);
+        CardService_1._ccaCardinal(body);
+        this._completeCardinal(body.secureId, mid, isTest, regional, callback);
     }
     requestSecureInit(request, mid, isTest, regional, callback) {
         rxjs_1.of(1)
-            .pipe(operators_1.map(() => this._checkCardLength(request, ErrorEnum_1.ErrorCode.E014)), operators_1.switchMap(() => this._getMerchantSettings(mid, isTest, regional)), operators_1.switchMap((merchantSettings) => rxjs_1.iif(() => this._is3DSSecureEnabled(merchantSettings), rxjs_1.of(merchantSettings), rxjs_1.throwError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E013)))), operators_1.switchMap((merchant) => this._getCybersourceJwt(merchant, mid, isTest, regional, request.card.number)), operators_1.map((jwt) => ({
-            jwt: jwt,
-        })))
+            .pipe(operators_1.map(() => this._checkSecureInitCardLength(request)), operators_1.switchMap(() => this._getMerchantSettings(mid, isTest, regional)), operators_1.switchMap((merchantSettings) => rxjs_1.iif(() => this._is3DSSecureEnabled(merchantSettings), rxjs_1.of(merchantSettings), rxjs_1.throwError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E013)))), operators_1.switchMap((merchant) => rxjs_1.forkJoin(this._getCybersourceJwt(merchant, mid, isTest, regional, request.card.number), rxjs_1.of(merchant))))
             .subscribe({
             error: (err) => Kushki_1.Kushki.callbackError(err, callback),
-            next: (jwtResponse) => {
-                this._request3DSToken(isTest, () => {
-                    callback(jwtResponse);
+            next: ([jwt_response, merchant_settings]) => {
+                const jwt = { jwt: jwt_response };
+                if (this._isSandboxEnabled(merchant_settings)) {
+                    callback(jwt);
+                    return;
+                }
+                this._request3DSToken(() => {
+                    callback(jwt);
                 });
             },
         });
@@ -239,21 +217,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) {
-        window.Cardinal.on("payments.setupComplete", () => __awaiter(this, void 0, void 0, function* () {
+    _request3DSToken(callback) {
+        window.Cardinal.on(this._paymentSetupCompleteEvent, () => {
             callback();
-        }));
+        });
     }
     // istanbul ignore next
     _requestTokenGateway(body, mid, testEnv, regional, callback, authorization) {
@@ -284,19 +252,16 @@ let CardService = CardService_1 = class CardService {
     _createSubscriptionSiftScienceSession(subscriptionId, mid, isTest, merchantSettingsResponse, regional, request) {
         return rxjs_1.of(1).pipe(operators_1.switchMap(() => this._getUserId(subscriptionId, mid, isTest, regional, request.userId)), operators_1.switchMap((getUserIdResponse) => this._antiFraud.createSiftScienceSession(subscriptionId, "", mid, isTest, merchantSettingsResponse, UtilsService_1.UtilsService.sGet(getUserIdResponse, "userId"))));
     }
-    _checkCardLength(request, errorCode = ErrorEnum_1.ErrorCode.E005) {
+    _checkCardLength(request) {
         if (request.card.number.length < 14 || request.card.number.length > 19)
-            throw new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS[errorCode]);
+            throw new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS[ErrorEnum_1.ErrorCode.E005]);
+    }
+    _checkSecureInitCardLength(request) {
+        if (request.card.number.length < 6 || request.card.number.length > 19)
+            throw new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS[ErrorEnum_1.ErrorCode.E014]);
     }
     _getScienceSession(request, mid, isTest, merchant) {
-        return rxjs_1.of(1).pipe(operators_1.switchMap(() => {
-            if (request.card && request.card.number !== undefined)
-                return this._antiFraud.createSiftScienceSession(UtilsService_1.getBinFromCreditCardNumberSift(request.card.number), request.card.number.slice(-4), mid, isTest, merchant);
-            return rxjs_1.of({
-                sessionId: null,
-                userId: null,
-            });
-        }));
+        return rxjs_1.of(1).pipe(operators_1.switchMap(() => this._antiFraud.createSiftScienceSession(UtilsService_1.getBinFromCreditCardNumberSift(request.card.number), request.card.number.slice(-4), mid, isTest, merchant)));
     }
     _checkCurrency(request) {
         request.currency =
@@ -314,8 +279,7 @@ let CardService = CardService_1 = class CardService {
     }
     _checkRequestBody(request) {
         this._checkCurrency(request);
-        if (Boolean(request.card) && Boolean(request.card.number))
-            this._checkCardLength(request);
+        this._checkCardLength(request);
         this._checkAmount(request);
     }
     _getCybersourceJwt(merchantSettings, mid, isTest, regional, cardNumber) {
@@ -341,38 +305,73 @@ let CardService = CardService_1 = class CardService {
     _is3DSSecureEnabled(merchantSettings) {
         return merchantSettings[this._3Dsecure] === true;
     }
+    _loadCardinalScript(isTest, onLoad, onLoadError) {
+        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);
+        script.onload = onLoad;
+        script.onerror = onLoadError;
+    }
     _initCybersource(cardNumber, mid, isTest, regional) {
-        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);
+        return new rxjs_1.Observable(observer => {
+            this._loadCardinalScript(isTest, () => {
+                observer.next();
+                observer.complete();
+            }, () => observer.error(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E018)));
+        }).pipe(operators_1.switchMap(() => this._gateway.cybersourceJwt(mid, isTest, regional)), operators_1.map((jwtResponse) => {
+            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) {
-        return rxjs_1.of(1).pipe(operators_1.switchMap(() => this._gateway.cybersourceJwt(mid, isTest, regional, subscriptionId)), operators_1.map((jwtResponse) => {
-            const bin = Buffer.from(jwtResponse.identifier, "base64").toString("ascii");
-            this._initializeCardinal(isTest, jwtResponse.jwt, bin);
+        return new rxjs_1.Observable(observer => {
+            this._loadCardinalScript(isTest, () => {
+                observer.next();
+                observer.complete();
+            }, () => observer.error(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E018)));
+        }).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(jwtResponse.jwt, bin);
             return jwtResponse.jwt;
         }));
     }
     // istanbul ignore next
     _completeCardinal(secureServiceId, mid, isTest, regional, callback) {
-        return window.Cardinal.on("payments.validated", () => __awaiter(this, void 0, void 0, function* () {
+        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: "",
             };
             const secure = this._gateway.requestSecureServiceValidation(mid, otp_request, isTest, regional);
             return secure.subscribe({
+                complete: () => {
+                    window.Cardinal.off(this._paymentSetupCompleteEvent);
+                    window.Cardinal.off(this._paymentValidatedEvent);
+                },
                 error: (err) => Kushki_1.Kushki.callbackError(err, callback),
                 next: (response) => {
                     callback({
@@ -382,18 +381,6 @@ let CardService = CardService_1 = class CardService {
             });
         }));
     }
-    static _initCardinal(jwt, cardNumber) {
-        window.Cardinal.setup("init", {
-            jwt,
-            order: {
-                Consumer: {
-                    Account: {
-                        AccountNumber: cardNumber,
-                    },
-                },
-            },
-        });
-    }
     static _ccaCardinal(tokenResponse) {
         window.Cardinal.continue("cca", {
             AcsUrl: tokenResponse.security.acsURL,
@@ -431,7 +418,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 = {
@@ -450,9 +437,9 @@ let CardService = CardService_1 = class CardService {
     _getUserId(subscriptionId, mid, testEnv, regional, userId) {
         return rxjs_1.of(1).pipe(operators_1.switchMap(() => rxjs_1.iif(() => UtilsService_1.UtilsService.sIsEmpty(userId), this._gateway.getUserId(subscriptionId, mid, testEnv, regional), rxjs_1.of(undefined))), operators_1.catchError(() => rxjs_1.of(undefined)));
     }
-    _requestSubscriptionTokenGateway(body, mid, testEnv, regional, callback, authorization) {
+    _requestSubscriptionTokenGateway(body, mid, testEnv, regional, callback) {
         this._gateway
-            .requestSubscriptionToken(body, mid, testEnv, regional, authorization)
+            .requestSubscriptionToken(body, mid, testEnv, regional)
             .subscribe({
             error: (err) => Kushki_1.Kushki.callbackError(err, callback),
             next: (response) => {
@@ -468,12 +455,16 @@ let CardService = CardService_1 = class CardService {
             },
         });
     }
+    _isInvalidSpecificationVersion(body, sandboxEnabled) {
+        const is_invalid_version = body.security.specificationVersion !== undefined &&
+            body.security.specificationVersion.startsWith("1.");
+        return is_invalid_version && !sandboxEnabled;
+    }
 };
 CardService = CardService_1 = __decorate([
     inversify_1.injectable(),
     __param(0, inversify_1.inject(Identifiers_1.IDENTIFIERS.KushkiGateway)),
-    __param(1, inversify_1.inject(Identifiers_1.IDENTIFIERS.AuthService)),
-    __param(2, inversify_1.inject(Identifiers_1.IDENTIFIERS.AntiFraud)),
-    __metadata("design:paramtypes", [Object, Object, Object])
+    __param(1, inversify_1.inject(Identifiers_1.IDENTIFIERS.AntiFraud)),
+    __metadata("design:paramtypes", [Object, Object])
 ], CardService);
 exports.CardService = CardService;