@xsolla/payment-client-core 0.0.13 → 0.0.14

package/fesm2015/xsolla-payment-client-core.mjs

@@ -432,6 +432,55 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
                     }] }, { type: SettingsService }, { type: SecureApiClient }];
     } });
 
+class UrlService {
+    addSearchParams(url, params = {}) {
+        const urlObject = new URL(url);
+        for (const [key, value] of Object.entries(params)) {
+            urlObject.searchParams.set(key, value);
+        }
+        return urlObject.toString();
+    }
+    getSearchParams(url) {
+        const urlObject = new URL(url);
+        const searchParams = {};
+        for (const [key, value] of urlObject.searchParams) {
+            searchParams[key] = value;
+        }
+        return searchParams;
+    }
+}
+UrlService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: UrlService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+UrlService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: UrlService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: UrlService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
+class PaymentConfigService {
+    constructor(urlService, settingsService) {
+        this.urlService = urlService;
+        this.settingsService = settingsService;
+    }
+    enrich(config) {
+        return Object.assign(Object.assign({}, config), { returnUrl: this.enrichReturnUrl(config.returnUrl) });
+    }
+    enrichReturnUrl(returnUrl) {
+        return this.urlService.addSearchParams(returnUrl, {
+            token: this.settingsService.token,
+        });
+    }
+}
+PaymentConfigService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PaymentConfigService, deps: [{ token: UrlService }, { token: SettingsService }], target: i0.ɵɵFactoryTarget.Injectable });
+PaymentConfigService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PaymentConfigService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PaymentConfigService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: UrlService }, { type: SettingsService }]; } });
+
 var XpsCommand;
 (function (XpsCommand) {
     XpsCommand["form"] = "form";
@@ -1399,6 +1448,98 @@ class StatusUpdatedAction {
     }
 }
 
+var StatusSearchParam;
+(function (StatusSearchParam) {
+    StatusSearchParam["token"] = "token";
+    StatusSearchParam["pid"] = "fix_pid";
+    StatusSearchParam["invoice"] = "fix_invoice";
+    StatusSearchParam["signature"] = "signature";
+    StatusSearchParam["locale"] = "locale";
+    StatusSearchParam["testProject"] = "fix_testProject";
+    StatusSearchParam["testPs"] = "fix_testPs";
+    StatusSearchParam["testXsolla"] = "fix_testXsolla";
+    StatusSearchParam["userReturnStatus"] = "fix_userReturnStatus";
+})(StatusSearchParam || (StatusSearchParam = {}));
+
+const requiredStatusSearchParams = [
+    StatusSearchParam.token,
+    StatusSearchParam.locale,
+    StatusSearchParam.signature,
+    StatusSearchParam.pid,
+    StatusSearchParam.invoice,
+];
+
+const stringConverter = (value) => value;
+const numberConverter = (value) => {
+    const numberValue = Number(value);
+    return isNaN(numberValue) ? 0 : numberValue;
+};
+const statusSearchParamsMap = new Map([
+    [
+        StatusSearchParam.token,
+        {
+            key: 'token',
+            converter: stringConverter,
+        },
+    ],
+    [
+        StatusSearchParam.signature,
+        {
+            key: 'signature',
+            converter: stringConverter,
+        },
+    ],
+    [
+        StatusSearchParam.locale,
+        {
+            key: 'locale',
+            converter: stringConverter,
+        },
+    ],
+    [
+        StatusSearchParam.userReturnStatus,
+        {
+            key: 'userReturnStatus',
+            converter: stringConverter,
+        },
+    ],
+    [
+        StatusSearchParam.pid,
+        {
+            key: 'pid',
+            converter: numberConverter,
+        },
+    ],
+    [
+        StatusSearchParam.invoice,
+        {
+            key: 'invoice',
+            converter: numberConverter,
+        },
+    ],
+    [
+        StatusSearchParam.testProject,
+        {
+            key: 'testProject',
+            converter: numberConverter,
+        },
+    ],
+    [
+        StatusSearchParam.testPs,
+        {
+            key: 'testPs',
+            converter: numberConverter,
+        },
+    ],
+    [
+        StatusSearchParam.testXsolla,
+        {
+            key: 'testXsolla',
+            converter: numberConverter,
+        },
+    ],
+]);
+
 class XpsApiPart {
     constructor() {
         this.response = new BehaviorSubject(null);
@@ -1421,7 +1562,7 @@ class StatusRequest extends XpsApiPartRequest {
     constructor(parameters) {
         super();
         this.xps_fix_command = 'status';
-        if (parameters.token === null) {
+        if (!parameters.token) {
             throw new TokenError();
         }
         this.access_token = parameters.token;
@@ -2556,7 +2697,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
     } });
 
 class StatusService {
-    constructor(statusRequestService, listenStatusService, nextActionService) {
+    constructor(urlService, statusRequestService, listenStatusService, nextActionService) {
+        this.urlService = urlService;
         this.statusRequestService = statusRequestService;
         this.listenStatusService = listenStatusService;
         this.nextActionService = nextActionService;
@@ -2570,6 +2712,27 @@ class StatusService {
             return statusResponse.status;
         });
     }
+    getStatusWithUrlSearchParams(url) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const searchParams = this.getRequestParamsFromUrl(url);
+            if (!searchParams) {
+                throw new Error('No required search params to get status');
+            }
+            return this.getStatus(searchParams);
+        });
+    }
+    getRequestParamsFromUrl(url) {
+        const searchParams = this.urlService.getSearchParams(url !== null && url !== void 0 ? url : '');
+        const keys = new Set(Object.keys(searchParams));
+        if (requiredStatusSearchParams.some((requiredKey) => !keys.has(requiredKey))) {
+            return null;
+        }
+        const params = {};
+        statusSearchParamsMap.forEach((settings, key) => {
+            params[settings.key] = settings.converter(searchParams[key]);
+        });
+        return params;
+    }
     startWaitingStatusUpdates(invoice) {
         this.listenStatusService.listen(invoice);
         this.listenStatusService.statusUpdated$
@@ -2579,14 +2742,14 @@ class StatusService {
         });
     }
 }
-StatusService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: StatusService, deps: [{ token: StatusRequestService }, { token: ListenStatusService }, { token: NextActionService }], target: i0.ɵɵFactoryTarget.Injectable });
+StatusService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: StatusService, deps: [{ token: UrlService }, { token: StatusRequestService }, { token: ListenStatusService }, { token: NextActionService }], target: i0.ɵɵFactoryTarget.Injectable });
 StatusService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: StatusService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: StatusService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: StatusRequestService }, { type: ListenStatusService }, { type: NextActionService }]; } });
+        }], ctorParameters: function () { return [{ type: UrlService }, { type: StatusRequestService }, { type: ListenStatusService }, { type: NextActionService }]; } });
 
 /**
  * default image for purchase item is set on Publisher Account side.
@@ -2956,11 +3119,12 @@ class PaymentService {
                 throw new Error('Should submit form first');
             }
             const params = {
+                pid: this.config.paymentMethodId,
                 invoice: parseInt((_a = this.data.fixInvoice) !== null && _a !== void 0 ? _a : ''),
                 signature: (_b = this.data.signature) !== null && _b !== void 0 ? _b : '',
                 locale: (_d = (_c = this.data.fields.find((field) => field.name === 'locale')) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : 'en',
             };
-            return this.statusService.getStatus(Object.assign(Object.assign({}, params), { pid: this.config.paymentMethodId }));
+            return this.statusService.getStatus(params);
         });
     }
     getFieldConfig(field) {
@@ -3108,16 +3272,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
         }], ctorParameters: function () { return [{ type: SettingsService }, { type: RefundPolicyService }, { type: SecureConnectionService }, { type: DisclaimerService }]; } });
 
 class CoreLibraryService {
-    constructor(settingsService, countryService, paymentMethodsService, savedMethodsService, userBalanceService, paymentService, deviceFingerPrintService, financeDetailsService, legalService, nextActionService) {
+    constructor(settingsService, countryService, paymentMethodsService, savedMethodsService, userBalanceService, paymentConfigService, paymentService, deviceFingerPrintService, financeDetailsService, legalService, statusService, nextActionService) {
         this.settingsService = settingsService;
         this.countryService = countryService;
         this.paymentMethodsService = paymentMethodsService;
         this.savedMethodsService = savedMethodsService;
         this.userBalanceService = userBalanceService;
+        this.paymentConfigService = paymentConfigService;
         this.paymentService = paymentService;
         this.deviceFingerPrintService = deviceFingerPrintService;
         this.financeDetailsService = financeDetailsService;
         this.legalService = legalService;
+        this.statusService = statusService;
         this.nextActionService = nextActionService;
         this.paymentMethods = {
             getList: () => __awaiter(this, void 0, void 0, function* () { return this.paymentMethodsService.getList(); }),
@@ -3132,12 +3298,18 @@ class CoreLibraryService {
             yield this.deviceFingerPrintService.init();
         });
     }
+    getStatus(url) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.statusService.getStatusWithUrlSearchParams(url);
+        });
+    }
     setCountry(country) {
         this.countryService.setCountry(country);
     }
     createPayment(config) {
+        const enrichedConfig = this.paymentConfigService.enrich(config);
         return {
-            initialize: () => __awaiter(this, void 0, void 0, function* () { return this.paymentService.initialize(config); }),
+            initialize: () => __awaiter(this, void 0, void 0, function* () { return this.paymentService.initialize(enrichedConfig); }),
             submit: () => __awaiter(this, void 0, void 0, function* () { return this.paymentService.submit(); }),
             getFields: () => this.paymentService.getFields(),
             validate: (field) => __awaiter(this, void 0, void 0, function* () { return this.paymentService.validate(field); }),
@@ -3160,14 +3332,14 @@ class CoreLibraryService {
         return masksFunctionsMap[sanitizedName];
     }
 }
-CoreLibraryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CoreLibraryService, deps: [{ token: SettingsService }, { token: CountryService }, { token: PaymentMethodsService }, { token: SavedMethodsService }, { token: UserBalanceService }, { token: PaymentService }, { token: DeviceFingerPrintService }, { token: FinanceDetailsService }, { token: LegalService }, { token: NextActionService }], target: i0.ɵɵFactoryTarget.Injectable });
+CoreLibraryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CoreLibraryService, deps: [{ token: SettingsService }, { token: CountryService }, { token: PaymentMethodsService }, { token: SavedMethodsService }, { token: UserBalanceService }, { token: PaymentConfigService }, { token: PaymentService }, { token: DeviceFingerPrintService }, { token: FinanceDetailsService }, { token: LegalService }, { token: StatusService }, { token: NextActionService }], target: i0.ɵɵFactoryTarget.Injectable });
 CoreLibraryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CoreLibraryService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CoreLibraryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: SettingsService }, { type: CountryService }, { type: PaymentMethodsService }, { type: SavedMethodsService }, { type: UserBalanceService }, { type: PaymentService }, { type: DeviceFingerPrintService }, { type: FinanceDetailsService }, { type: LegalService }, { type: NextActionService }]; } });
+        }], ctorParameters: function () { return [{ type: SettingsService }, { type: CountryService }, { type: PaymentMethodsService }, { type: SavedMethodsService }, { type: UserBalanceService }, { type: PaymentConfigService }, { type: PaymentService }, { type: DeviceFingerPrintService }, { type: FinanceDetailsService }, { type: LegalService }, { type: StatusService }, { type: NextActionService }]; } });
 
 class HttpError extends AppError {
     constructor(error, req) {