@kushki/js 1.31.0 → 1.31.3

package/lib/gateway/KushkiGateway.d.ts

@@ -10,6 +10,7 @@ import { CashTokenRequest } from "./../../lib/types/cash_token_request";
 import { DeferredOptionsResponse } from "./../../lib/types/deferred_options_response";
 import { DeletePaymentMethodRequest } from "./../../lib/types/delete_payment_method_request";
 import { GetUserId } from "./../../lib/types/get_user_id";
+import { JwtResponse } from "./../../lib/types/jwt_response";
 import { KushkiSubscriptionTokensRequest } from "./../../lib/types/kushki_subscription_tokens_request";
 import { KushkiTokensRequest } from "./../../lib/types/kushki_tokens_request";
 import { MerchantSettingsResponse } from "./../../lib/types/merchant_settings_response";
@@ -73,7 +74,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): Observable<string>;
+    cybersourceJwt(mid: string, testEnv: boolean, regional: boolean, subscriptionId?: string): Observable<JwtResponse>;
     getUserId(subscriptionId: string, mid: string, testEnv: boolean, regional: boolean): Observable<GetUserId>;
     private _assignChannel;
     private _buildHeader;

package/lib/gateway/KushkiGateway.js

@@ -248,11 +248,13 @@ 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) {
+    KushkiGateway.prototype.cybersourceJwt = function (mid, testEnv, regional, subscriptionId) {
         var _this = this;
         return rxjs_1.of(1).pipe(operators_1.concatMap(function () {
-            return _this.requestGet(PathEnum_1.PathEnum.cybersource_jwt, testEnv, regional, mid);
-        }), operators_1.map(function (response) { return response.jwt; }));
+            return _this.requestGet(subscriptionId
+                ? PathEnum_1.PathEnum.cybersource_jwt + "?subscriptionId=" + subscriptionId
+                : PathEnum_1.PathEnum.cybersource_jwt, testEnv, regional, mid);
+        }), operators_1.map(function (response) { return response; }));
     };
     KushkiGateway.prototype.getUserId = function (subscriptionId, mid, testEnv, regional) {
         var _this = this;

package/lib/repository/IKushkiGateway.d.ts

@@ -11,6 +11,7 @@ import { CashTokenRequest } from "./../../lib/types/cash_token_request";
 import { DeferredOptionsResponse } from "./../../lib/types/deferred_options_response";
 import { DeletePaymentMethodRequest } from "./../../lib/types/delete_payment_method_request";
 import { GetUserId } from "./../../lib/types/get_user_id";
+import { JwtResponse } from "./../../lib/types/jwt_response";
 import { KushkiSubscriptionTokensRequest } from "./../../lib/types/kushki_subscription_tokens_request";
 import { KushkiTokensRequest } from "./../../lib/types/kushki_tokens_request";
 import { MerchantSettingsResponse } from "./../../lib/types/merchant_settings_response";
@@ -161,7 +162,7 @@ export interface IKushkiGateway {
      * @param testEnv - is test environment
      * @param regional - Define if endpoint used regional URL
      */
-    cybersourceJwt(mid: string, testEnv: boolean, regional: boolean): Observable<string>;
+    cybersourceJwt(mid: string, testEnv: boolean, regional: boolean, subscriptionId?: string): Observable<JwtResponse>;
     /**
      * Get userId
      * @param subscriptionId subscription id for the request

package/lib/service/CardService.d.ts

@@ -47,6 +47,7 @@ export declare class CardService implements ICardService {
     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 _getCreateSubscriptionDataToTransform;
     private _request3DSToken;
     private _setupCompleteCardinal;
     private _requestTokenGateway;
@@ -61,7 +62,12 @@ 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

@@ -157,9 +157,7 @@ var CardService = /** @class */ (function () {
             _this._setSandboxEnable(!!merchant.sandboxEnable);
             return rxjs_1.forkJoin([
                 _this._getDeviceTokenSiftScienceObject(request, mid, isTest, merchant, regional),
-                _this._getCybersourceJwt(merchant, mid, isTest, regional, Object.prototype.hasOwnProperty.call(request, "cardNumber")
-                    ? request.cardNumber
-                    : undefined),
+                _this._getCybersourceJwtSubscription(merchant, mid, isTest, regional, request.subscriptionId),
             ]);
         }), operators_1.switchMap(function (_a) {
             var sift_science_obj = _a[0], jwt = _a[1];
@@ -183,9 +181,7 @@ var CardService = /** @class */ (function () {
         }), operators_1.concatMap(function (_a) {
             var sift_object = _a[0], jwt = _a[1];
             _this._checkRequestBody(subscriptionTokenRequest);
-            var data_to_transform = __assign({}, subscriptionTokenRequest);
-            if (sift_object.userId === null || sift_object.sessionId === null)
-                data_to_transform.siftObject = __assign({}, sift_object);
+            var data_to_transform = _this._getCreateSubscriptionDataToTransform(sift_object, subscriptionTokenRequest);
             if (jwt !== undefined)
                 data_to_transform.jwt = jwt;
             return rxjs_1.forkJoin([
@@ -243,13 +239,18 @@ 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 merchantSettings[_this._3Dsecure] === true; }, rxjs_1.of(merchantSettings), rxjs_1.throwError(new KushkiError_1.KushkiError(ErrorEnum_1.ERRORS.E013)));
+            return rxjs_1.iif(function () { return _this._is3DSSecureEnabled(merchantSettings); }, 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._getCreateSubscriptionDataToTransform = function (siftObject, subscriptionTokenRequest) {
+        if (siftObject.userId === null || siftObject.sessionId === null)
+            return __assign({}, subscriptionTokenRequest);
+        return __assign(__assign({}, subscriptionTokenRequest), siftObject);
+    };
     CardService.prototype._request3DSToken = function (body, mid, isTest, regional, callback, authorization) {
         var _this = this;
         if (isTest)
@@ -352,24 +353,51 @@ 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 (merchantSettings[_this._3Dsecure] === true &&
+            if (_this._is3DSSecureEnabled(merchantSettings) &&
                 cardNumber !== undefined)
-                return rxjs_1.iif(function () { return !!merchantSettings.sandboxEnable; }, _this._initCybersourceSandbox(mid, isTest, regional), _this._initCybersource(cardNumber, mid, isTest, regional));
+                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.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) {
-            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;
+        return rxjs_1.of(1).pipe(operators_1.switchMap(function () { return _this._gateway.cybersourceJwt(mid, isTest, regional); }), operators_1.map(function (jwtResponse) {
+            _this._initializeCardinal(isTest, jwtResponse.jwt, cardNumber);
+            return jwtResponse.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
@@ -431,9 +459,9 @@ var CardService = /** @class */ (function () {
     };
     CardService.prototype._initCybersourceSandbox = function (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) {
+        return rxjs_1.of(1).pipe(operators_1.switchMap(function () { return _this._gateway.cybersourceJwt(mid, isTest, regional); }), operators_1.map(function (jwtResponse) {
             cardinal_sandbox_js_1.KushkiCardinalSandbox.init();
-            return jwt;
+            return jwtResponse.jwt;
         }));
     };
     CardService.prototype._ccaSandbox = function (body, mid, isTest, regional, callback) {

package/lib/types/jwt_response.d.ts

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

package/lib/types/subscriptionId_request.d.ts

@@ -9,7 +9,6 @@ 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.31.0",
+  "version": "1.31.3",
   "description": "kushki-js",
   "main": "lib/lib.js",
   "types": "lib/lib.d.ts",
@@ -96,7 +96,7 @@
   },
   "dependencies": {
     "@aws-amplify/auth": "4.6.1",
-    "@kushki/cardinal-sandbox-js": "1.0.3",
+    "@kushki/cardinal-sandbox-js": "1.0.4",
     "acorn": "6.4.1",
     "aws-amplify": "4.3.30",
     "axios": "0.21.1",