@kushki/js 1.30.1-alpha-3ds-setup-complete.1 → 1.30.1-alpha-3ds-setup-complete.2

package/lib/Kushki.js

@@ -138,7 +138,7 @@ var Kushki = /** @class */ (function () {
         this._resolve(this._mobileProcessorService.requestToken(body, this._merchantId, this._inTestEnvironment, this._regional), callback);
     };
     Kushki.prototype.requestCardDynamicToken = function (bin, body, callback) {
-        this._resolve(this._cardDynamicService.requestCardDynamicToken(bin, body, this._merchantId, this._inTestEnvironment, this._regional), callback);
+        this._cardDynamicService.requestCardDynamicToken(bin, body, this._merchantId, this._inTestEnvironment, this._regional, callback);
     };
     Kushki.prototype.requestCardSubscriptionDynamicToken = function (bin, body, callback) {
         this._resolve(this._cardSubscriptionDynamicService.requestCardSubscriptionDynamicToken(bin, body, this._merchantId, this._inTestEnvironment, this._regional), callback);

package/lib/repository/ICardDynamicService.d.ts

@@ -2,12 +2,11 @@
 /**
  * ICardDynamicService
  */
-import { Observable } from "rxjs";
 import { BinBody } from "./../../lib/types/bin_body";
 import { CardAsyncTokenRequest } from "./../../lib/types/card_async_token_request";
-import { CardAsyncTokenResponse } from "./../../lib/types/card_async_token_response";
+import { ErrorResponse } from "./../../lib/types/error_response";
 import { TokenResponse } from "./../../lib/types/remote/token_response";
 import { TokenRequest } from "./../../lib/types/token_request";
 export interface ICardDynamicService {
-    requestCardDynamicToken(bin: BinBody, body: CardAsyncTokenRequest | TokenRequest, mid: string, testEnv: boolean, regional: boolean): Observable<CardAsyncTokenResponse | TokenResponse>;
+    requestCardDynamicToken(bin: BinBody, body: CardAsyncTokenRequest | TokenRequest, mid: string, testEnv: boolean, regional: boolean, callback: (value: TokenResponse | ErrorResponse) => void): void;
 }

package/lib/service/CardDynamicService.d.ts

@@ -2,10 +2,9 @@
 import { ICardAsyncService } from "./../../lib/repository/ICardAsyncService";
 import { ICardDynamicService } from "./../../lib/repository/ICardDynamicService";
 import { ICardService } from "./../../lib/repository/ICardService";
-import { Observable } from "rxjs";
 import { BinBody } from "./../../lib/types/bin_body";
 import { CardAsyncTokenRequest } from "./../../lib/types/card_async_token_request";
-import { CardAsyncTokenResponse } from "./../../lib/types/card_async_token_response";
+import { ErrorResponse } from "./../../lib/types/error_response";
 import { TokenResponse } from "./../../lib/types/remote/token_response";
 import { TokenRequest } from "./../../lib/types/token_request";
 /**
@@ -15,6 +14,7 @@ export declare class CardDynamicService implements ICardDynamicService {
     private readonly _cardService;
     private readonly _cardAsyncService;
     constructor(cardService: ICardService, cardAsyncService: ICardAsyncService);
-    requestCardDynamicToken(bin: BinBody, body: CardAsyncTokenRequest | TokenRequest, mid: string, testEnv: boolean, regional: boolean): Observable<CardAsyncTokenResponse | TokenResponse>;
+    requestCardDynamicToken(bin: BinBody, body: CardAsyncTokenRequest | TokenRequest, mid: string, testEnv: boolean, regional: boolean, callback: (value: TokenResponse | ErrorResponse) => void): void;
     private _requestCardAsyncToken;
+    private _requestToken;
 }

package/lib/service/CardDynamicService.js

@@ -21,6 +21,7 @@ var BinCardTypeEnum_1 = require("./../../lib/infrastructure/BinCardTypeEnum");
 var inversify_1 = require("inversify");
 var rxjs_1 = require("rxjs");
 var operators_1 = require("rxjs/operators");
+var Kushki_1 = require("./../../lib/Kushki");
 /**
  * Implementation
  */
@@ -29,21 +30,41 @@ var CardDynamicService = /** @class */ (function () {
         this._cardService = cardService;
         this._cardAsyncService = cardAsyncService;
     }
-    CardDynamicService.prototype.requestCardDynamicToken = function (bin, body, mid, testEnv, regional) {
+    CardDynamicService.prototype.requestCardDynamicToken = function (bin, body, mid, testEnv, regional, callback) {
         var _this = this;
-        return rxjs_1.of(1).pipe(operators_1.concatMap(function () {
+        rxjs_1.of(1)
+            .pipe(operators_1.concatMap(function () {
             return _this._cardService.requestBinInfo(bin, mid, testEnv, regional);
-        }), operators_1.concatMap(function (binInfo) {
-            return rxjs_1.iif(function () { return binInfo.cardType === BinCardTypeEnum_1.BinCardTypeEnum.debit; }, _this._requestCardAsyncToken(body, mid, testEnv, regional), rxjs_1.of({
-                token: "12345"
-            }));
-        }));
+        }))
+            .subscribe({
+            error: function (err) {
+                return Kushki_1.Kushki.callbackError(err, callback);
+            },
+            next: function (binInfo) {
+                if (binInfo.cardType === BinCardTypeEnum_1.BinCardTypeEnum.debit)
+                    _this._requestCardAsyncToken(body, mid, testEnv, regional, callback);
+                else
+                    _this._requestToken(body, mid, testEnv, regional, callback);
+            }
+        });
     };
-    CardDynamicService.prototype._requestCardAsyncToken = function (body, mid, testEnv, regional) {
+    CardDynamicService.prototype._requestCardAsyncToken = function (body, mid, testEnv, regional, callback) {
         var _this = this;
-        return rxjs_1.of(1).pipe(operators_1.mergeMap(function () {
+        rxjs_1.of(1)
+            .pipe(operators_1.mergeMap(function () {
             return _this._cardAsyncService.requestCardAsyncToken(body, mid, testEnv, regional);
-        }));
+        }))
+            .subscribe({
+            error: function (err) {
+                return Kushki_1.Kushki.callbackError(err, callback);
+            },
+            next: function (token) {
+                callback(token);
+            }
+        });
+    };
+    CardDynamicService.prototype._requestToken = function (body, mid, testEnv, regional, callback) {
+        this._cardService.requestToken(body, mid, testEnv, regional, callback);
     };
     CardDynamicService = __decorate([
         inversify_1.injectable(),

package/lib/service/CardService.d.ts

@@ -49,6 +49,7 @@ export declare class CardService implements ICardService {
     requestSecureInit(request: SecureInitRequest, mid: string, isTest: boolean, regional: boolean): Observable<SecureInitResponse>;
     private _requestToken;
     private _request3DSToken;
+    private _setupCompleteCardinal;
     private _requestTokenGateway;
     private _getMerchantSettings;
     private _validateParameters;

package/lib/service/CardService.js

@@ -1,4 +1,5 @@
 "use strict";
+// tslint:disable:no-identical-functions
 /**
  * Card Service file
  */
@@ -111,8 +112,8 @@ var CardService = /** @class */ (function () {
                 return Kushki_1.Kushki.callbackError(err, callback);
             },
             next: function (_a) {
-                var final_request = _a[0], authorization = _a[1];
-                if (final_request.jwt)
+                var final_request = _a[0], authorization = _a[1], merchant = _a[2];
+                if (final_request.jwt && !merchant.sandboxEnable)
                     _this._request3DSToken(final_request, mid, isTest, regional, callback, authorization);
                 else
                     _this._requestTokenGateway(final_request, mid, isTest, regional, callback, authorization);
@@ -230,9 +231,10 @@ var CardService = /** @class */ (function () {
                 _this._getCybersourceJwt(merchant, mid, isTest, regional, Object.prototype.hasOwnProperty.call(request, "card")
                     ? request.card.number
                     : undefined),
+                rxjs_1.of(merchant),
             ]);
         }), operators_1.mergeMap(function (_a) {
-            var sift_object = _a[0], jwt = _a[1];
+            var sift_object = _a[0], jwt = _a[1], merchant = _a[2];
             request.isDeferred =
                 request.isDeferred === undefined ? false : request.isDeferred;
             if (Boolean(request.cvv))
@@ -246,14 +248,27 @@ var CardService = /** @class */ (function () {
                 request.walletId
                     ? _this._authService.getAuthorizationToken()
                     : rxjs_1.of(undefined),
+                rxjs_1.of(merchant),
             ]);
         }));
     };
-    CardService.prototype._request3DSToken = function (body, mid, testEnv, regional, callback, authorization) {
+    CardService.prototype._request3DSToken = function (body, mid, isTest, regional, callback, authorization) {
+        var _this = this;
+        if (isTest)
+            Promise.resolve().then(function () { return require("./../../lib/libs/cardinal/staging"); }).then(function () {
+                _this._setupCompleteCardinal(body, mid, isTest, regional, callback, authorization);
+            });
+        else
+            Promise.resolve().then(function () { return require("./../../lib/libs/cardinal/prod"); }).then(function () {
+                _this._setupCompleteCardinal(body, mid, isTest, regional, callback, authorization);
+            });
+    };
+    CardService.prototype._setupCompleteCardinal = function (body, mid, isTest, regional, callback, authorization) {
         var _this = this;
-        return window.Cardinal.on("payments.setupComplete", function () { return __awaiter(_this, void 0, void 0, function () {
+        window.Cardinal.on("payments.setupComplete", function () { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this._requestTokenGateway(body, mid, testEnv, regional, callback, authorization)];
+                this._requestTokenGateway(body, mid, isTest, regional, callback, authorization);
+                return [2 /*return*/];
             });
         }); });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kushki/js",
-  "version": "1.30.1-alpha-3ds-setup-complete.1",
+  "version": "1.30.1-alpha-3ds-setup-complete.2",
   "description": "kushki-js",
   "main": "lib/lib.js",
   "types": "lib/lib.d.ts",