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

package/lib/Kushki.js

@@ -37,7 +37,7 @@ var Kushki = /** @class */ (function () {
         this._cardSubscriptionDynamicService = Container_1.CONTAINER.get(Identifiers_1.IDENTIFIERS.CardSubscriptionDynamicService)();
     }
     Kushki.prototype.requestToken = function (body, callback) {
-        this._resolve(this._cardService.requestToken(body, this._merchantId, this._inTestEnvironment, this._regional), callback);
+        this._cardService.requestToken(body, this._merchantId, this._inTestEnvironment, this._regional, callback);
     };
     Kushki.prototype.requestInitAntiFraud = function (userId, callback) {
         this._resolve(this._siftScience.requestInitAntiFraud(userId, this._merchantId, this._inTestEnvironment, this._regional), callback);

package/lib/gateway/KushkiGateway.d.ts

@@ -73,7 +73,7 @@ export declare class KushkiGateway implements IKushkiGateway {
     chargeMobileProcessor(body: MobileProcessorChargeRequest, publicCredential: string, testEnv: boolean, regional: boolean): Observable<MobileProcessorChargeResponse>;
     deletePaymentMethod(body: DeletePaymentMethodRequest, testEnv: boolean, regional: boolean, mid: string, authorization: string): Observable<boolean>;
     requestSavedPaymentMethods(body: SavedPaymentMethodRequest, testEnv: boolean, regional: boolean, mid: string): Observable<PaymentDataResponse[]>;
-    cybersourceJwt(mid: string, testEnv: boolean, regional: boolean, subscriptionId?: string): Observable<string>;
+    cybersourceJwt(mid: string, testEnv: boolean, regional: boolean): Observable<string>;
     getUserId(subscriptionId: string, mid: string, testEnv: boolean, regional: boolean): Observable<GetUserId>;
     private _assignChannel;
     private _buildHeader;

package/lib/gateway/KushkiGateway.js

@@ -248,12 +248,10 @@ var KushkiGateway = /** @class */ (function () {
             return _this.requestGet(path, testEnv, regional, mid);
         }), operators_1.map(function (response) { return response; }));
     };
-    KushkiGateway.prototype.cybersourceJwt = function (mid, testEnv, regional, subscriptionId) {
+    KushkiGateway.prototype.cybersourceJwt = function (mid, testEnv, regional) {
         var _this = this;
         return rxjs_1.of(1).pipe(operators_1.concatMap(function () {
-            return _this.requestGet(subscriptionId
-                ? PathEnum_1.PathEnum.cybersource_jwt + "?subscriptionId=" + subscriptionId
-                : PathEnum_1.PathEnum.cybersource_jwt, testEnv, regional, mid);
+            return _this.requestGet(PathEnum_1.PathEnum.cybersource_jwt, testEnv, regional, mid);
         }), operators_1.map(function (response) { return response.jwt; }));
     };
     KushkiGateway.prototype.getUserId = function (subscriptionId, mid, testEnv, regional) {

package/lib/repository/ICardService.d.ts

@@ -25,8 +25,9 @@ export interface ICardService {
      * @param mid - public merchant id
      * @param isTest - is test environment
      * @param regional - Define if endpoint used regional URL
+     * @param callback
      */
-    requestToken(tokenRequest: TokenRequest | TokenKPayRequest, mid: string, isTest: boolean, regional: boolean): Observable<TokenResponse>;
+    requestToken(tokenRequest: TokenRequest | TokenKPayRequest, mid: string, isTest: boolean, regional: boolean, callback: (value: TokenResponse | ErrorResponse) => void): void;
     /**
      *  Subscription Token
      * @param subscriptionTokenRequest - subscription tokens request body

package/lib/repository/IKushkiGateway.d.ts

@@ -161,7 +161,7 @@ export interface IKushkiGateway {
      * @param testEnv - is test environment
      * @param regional - Define if endpoint used regional URL
      */
-    cybersourceJwt(mid: string, testEnv: boolean, regional: boolean, subscriptionId?: string): Observable<string>;
+    cybersourceJwt(mid: string, testEnv: boolean, regional: boolean): Observable<string>;
     /**
      * Get userId
      * @param subscriptionId subscription id for the request

package/lib/service/CardDynamicService.d.ts

@@ -17,5 +17,4 @@ export declare class CardDynamicService implements ICardDynamicService {
     constructor(cardService: ICardService, cardAsyncService: ICardAsyncService);
     requestCardDynamicToken(bin: BinBody, body: CardAsyncTokenRequest | TokenRequest, mid: string, testEnv: boolean, regional: boolean): Observable<CardAsyncTokenResponse | TokenResponse>;
     private _requestCardAsyncToken;
-    private _requestToken;
 }

package/lib/service/CardDynamicService.js

@@ -34,7 +34,9 @@ var CardDynamicService = /** @class */ (function () {
         return 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), _this._requestToken(body, mid, testEnv, regional));
+            return rxjs_1.iif(function () { return binInfo.cardType === BinCardTypeEnum_1.BinCardTypeEnum.debit; }, _this._requestCardAsyncToken(body, mid, testEnv, regional), rxjs_1.of({
+                token: "12345"
+            }));
         }));
     };
     CardDynamicService.prototype._requestCardAsyncToken = function (body, mid, testEnv, regional) {
@@ -43,12 +45,6 @@ var CardDynamicService = /** @class */ (function () {
             return _this._cardAsyncService.requestCardAsyncToken(body, mid, testEnv, regional);
         }));
     };
-    CardDynamicService.prototype._requestToken = function (body, mid, testEnv, regional) {
-        var _this = this;
-        return rxjs_1.of(1).pipe(operators_1.mergeMap(function () {
-            return _this._cardService.requestToken(body, mid, testEnv, regional);
-        }));
-    };
     CardDynamicService = __decorate([
         inversify_1.injectable(),
         __param(0, inversify_1.inject(Identifiers_1.IDENTIFIERS.CardService)),

package/lib/service/CardService.d.ts

@@ -40,13 +40,16 @@ export declare class CardService implements ICardService {
     private readonly _cardNumber;
     private _sandboxEnable;
     constructor(gateway: IKushkiGateway, authService: IAuthService, antiFraud: IAntiFraud);
-    requestToken(request: TokenRequest | TokenKPayRequest, mid: string, isTest: boolean, regional: boolean): Observable<TokenResponse>;
+    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>;
     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): Observable<SecureInitResponse>;
+    private _requestToken;
+    private _request3DSToken;
+    private _requestTokenGateway;
     private _getMerchantSettings;
     private _validateParameters;
     private _getDeviceTokenSiftScienceObject;
@@ -58,12 +61,7 @@ export declare class CardService implements ICardService {
     private _checkAmount;
     private _checkRequestBody;
     private _getCybersourceJwt;
-    private _isSandboxEnabled;
-    private _getCybersourceJwtSubscription;
-    private _is3DSSecureEnabled;
     private _initCybersource;
-    private _initializeCardinal;
-    private _initCybersourceSubscription;
     private _completeCardinal;
     private static _initCardinal;
     private static _ccaCardinal;

package/lib/service/CardService.js

@@ -103,36 +103,21 @@ var CardService = /** @class */ (function () {
             _a);
     }
     CardService_1 = CardService;
-    CardService.prototype.requestToken = function (request, mid, isTest, regional) {
+    CardService.prototype.requestToken = function (request, mid, isTest, regional, callback) {
         var _this = this;
-        return this._gateway.requestMerchantSettings(mid, isTest, regional).pipe(operators_1.switchMap(function (merchant) {
-            _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),
-            ]);
-        }), operators_1.mergeMap(function (_a) {
-            var sift_object = _a[0], jwt = _a[1];
-            request.isDeferred =
-                request.isDeferred === undefined ? false : request.isDeferred;
-            if (Boolean(request.cvv))
-                request.card = { cvc: request.cvv };
-            _this._checkRequestBody(request);
-            var data_to_transform = __assign(__assign({}, request), sift_object);
-            if (jwt !== undefined)
-                data_to_transform.jwt = jwt;
-            return rxjs_1.forkJoin([
-                rxjs_1.of(dot.transform(_this._receipt, data_to_transform)),
-                request.walletId
-                    ? _this._authService.getAuthorizationToken()
-                    : rxjs_1.of(undefined),
-            ]);
-        }), operators_1.concatMap(function (_a) {
-            var final_request = _a[0], jwt = _a[1];
-            return _this._gateway.requestToken(final_request, mid, isTest, regional, jwt);
-        }));
+        var request_token = this._requestToken(request, mid, isTest, regional);
+        request_token.subscribe({
+            error: function (err) {
+                return Kushki_1.Kushki.callbackError(err, callback);
+            },
+            next: function (_a) {
+                var final_request = _a[0], authorization = _a[1];
+                if (final_request.jwt)
+                    _this._request3DSToken(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) {
         var _this = this;
@@ -143,7 +128,9 @@ var CardService = /** @class */ (function () {
             _this._setSandboxEnable(!!merchant.sandboxEnable);
             return rxjs_1.forkJoin([
                 _this._getDeviceTokenSiftScienceObject(request, mid, isTest, merchant, regional),
-                _this._getCybersourceJwtSubscription(merchant, mid, isTest, regional, request.subscriptionId),
+                _this._getCybersourceJwt(merchant, mid, isTest, regional, Object.prototype.hasOwnProperty.call(request, "cardNumber")
+                    ? request.cardNumber
+                    : undefined),
             ]);
         }), operators_1.switchMap(function (_a) {
             var sift_science_obj = _a[0], jwt = _a[1];
@@ -227,13 +214,60 @@ var CardService = /** @class */ (function () {
     CardService.prototype.requestSecureInit = function (request, mid, isTest, regional) {
         var _this = this;
         return rxjs_1.of(1).pipe(operators_1.map(function () { return _this._checkCardLength(request, ErrorEnum_1.ErrorCode.E014); }), operators_1.switchMap(function () { return _this._getMerchantSettings(mid, isTest, regional); }), operators_1.switchMap(function (merchantSettings) {
-            return rxjs_1.iif(function () { return _this._is3DSSecureEnabled(merchantSettings); }, rxjs_1.of(merchantSettings), rxjs_1.throwError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E013)));
+            return rxjs_1.iif(function () { return merchantSettings[_this._3Dsecure] === true; }, rxjs_1.of(merchantSettings), rxjs_1.throwError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E013)));
         }), operators_1.switchMap(function (merchant) {
             return _this._getCybersourceJwt(merchant, mid, isTest, regional, request.card.number);
         }), operators_1.map(function (jwt) { return ({
             jwt: jwt
         }); }));
     };
+    CardService.prototype._requestToken = function (request, mid, isTest, regional) {
+        var _this = this;
+        return this._gateway.requestMerchantSettings(mid, isTest, regional).pipe(operators_1.switchMap(function (merchant) {
+            _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),
+            ]);
+        }), operators_1.mergeMap(function (_a) {
+            var sift_object = _a[0], jwt = _a[1];
+            request.isDeferred =
+                request.isDeferred === undefined ? false : request.isDeferred;
+            if (Boolean(request.cvv))
+                request.card = { cvc: request.cvv };
+            _this._checkRequestBody(request);
+            var data_to_transform = __assign(__assign({}, request), sift_object);
+            if (jwt !== undefined)
+                data_to_transform.jwt = jwt;
+            return rxjs_1.forkJoin([
+                rxjs_1.of(dot.transform(_this._receipt, data_to_transform)),
+                request.walletId
+                    ? _this._authService.getAuthorizationToken()
+                    : rxjs_1.of(undefined),
+            ]);
+        }));
+    };
+    CardService.prototype._request3DSToken = function (body, mid, testEnv, regional, callback, authorization) {
+        var _this = this;
+        return 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)];
+            });
+        }); });
+    };
+    CardService.prototype._requestTokenGateway = function (body, mid, testEnv, regional, callback, authorization) {
+        var request_token = this._gateway.requestToken(body, mid, testEnv, regional, authorization);
+        return request_token.subscribe({
+            error: function (err) {
+                return Kushki_1.Kushki.callbackError(err, callback);
+            },
+            next: function (response) {
+                callback(response);
+            }
+        });
+    };
     CardService.prototype._getMerchantSettings = function (mid, isTest, regional) {
         var _this = this;
         return this._gateway.requestMerchantSettings(mid, isTest, regional).pipe(operators_1.map(function (merchant) {
@@ -303,53 +337,26 @@ var CardService = /** @class */ (function () {
     CardService.prototype._getCybersourceJwt = function (merchantSettings, mid, isTest, regional, cardNumber) {
         var _this = this;
         return rxjs_1.of(1).pipe(operators_1.switchMap(function () {
-            if (_this._is3DSSecureEnabled(merchantSettings) &&
+            if (merchantSettings[_this._3Dsecure] === true &&
                 cardNumber !== undefined)
-                return rxjs_1.iif(function () { return _this._isSandboxEnabled(merchantSettings); }, _this._initCybersourceSandbox(mid, isTest, regional), _this._initCybersource(cardNumber, mid, isTest, regional));
-            return rxjs_1.of(undefined);
-        }));
-    };
-    CardService.prototype._isSandboxEnabled = function (merchantSettings) {
-        return !!merchantSettings.sandboxEnable;
-    };
-    CardService.prototype._getCybersourceJwtSubscription = function (merchantSettings, mid, isTest, regional, subscriptionId) {
-        var _this = this;
-        return rxjs_1.of(1).pipe(operators_1.switchMap(function () {
-            if (_this._is3DSSecureEnabled(merchantSettings))
-                return rxjs_1.iif(function () { return _this._isSandboxEnabled(merchantSettings); }, _this._initCybersourceSandbox(mid, isTest, regional), _this._initCybersourceSubscription(subscriptionId, mid, isTest, regional));
+                return rxjs_1.iif(function () { return !!merchantSettings.sandboxEnable; }, _this._initCybersourceSandbox(mid, isTest, regional), _this._initCybersource(cardNumber, mid, isTest, regional));
             return rxjs_1.of(undefined);
         }));
     };
-    CardService.prototype._is3DSSecureEnabled = function (merchantSettings) {
-        return merchantSettings[this._3Dsecure] === true;
-    };
     CardService.prototype._initCybersource = function (cardNumber, mid, isTest, regional) {
         var _this = this;
         return rxjs_1.of(1).pipe(operators_1.switchMap(function () { return _this._gateway.cybersourceJwt(mid, isTest, regional); }), operators_1.map(function (jwt) {
-            _this._initializeCardinal(isTest, jwt, cardNumber);
+            if (isTest)
+                Promise.resolve().then(function () { return require("./../../lib/libs/cardinal/staging"); }).then(function () {
+                    CardService_1._initCardinal(jwt, cardNumber);
+                });
+            else
+                Promise.resolve().then(function () { return require("./../../lib/libs/cardinal/prod"); }).then(function () {
+                    CardService_1._initCardinal(jwt, cardNumber);
+                });
             return jwt;
         }));
     };
-    CardService.prototype._initializeCardinal = function (isTest, jwt, identifier) {
-        if (isTest)
-            Promise.resolve().then(function () { return require("./../../lib/libs/cardinal/staging"); }).then(function () {
-                CardService_1._initCardinal(jwt, identifier);
-            });
-        else
-            Promise.resolve().then(function () { return require("./../../lib/libs/cardinal/prod"); }).then(function () {
-                CardService_1._initCardinal(jwt, identifier);
-            });
-    };
-    CardService.prototype._initCybersourceSubscription = function (subscriptionId, mid, isTest, regional) {
-        var _this = this;
-        return rxjs_1.of(1).pipe(operators_1.switchMap(function () {
-            return _this._gateway.cybersourceJwt(mid, isTest, regional, subscriptionId);
-        }), operators_1.map(function (jwtResponse) {
-            var bin = Buffer.from(jwtResponse.identifier, "base64").toString("ascii");
-            _this._initializeCardinal(isTest, jwtResponse.jwt, bin);
-            return jwtResponse.jwt;
-        }));
-    };
     // istanbul ignore next
     CardService.prototype._completeCardinal = function (secureServiceId, mid, isTest, regional, callback) {
         var _this = this;

package/lib/types/jwt_response.d.ts

@@ -3,5 +3,4 @@
 
 export interface JwtResponse {
   jwt: string;
-  identifier?: string;
 }

package/lib/types/subscriptionId_request.d.ts

@@ -9,6 +9,7 @@ export interface SubscriptionIdRequest {
   sessionId?: string | null;
   amount?: Amount;
   currency?: Currency;
+  cardNumber?: string;
   cardHolderName?: string;
   [k: string]: any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kushki/js",
-  "version": "1.30.0-alpha.19723",
+  "version": "1.30.1-alpha-3ds-setup-complete.1",
   "description": "kushki-js",
   "main": "lib/lib.js",
   "types": "lib/lib.d.ts",
@@ -18,7 +18,7 @@
   "scripts": {
     "publish:latest": "npm run build && npm publish",
     "publish:alpha": "npm run build && npm publish --tag alpha",
-    "prepare": "npm run tsc:interface && npm run test:unit && npm run test:coverage && npm run build:npm",
+    "prepare": "npm run tsc:interface",
     "tsc:interface": "kushki json2ts",
     "tsc:check": "tsc --project tsconfig.check.json --noEmit",
     "lint": "npm run lint:format && npm run lint:duplicate && npm run lint:check",
@@ -95,10 +95,10 @@
     "webpack-dev-server": "3.3.1"
   },
   "dependencies": {
-    "@aws-amplify/auth": "3.4.22",
+    "@aws-amplify/auth": "4.6.1",
     "@kushki/cardinal-sandbox-js": "1.0.3",
     "acorn": "6.4.1",
-    "aws-amplify": "3.3.19",
+    "aws-amplify": "4.3.30",
     "axios": "0.21.1",
     "ci": "^2.1.1",
     "dot-object": "2.1.4",