@tap-payments/auth-jsconnect 2.6.83-test → 2.6.86-test

package/build/api/account.d.ts

@@ -11,6 +11,7 @@ export declare type CreateAccountBody = {
 export declare type ExpressCreateAccountBody = {
     post_url: string;
     lead_id: string;
+    platforms?: string[];
 };
 declare const accountService: {
     createAccount: (data: CreateAccountBody) => Promise<any>;

package/build/api/entity.d.ts

@@ -116,6 +116,7 @@ export declare type RemoveEntityActivity = {
 };
 export declare type MerchantListBody = {
     business_entity_id: string;
+    brand_id: string;
     create_if_not_present: boolean;
     platforms?: Array<string>;
 };

package/build/app/settings.js

@@ -53,7 +53,7 @@ import i18n from '../i18n';
 import { updateLocale } from '../utils/locale';
 import API, { getAxiosHeaders, setAxiosGlobalHeaders } from '../api';
 export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, _a, appConfig, language, _b, client, device, os, disableLocale, maturity, disableCountries, configToken, onVerifyConfigTokenSuccess, _c, visitorId, locale, configInfo, matureData, lang, initPayload, _d, country_list, ip_info, merchant, operator, config, list, _e, ip, latitude, longitude, country_code, domain, language_1, country, scope, public_key, maturity_1, board_maturity, post, platform_redirect_url, data, lead_id, platforms, deviceInfo, isValidOperator, countries, countryCode, businessCountry, ipCountry;
+    var settings, _a, appConfig, language, _b, client, device, os, disableLocale, maturity, disableCountries, configToken, onVerifyConfigTokenSuccess, _c, visitorId, locale, configInfo, matureData, lang, initPayload, _d, country_list, ip_info, merchant, operator, config, list, _e, ip, latitude, longitude, country_code, domain, language_1, country, scope, public_key, mature, board_maturity, post, platform_redirect_url, data, lead_id, platforms, deviceInfo, isValidOperator, countries, countryCode, businessCountry, ipCountry;
     return __generator(this, function (_f) {
         switch (_f.label) {
             case 0:
@@ -81,10 +81,10 @@ export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', funct
                 list = (country_list || { list: [] }).list;
                 _e = ip_info || {}, ip = _e.ip, latitude = _e.latitude, longitude = _e.longitude, country_code = _e.country_code;
                 if (config) {
-                    domain = config.domain, language_1 = config.language, country = config.country, scope = config.scope, public_key = config.public_key, maturity_1 = config.maturity, board_maturity = config.board_maturity, post = config.post, platform_redirect_url = config.platform_redirect_url, data = config.data, lead_id = config.lead_id, platforms = config.platforms;
+                    domain = config.domain, language_1 = config.language, country = config.country, scope = config.scope, public_key = config.public_key, mature = config.maturity, board_maturity = config.board_maturity, post = config.post, platform_redirect_url = config.platform_redirect_url, data = config.data, lead_id = config.lead_id, platforms = config.platforms;
                     configInfo = __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, configInfo), (domain && { merchantDomain: domain })), (language_1 && { language: language_1 })), (country && { businessCountryCode: country })), (scope && { scope: scope })), (public_key && { publicKey: public_key })), ((post === null || post === void 0 ? void 0 : post.url) && { postURL: post === null || post === void 0 ? void 0 : post.url })), (platform_redirect_url && { redirectUrl: platform_redirect_url })), (data && { data: data })), (lead_id && { leadId: lead_id })), (platforms && { platforms: platforms }));
-                    if (typeof maturity_1 === 'boolean')
-                        matureData = maturity_1 ? 'full' : 'express';
+                    if (typeof mature === 'boolean')
+                        matureData = mature ? 'full' : 'express';
                     thunkApi.dispatch(handleSetAppConfig(configInfo));
                     thunkApi.dispatch(handleLanguage(language_1 || lang));
                     if (public_key) {
@@ -96,7 +96,7 @@ export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', funct
                     if (typeof board_maturity === 'boolean')
                         thunkApi.dispatch(handelBoardMaturity(board_maturity));
                     onVerifyConfigTokenSuccess === null || onVerifyConfigTokenSuccess === void 0 ? void 0 : onVerifyConfigTokenSuccess(config);
-                    if (matureData === 'express' && maturity_1 !== matureData && typeof configInfo.onMaturityChanged === 'function') {
+                    if (matureData === 'express' && maturity !== matureData && typeof configInfo.onMaturityChanged === 'function') {
                         configInfo.onMaturityChanged(matureData);
                     }
                 }

package/build/features/app/auth/authStore.d.ts

@@ -35,7 +35,10 @@ export declare const checkAccountAvailability: import("@reduxjs/toolkit").AsyncT
     brandList: any;
     entityList: any;
 }, void, {}>;
-export declare const getMerchantList: import("@reduxjs/toolkit").AsyncThunk<any, string, {}>;
+export declare const getMerchantList: import("@reduxjs/toolkit").AsyncThunk<any, {
+    entityId: string;
+    brandId: string;
+}, {}>;
 export declare const confirmInfo: import("@reduxjs/toolkit").AsyncThunk<void, AuthenticationListFormValues & {
     authId?: string | undefined;
 }, {}>;

package/build/features/app/auth/authStore.js

@@ -437,14 +437,15 @@ export var checkAccountAvailability = createAsyncThunk('auth/checkAccountAvailab
         }
     });
 }); });
-export var getMerchantList = createAsyncThunk('auth/getMerchantList', function (entityId, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+export var getMerchantList = createAsyncThunk('auth/getMerchantList', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var settings, payload, merchants;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 settings = thunkApi.getState().settings;
                 payload = {
-                    business_entity_id: entityId,
+                    business_entity_id: params.entityId,
+                    brand_id: params.brandId,
                     create_if_not_present: true,
                     platforms: settings.data.appConfig.platforms
                 };

package/build/features/app/connectExpress/connectExpressStore.d.ts

@@ -24,7 +24,10 @@ export declare const retrieveAuthenticationListAsync: import("@reduxjs/toolkit")
 }, {
     individualId: string;
 }, {}>;
-export declare const getMerchantListAsync: import("@reduxjs/toolkit").AsyncThunk<any, string, {}>;
+export declare const getMerchantListAsync: import("@reduxjs/toolkit").AsyncThunk<any, {
+    entityId: string;
+    brandId: string;
+}, {}>;
 export declare const createMobileAuthAsync: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: MobileFormValues;

package/build/features/app/connectExpress/connectExpressStore.js

@@ -213,14 +213,15 @@ export var retrieveAuthenticationListAsync = createAsyncThunk('connectExpress/re
         });
     });
 });
-export var getMerchantListAsync = createAsyncThunk('connectExpress/getMerchantListAsync', function (entityId, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+export var getMerchantListAsync = createAsyncThunk('connectExpress/getMerchantListAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var settings, payload, merchants;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 settings = thunkApi.getState().settings;
                 payload = {
-                    business_entity_id: entityId,
+                    business_entity_id: params.entityId,
+                    brand_id: params.brandId,
                     create_if_not_present: true,
                     platforms: settings.data.appConfig.platforms
                 };
@@ -859,7 +860,8 @@ export var createAccountAsync = createAsyncThunk('connectExpress/createAccountAs
                 _c = settings.data.appConfig, postURL = _c.postURL, scope = _c.scope;
                 body = {
                     lead_id: responseData === null || responseData === void 0 ? void 0 : responseData.leadData.id,
-                    post_url: scope === SCOPE_AUTH ? '' : postURL || ''
+                    post_url: scope === SCOPE_AUTH ? '' : postURL || '',
+                    platforms: settings.data.appConfig.platforms
                 };
                 return [4, API.accountService.expressCreateAccount(body)];
             case 1:

package/build/features/auth/screens/AuthenticationList/MerchantList.js

@@ -53,6 +53,7 @@ var MerchantList = React.forwardRef(function (_a, ref) {
     var merchantList = (data.responseData || {}).merchantList;
     var merchantInfoControl = useController({ control: control, name: 'merchantInfo' });
     var entityInfo = watch('entityInfo');
+    var brandInfo = watch('brandInfo');
     var merchantValue = merchantInfoControl.field.value;
     var error = (_b = merchantInfoControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     React.useEffect(function () {
@@ -62,24 +63,26 @@ var MerchantList = React.forwardRef(function (_a, ref) {
         }
     }, [merchantList]);
     React.useEffect(function () {
-        var _a;
+        var _a, _b;
         if (!entityInfo)
             return;
         if (merchantLoading)
             return;
+        var brandInfoId = brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.id;
         var entityId = (merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) > 0 ? (_a = merchantList[0]) === null || _a === void 0 ? void 0 : _a.business_entity_id : '';
+        var brandId = (merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) > 0 ? (_b = merchantList[0]) === null || _b === void 0 ? void 0 : _b.brand_id : '';
         var id = (entityInfo || {}).id;
         if (!id)
             return;
-        if (entityId && id && entityId !== id) {
+        if ((entityId && id && entityId !== id) || (brandId && brandInfoId && brandId !== brandInfoId)) {
             setValue('merchantInfo', undefined);
-            dispatch(getMerchantList(id));
+            dispatch(getMerchantList({ entityId: id, brandId: brandInfoId }));
             return;
         }
         if (!(merchantList === null || merchantList === void 0 ? void 0 : merchantList.length)) {
-            dispatch(getMerchantList(id));
+            dispatch(getMerchantList({ entityId: id, brandId: brandInfoId }));
         }
-    }, [entityInfo, merchantList]);
+    }, [entityInfo, merchantList, brandInfo]);
     var onOpenMerchantSelect = function (event) {
         if (readOnly)
             return;

package/build/features/connectExpress/screens/AuthenticationList/MerchantList.js

@@ -53,6 +53,7 @@ var MerchantList = React.forwardRef(function (_a, ref) {
     var merchantList = (((_b = data.responseData) === null || _b === void 0 ? void 0 : _b.authenticationData) || {}).merchantList;
     var merchantInfoControl = useController({ control: control, name: 'merchantInfo' });
     var entityInfo = watch('entityInfo');
+    var brandInfo = watch('brandInfo');
     var merchantValue = merchantInfoControl.field.value;
     var error = (_c = merchantInfoControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
     React.useEffect(function () {
@@ -62,24 +63,26 @@ var MerchantList = React.forwardRef(function (_a, ref) {
         }
     }, [merchantList]);
     React.useEffect(function () {
-        var _a;
+        var _a, _b;
         if (!entityInfo)
             return;
         if (merchantLoading)
             return;
+        var brandInfoId = brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.id;
         var entityId = (merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) > 0 ? (_a = merchantList[0]) === null || _a === void 0 ? void 0 : _a.business_entity_id : '';
+        var brandId = (merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) > 0 ? (_b = merchantList[0]) === null || _b === void 0 ? void 0 : _b.brand_id : '';
         var id = (entityInfo || {}).id;
         if (!id)
             return;
-        if (entityId && id && entityId !== id) {
+        if ((entityId && id && entityId !== id) || (brandId && brandInfoId && brandId !== brandInfoId)) {
             setValue('merchantInfo', undefined);
-            dispatch(getMerchantListAsync(id));
+            dispatch(getMerchantListAsync({ entityId: id, brandId: brandInfoId }));
             return;
         }
         if (!(merchantList === null || merchantList === void 0 ? void 0 : merchantList.length)) {
-            dispatch(getMerchantListAsync(id));
+            dispatch(getMerchantListAsync({ entityId: id, brandId: brandInfoId }));
         }
-    }, [entityInfo, merchantList]);
+    }, [entityInfo, merchantList, brandInfo]);
     var onOpenMerchantSelect = function (event) {
         if (readOnly)
             return;

package/build/utils/validation.js

@@ -44,7 +44,7 @@ export var keepLettersAndSpace = function (str) {
     return str.replace(/[^a-zA-Z] /g, '');
 };
 export var isConnectTapDomain = function (domain) {
-    var regex = /^(https:\/\/)?connect(\.\w+)?\.tap\.company\//;
+    var regex = /^(https:\/\/)?connect(\.\w+)?\.tap\.company$/;
     return regex.test(domain);
 };
 export var isTapDomain = function (domain) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.6.83-test",
+	"version": "2.6.86-test",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",