@kushki/js 1.31.4 → 1.31.5

package/lib/Kushki.js

@@ -55,7 +55,7 @@ var Kushki = /** @class */ (function () {
         this._requestDeviceToken(body, callback);
     };
     Kushki.prototype.requestSubscriptionToken = function (body, callback) {
-        this._resolve(this._cardService.requestSubscriptionToken(body, this._merchantId, this._inTestEnvironment, this._regional), callback);
+        this._cardService.requestSubscriptionToken(body, this._merchantId, this._inTestEnvironment, this._regional, callback);
     };
     Kushki.prototype.requestTransferToken = function (body, callback) {
         this._resolve(this._transferService.requestTransferToken(body, this._merchantId, this._inTestEnvironment, this._regional), callback);
@@ -141,7 +141,7 @@ var Kushki = /** @class */ (function () {
         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);
+        this._cardSubscriptionDynamicService.requestCardSubscriptionDynamicToken(bin, body, this._merchantId, this._inTestEnvironment, this._regional, callback);
     };
     Kushki.prototype.requestInitAuth = function (body, callback) {
         this._resolve(this._authService.requestInitAuth(body, this._inTestEnvironment), callback);
@@ -182,7 +182,7 @@ var Kushki = /** @class */ (function () {
         this._resolve(this._transferService.requestBankList(this._merchantId, this._inTestEnvironment, this._regional), callback);
     };
     Kushki.prototype._requestDeviceToken = function (body, callback) {
-        this._resolve(this._cardService.requestDeviceToken(body, this._merchantId, this._inTestEnvironment, this._regional), callback);
+        this._cardService.requestDeviceToken(body, this._merchantId, this._inTestEnvironment, this._regional, callback);
     };
     Kushki.prototype._resolve = function (observable, callback) {
         observable.subscribe({

package/lib/repository/ICardService.d.ts

@@ -34,8 +34,9 @@ export interface ICardService {
      * @param mid - public merchant id
      * @param isTest - is test environment
      * @param regional - Define if endpoint used regional URL
+     * @param callback
      */
-    requestSubscriptionToken(subscriptionTokenRequest: SubscriptionTokenRequest | SubscriptionTokenKPayRequest, mid: string, isTest: boolean, regional: boolean): Observable<TokenResponse>;
+    requestSubscriptionToken(subscriptionTokenRequest: SubscriptionTokenRequest | SubscriptionTokenKPayRequest, mid: string, isTest: boolean, regional: boolean, callback: (value: TokenResponse | ErrorResponse) => void): void;
     /**
      *  Subscription Token
      * @param binBody - deferred bin request body
@@ -50,8 +51,9 @@ export interface ICardService {
      * @param mid - public merchant id
      * @param isTest - is test environment
      * @param regional - for single IP
+     * @param callback
      */
-    requestDeviceToken(deviceTokenRequest: SubscriptionIdRequest, mid: string, isTest: boolean, regional: boolean): Observable<TokenResponse>;
+    requestDeviceToken(deviceTokenRequest: SubscriptionIdRequest, mid: string, isTest: boolean, regional: boolean, callback: (value: TokenResponse | ErrorResponse) => void): void;
     /**
      *  BinInfo
      * @param binBody - deferred bin request body

package/lib/repository/ICardSubscriptionDynamicService.d.ts

@@ -2,12 +2,12 @@
 /**
  * ICardDynamicService
  */
-import { Observable } from "rxjs";
 import { BinBody } from "./../../lib/types/bin_body";
+import { ErrorResponse } from "./../../lib/types/error_response";
 import { TokenResponse } from "./../../lib/types/remote/token_response";
 import { SubscriptionCardAsyncTokenRequest } from "./../../lib/types/subscription_card_async_token_request";
 import { SubscriptionCardAsyncTokenResponse } from "./../../lib/types/subscription_card_async_token_response";
 import { SubscriptionTokenRequest } from "./../../lib/types/subscription_token_request";
 export interface ICardSubscriptionDynamicService {
-    requestCardSubscriptionDynamicToken(bin: BinBody, body: SubscriptionCardAsyncTokenRequest | SubscriptionTokenRequest, mid: string, testEnv: boolean, regional: boolean): Observable<SubscriptionCardAsyncTokenResponse | TokenResponse>;
+    requestCardSubscriptionDynamicToken(bin: BinBody, body: SubscriptionCardAsyncTokenRequest | SubscriptionTokenRequest, mid: string, testEnv: boolean, regional: boolean, callback: (value: TokenResponse | SubscriptionCardAsyncTokenResponse | ErrorResponse) => void): void;
 }

package/lib/service/CardService.d.ts

@@ -41,8 +41,8 @@ export declare class CardService implements ICardService {
     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;
-    requestDeviceToken(request: SubscriptionIdRequest, mid: string, isTest: boolean, regional: boolean): Observable<TokenResponse>;
-    requestSubscriptionToken(subscriptionTokenRequest: SubscriptionTokenRequest | SubscriptionTokenKPayRequest, mid: string, isTest: boolean, regional: boolean): Observable<TokenResponse>;
+    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;
     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;
@@ -76,4 +76,6 @@ export declare class CardService implements ICardService {
     private _initCybersourceSandbox;
     private _ccaSandbox;
     private _getUserId;
+    private _requestSubscriptionTokenGateway;
+    private _requestDeviceToken;
 }

package/lib/service/CardService.js

@@ -142,44 +142,59 @@ var CardService = /** @class */ (function () {
             next: function (_a) {
                 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);
+                    _this._request3DSToken(isTest, function () {
+                        _this._requestTokenGateway(final_request, mid, isTest, regional, callback, authorization);
+                    });
                 else
                     _this._requestTokenGateway(final_request, mid, isTest, regional, callback, authorization);
             }
         });
     };
-    CardService.prototype.requestDeviceToken = function (request, mid, isTest, regional) {
+    CardService.prototype.requestDeviceToken = function (request, mid, isTest, regional, callback) {
         var _this = this;
-        return rxjs_1.of(1).pipe(operators_1.switchMap(function () {
-            return rxjs_1.forkJoin([_this._gateway.requestMerchantSettings(mid, isTest, regional)]);
-        }), operators_1.switchMap(function (_a) {
-            var merchant = _a[0];
+        this._gateway
+            .requestMerchantSettings(mid, isTest, regional)
+            .pipe(operators_1.switchMap(function (merchant) {
             _this._setSandboxEnable(!!merchant.sandboxEnable);
             return rxjs_1.forkJoin([
                 _this._getDeviceTokenSiftScienceObject(request, mid, isTest, merchant, regional),
                 _this._getCybersourceJwtSubscription(merchant, mid, isTest, regional, request.subscriptionId),
             ]);
-        }), operators_1.switchMap(function (_a) {
-            var sift_science_obj = _a[0], jwt = _a[1];
-            if (sift_science_obj.userId === null)
-                delete sift_science_obj.userId;
-            if (sift_science_obj.sessionId === null)
-                delete sift_science_obj.sessionId;
-            if (jwt)
-                sift_science_obj = __assign(__assign({}, sift_science_obj), { jwt: jwt, amount: request.amount, cardHolderName: request.cardHolderName, currency: request.currency });
-            return _this._gateway.requestDeviceToken(__assign({ subscriptionId: request.subscriptionId }, sift_science_obj), mid, isTest, regional);
-        }));
+        }))
+            .subscribe({
+            error: function (err) {
+                return Kushki_1.Kushki.callbackError(err, callback);
+            },
+            next: function (_a) {
+                var sift_science_obj = _a[0], jwt = _a[1];
+                if (sift_science_obj.userId === null)
+                    delete sift_science_obj.userId;
+                if (sift_science_obj.sessionId === null)
+                    delete sift_science_obj.sessionId;
+                if (jwt) {
+                    sift_science_obj = __assign(__assign({}, sift_science_obj), { jwt: jwt, amount: request.amount, cardHolderName: request.cardHolderName, currency: request.currency });
+                    _this._request3DSToken(isTest, function () {
+                        _this._requestDeviceToken(__assign({ subscriptionId: request.subscriptionId }, sift_science_obj), mid, isTest, regional, callback);
+                    });
+                }
+                else
+                    _this._requestDeviceToken(__assign({ subscriptionId: request.subscriptionId }, sift_science_obj), mid, isTest, regional, callback);
+            }
+        });
     };
-    CardService.prototype.requestSubscriptionToken = function (subscriptionTokenRequest, mid, isTest, regional) {
+    CardService.prototype.requestSubscriptionToken = function (subscriptionTokenRequest, mid, isTest, regional, callback) {
         var _this = this;
-        return this._gateway.requestMerchantSettings(mid, isTest, regional).pipe(operators_1.switchMap(function (merchant) {
+        this._gateway
+            .requestMerchantSettings(mid, isTest, regional)
+            .pipe(operators_1.switchMap(function (merchant) {
             _this._setSandboxEnable(!!merchant.sandboxEnable);
             return rxjs_1.forkJoin([
                 _this._getScienceSession(subscriptionTokenRequest, mid, isTest, merchant),
                 _this._getCybersourceJwt(merchant, mid, isTest, regional, UtilsService_1.UtilsService.sGet(subscriptionTokenRequest, _this._cardNumber)),
+                rxjs_1.of(merchant),
             ]);
-        }), operators_1.concatMap(function (_a) {
-            var sift_object = _a[0], jwt = _a[1];
+        }), operators_1.mergeMap(function (_a) {
+            var sift_object = _a[0], jwt = _a[1], merchant = _a[2];
             _this._checkRequestBody(subscriptionTokenRequest);
             var data_to_transform = _this._getCreateSubscriptionDataToTransform(sift_object, subscriptionTokenRequest);
             if (jwt !== undefined)
@@ -189,11 +204,23 @@ var CardService = /** @class */ (function () {
                 subscriptionTokenRequest.walletId
                     ? _this._authService.getAuthorizationToken()
                     : rxjs_1.of(undefined),
+                rxjs_1.of(merchant),
             ]);
-        }), operators_1.switchMap(function (_a) {
-            var body = _a[0], jwt = _a[1];
-            return _this._gateway.requestSubscriptionToken(body, mid, isTest, regional, jwt);
-        }));
+        }))
+            .subscribe({
+            error: function (err) {
+                return Kushki_1.Kushki.callbackError(err, callback);
+            },
+            next: function (_a) {
+                var body = _a[0], jwt = _a[1], merchant = _a[2];
+                if (body.jwt && !merchant.sandboxEnable)
+                    _this._request3DSToken(isTest, function () {
+                        _this._requestSubscriptionTokenGateway(body, mid, isTest, regional, callback, jwt);
+                    });
+                else
+                    _this._requestSubscriptionTokenGateway(body, mid, isTest, regional, callback, jwt);
+            }
+        });
     };
     CardService.prototype.requestDeferred = function (binBody, mid, isTest, regional) {
         return this._gateway.requestDeferredConditions(mid, binBody.bin, isTest, regional);
@@ -251,23 +278,23 @@ var CardService = /** @class */ (function () {
             return __assign({}, subscriptionTokenRequest);
         return __assign(__assign({}, subscriptionTokenRequest), siftObject);
     };
-    CardService.prototype._request3DSToken = function (body, mid, isTest, regional, callback, authorization) {
+    CardService.prototype._request3DSToken = function (isTest, requestToken) {
         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);
+                _this._setupCompleteCardinal(requestToken);
             });
         else
             Promise.resolve().then(function () { return require("./../../lib/libs/cardinal/prod"); }).then(function () {
-                _this._setupCompleteCardinal(body, mid, isTest, regional, callback, authorization);
+                _this._setupCompleteCardinal(requestToken);
             });
     };
     // istanbul ignore next
-    CardService.prototype._setupCompleteCardinal = function (body, mid, isTest, regional, callback, authorization) {
+    CardService.prototype._setupCompleteCardinal = function (requestToken) {
         var _this = this;
         window.Cardinal.on("payments.setupComplete", function () { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                this._requestTokenGateway(body, mid, isTest, regional, callback, authorization);
+                requestToken();
                 return [2 /*return*/];
             });
         }); });
@@ -504,6 +531,28 @@ var CardService = /** @class */ (function () {
             return rxjs_1.iif(function () { return UtilsService_1.UtilsService.sIsEmpty(userId); }, _this._gateway.getUserId(subscriptionId, mid, testEnv, regional), rxjs_1.of(undefined));
         }), operators_1.catchError(function () { return rxjs_1.of(undefined); }));
     };
+    CardService.prototype._requestSubscriptionTokenGateway = function (body, mid, testEnv, regional, callback, authorization) {
+        this._gateway
+            .requestSubscriptionToken(body, mid, testEnv, regional, authorization)
+            .subscribe({
+            error: function (err) {
+                return Kushki_1.Kushki.callbackError(err, callback);
+            },
+            next: function (response) {
+                callback(response);
+            }
+        });
+    };
+    CardService.prototype._requestDeviceToken = function (body, mid, testEnv, regional, callback) {
+        this._gateway.requestDeviceToken(body, mid, testEnv, regional).subscribe({
+            error: function (err) {
+                return Kushki_1.Kushki.callbackError(err, callback);
+            },
+            next: function (response) {
+                callback(response);
+            }
+        });
+    };
     var CardService_1;
     CardService = CardService_1 = __decorate([
         inversify_1.injectable(),

package/lib/service/CardSubscriptionDynamicService.d.ts

@@ -2,8 +2,8 @@
 import { ICardAsyncService } from "./../../lib/repository/ICardAsyncService";
 import { ICardService } from "./../../lib/repository/ICardService";
 import { ICardSubscriptionDynamicService } from "./../../lib/repository/ICardSubscriptionDynamicService";
-import { Observable } from "rxjs";
 import { BinBody } from "./../../lib/types/bin_body";
+import { ErrorResponse } from "./../../lib/types/error_response";
 import { TokenResponse } from "./../../lib/types/remote/token_response";
 import { SubscriptionCardAsyncTokenRequest } from "./../../lib/types/subscription_card_async_token_request";
 import { SubscriptionCardAsyncTokenResponse } from "./../../lib/types/subscription_card_async_token_response";
@@ -15,7 +15,7 @@ export declare class CardSubscriptionDynamicService implements ICardSubscription
     private readonly _cardServiceSubscription;
     private readonly _cardAsyncServiceSubscription;
     constructor(cardService: ICardService, cardAsyncService: ICardAsyncService);
-    requestCardSubscriptionDynamicToken(bin: BinBody, body: SubscriptionCardAsyncTokenRequest | SubscriptionTokenRequest, mid: string, testEnv: boolean, regional: boolean): Observable<SubscriptionCardAsyncTokenResponse | TokenResponse>;
+    requestCardSubscriptionDynamicToken(bin: BinBody, body: SubscriptionCardAsyncTokenRequest | SubscriptionTokenRequest, mid: string, testEnv: boolean, regional: boolean, callback: (value: TokenResponse | SubscriptionCardAsyncTokenResponse | ErrorResponse) => void): void;
     private _requestCardSubscriptionAsyncToken;
     private _requestCardSubscriptionToken;
 }

package/lib/service/CardSubscriptionDynamicService.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,25 +30,38 @@ var CardSubscriptionDynamicService = /** @class */ (function () {
         this._cardServiceSubscription = cardService;
         this._cardAsyncServiceSubscription = cardAsyncService;
     }
-    CardSubscriptionDynamicService.prototype.requestCardSubscriptionDynamicToken = function (bin, body, mid, testEnv, regional) {
+    CardSubscriptionDynamicService.prototype.requestCardSubscriptionDynamicToken = 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._cardServiceSubscription.requestBinInfo(bin, mid, testEnv, regional);
-        }), operators_1.concatMap(function (binInfo) {
-            return rxjs_1.iif(function () { return binInfo.cardType === BinCardTypeEnum_1.BinCardTypeEnum.debit; }, _this._requestCardSubscriptionAsyncToken(body, mid, testEnv, regional), _this._requestCardSubscriptionToken(body, mid, testEnv, regional));
-        }));
+        }))
+            .subscribe({
+            next: function (binInfo) {
+                if (binInfo.cardType === BinCardTypeEnum_1.BinCardTypeEnum.debit)
+                    _this._requestCardSubscriptionAsyncToken(body, mid, testEnv, regional, callback);
+                else
+                    _this._requestCardSubscriptionToken(body, mid, testEnv, regional, callback);
+            }
+        });
     };
-    CardSubscriptionDynamicService.prototype._requestCardSubscriptionAsyncToken = function (body, mid, testEnv, regional) {
+    CardSubscriptionDynamicService.prototype._requestCardSubscriptionAsyncToken = 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._cardAsyncServiceSubscription.requestCardSubscriptionAsyncToken(body, mid, testEnv, regional);
-        }));
+        }))
+            .subscribe({
+            error: function (err) {
+                return Kushki_1.Kushki.callbackError(err, callback);
+            },
+            next: function (token) {
+                callback(token);
+            }
+        });
     };
-    CardSubscriptionDynamicService.prototype._requestCardSubscriptionToken = function (body, mid, testEnv, regional) {
-        var _this = this;
-        return rxjs_1.of(1).pipe(operators_1.mergeMap(function () {
-            return _this._cardServiceSubscription.requestSubscriptionToken(body, mid, testEnv, regional);
-        }));
+    CardSubscriptionDynamicService.prototype._requestCardSubscriptionToken = function (body, mid, testEnv, regional, callback) {
+        this._cardServiceSubscription.requestSubscriptionToken(body, mid, testEnv, regional, callback);
     };
     CardSubscriptionDynamicService = __decorate([
         inversify_1.injectable(),

package/package.json

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