@tap-payments/auth-jsconnect 2.6.3-test → 2.6.5-test

package/build/@types/app.d.ts

@@ -216,6 +216,10 @@ export interface LibConfig extends LibCallbacks {
     appInfo: AppInfo;
     businessCountryCode: string;
     scope: string;
+    postURL?: string;
+    redirectUrl?: string;
+    data?: Array<string>;
+    authId?: string;
     boardMaturity?: boolean;
 }
 export interface OSDetails {

package/build/app/settings.d.ts

@@ -9,6 +9,7 @@ interface SettingParams {
     onVerifyConfigTokenSuccess?: (data: ConfigExpressTokenParams) => Promise<void>;
 }
 export declare const fetchAppSettingsSync: import("@reduxjs/toolkit").AsyncThunk<any, SettingParams, {}>;
+export declare const onCloseComplete: import("@reduxjs/toolkit").AsyncThunk<void, string, {}>;
 export interface SettingsData {
     skin: ThemeMode;
     language: LanguageMode;
@@ -27,8 +28,11 @@ export interface SettingsData {
     isHijri: boolean;
 }
 export interface SettingsState extends SharedState<SettingsData> {
+    internalLoading: boolean;
 }
 export declare const settingsSlice: import("@reduxjs/toolkit").Slice<SettingsState, {
+    storeAuthId: (state: import("immer/dist/internal").WritableDraft<SettingsState>, action: ActionState<string>) => void;
+    updateInternalLoading: (state: import("immer/dist/internal").WritableDraft<SettingsState>, action: ActionState<boolean>) => void;
     handelBoardMaturity: (state: import("immer/dist/internal").WritableDraft<SettingsState>, action: ActionState<boolean>) => void;
     handleIsTapOrigin: (state: import("immer/dist/internal").WritableDraft<SettingsState>, action: ActionState<boolean>) => void;
     handleOpen: (state: import("immer/dist/internal").WritableDraft<SettingsState>, action: ActionState<boolean>) => void;
@@ -43,7 +47,7 @@ export declare const settingsSlice: import("@reduxjs/toolkit").Slice<SettingsSta
     handleSetAppConfig: (state: SettingsState, action: ActionState<LibConfig>) => void;
     handleSetCountryByIso2: (state: SettingsState, action: ActionState<string>) => void;
 }, "settings">;
-export declare const handleSkin: import("@reduxjs/toolkit").ActionCreatorWithPayload<ThemeMode, string>, handleLanguage: import("@reduxjs/toolkit").ActionCreatorWithPayload<LanguageMode, string>, handleActiveFlowScreens: import("@reduxjs/toolkit").ActionCreatorWithPayload<ScreenStepNavigation[], string>, handleNextScreenStep: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<string | undefined, string>, handlePrevScreenStep: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<string | undefined, string>, handleCurrentActiveScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, handleSetAppConfig: import("@reduxjs/toolkit").ActionCreatorWithPayload<LibConfig, string>, handleOpen: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, handleSetCountryByIso2: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, handleIsTapOrigin: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, handelBoardMaturity: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, handlePublicKey: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, handleSwitchCalender: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>;
+export declare const storeAuthId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, updateInternalLoading: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, handleSkin: import("@reduxjs/toolkit").ActionCreatorWithPayload<ThemeMode, string>, handleLanguage: import("@reduxjs/toolkit").ActionCreatorWithPayload<LanguageMode, string>, handleActiveFlowScreens: import("@reduxjs/toolkit").ActionCreatorWithPayload<ScreenStepNavigation[], string>, handleNextScreenStep: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<string | undefined, string>, handlePrevScreenStep: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<string | undefined, string>, handleCurrentActiveScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, handleSetAppConfig: import("@reduxjs/toolkit").ActionCreatorWithPayload<LibConfig, string>, handleOpen: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, handleSetCountryByIso2: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, handleIsTapOrigin: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, handelBoardMaturity: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, handlePublicKey: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, handleSwitchCalender: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>;
 declare const _default: import("redux").Reducer<SettingsState, import("redux").AnyAction>;
 export default _default;
 export declare const settingsSelector: (state: RootState) => SettingsState;

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, domain, language_1, country, scope, public_key, maturity_1, board_maturity, deviceInfo, isValidOperator, countries, countryCode, isKWOrSA, businessCountry;
+    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, domain, language_1, country, scope, public_key, maturity_1, board_maturity, post, platform_redirect_url, data, deviceInfo, isValidOperator, countries, countryCode, isKWOrSA, businessCountry;
     return __generator(this, function (_f) {
         switch (_f.label) {
             case 0:
@@ -81,8 +81,8 @@ export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', funct
                 list = (country_list || { list: [] }).list;
                 _e = ip_info || {}, ip = _e.ip, latitude = _e.latitude, longitude = _e.longitude;
                 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;
-                    configInfo = __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 }));
+                    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;
+                    configInfo = __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 }));
                     if (typeof maturity_1 === 'boolean')
                         matureData = maturity_1 ? 'full' : 'express';
                     thunkApi.dispatch(handleSetAppConfig(configInfo));
@@ -145,9 +145,39 @@ export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', funct
         }
     });
 }); });
+export var onCloseComplete = createAsyncThunk('settings/onCloseComplete', function (merchantId, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var settings, _a, postURL, redirectUrl, authId, bi, list, id, body, data, urlQueryStart;
+    var _b, _c, _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
+            case 0:
+                settings = thunkApi.getState().settings;
+                _a = settings.data.appConfig, postURL = _a.postURL, redirectUrl = _a.redirectUrl, authId = _a.authId;
+                bi = settings.data.deviceInfo.browser.browser_id;
+                return [4, API.entityService.getTerminalListUsingMerchantId(merchantId)];
+            case 1:
+                list = (_f.sent()).list;
+                id = ((_c = (_b = list === null || list === void 0 ? void 0 : list[0]) === null || _b === void 0 ? void 0 : _b.operator) === null || _c === void 0 ? void 0 : _c.id) || '';
+                body = {
+                    id: id,
+                    post_url: postURL || ''
+                };
+                return [4, API.operatorService.updateOperator(body)];
+            case 2:
+                data = _f.sent();
+                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, data);
+                if (authId && redirectUrl) {
+                    urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
+                    window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
+                }
+                return [2];
+        }
+    });
+}); });
 var initialState = {
     error: null,
     loading: true,
+    internalLoading: true,
     data: {
         boardMaturity: true,
         open: true,
@@ -169,6 +199,12 @@ export var settingsSlice = createSlice({
     name: 'settings',
     initialState: initialState,
     reducers: {
+        storeAuthId: function (state, action) {
+            state.data.appConfig.authId = action.payload;
+        },
+        updateInternalLoading: function (state, action) {
+            state.internalLoading = action.payload;
+        },
         handelBoardMaturity: function (state, action) {
             state.data.boardMaturity = action.payload;
         },
@@ -279,6 +315,7 @@ export var settingsSlice = createSlice({
     extraReducers: function (builder) {
         builder.addCase(fetchAppSettingsSync.pending, function (state) {
             state.loading = true;
+            state.internalLoading = false;
             state.error = null;
         });
         builder.addCase(fetchAppSettingsSync.fulfilled, function (state, action) {
@@ -293,15 +330,17 @@ export var settingsSlice = createSlice({
             if (locale)
                 updateLocale(locale, businessCountry.iso2);
             state.loading = false;
+            state.internalLoading = false;
             if (state.data.appConfig.onReady)
                 state.data.appConfig.onReady();
         });
         builder.addCase(fetchAppSettingsSync.rejected, function (state, action) {
             state.loading = false;
+            state.internalLoading = false;
             state.error = action.error.message;
         });
     }
 });
-export var handleSkin = (_a = settingsSlice.actions, _a.handleSkin), handleLanguage = _a.handleLanguage, handleActiveFlowScreens = _a.handleActiveFlowScreens, handleNextScreenStep = _a.handleNextScreenStep, handlePrevScreenStep = _a.handlePrevScreenStep, handleCurrentActiveScreen = _a.handleCurrentActiveScreen, handleSetAppConfig = _a.handleSetAppConfig, handleOpen = _a.handleOpen, handleSetCountryByIso2 = _a.handleSetCountryByIso2, handleIsTapOrigin = _a.handleIsTapOrigin, handelBoardMaturity = _a.handelBoardMaturity, handlePublicKey = _a.handlePublicKey, handleSwitchCalender = _a.handleSwitchCalender;
+export var storeAuthId = (_a = settingsSlice.actions, _a.storeAuthId), updateInternalLoading = _a.updateInternalLoading, handleSkin = _a.handleSkin, handleLanguage = _a.handleLanguage, handleActiveFlowScreens = _a.handleActiveFlowScreens, handleNextScreenStep = _a.handleNextScreenStep, handlePrevScreenStep = _a.handlePrevScreenStep, handleCurrentActiveScreen = _a.handleCurrentActiveScreen, handleSetAppConfig = _a.handleSetAppConfig, handleOpen = _a.handleOpen, handleSetCountryByIso2 = _a.handleSetCountryByIso2, handleIsTapOrigin = _a.handleIsTapOrigin, handelBoardMaturity = _a.handelBoardMaturity, handlePublicKey = _a.handlePublicKey, handleSwitchCalender = _a.handleSwitchCalender;
 export default settingsSlice.reducer;
 export var settingsSelector = function (state) { return state.settings; };

package/build/features/app/bank/bankStore.d.ts

@@ -50,6 +50,7 @@ export declare const updateBoardSuccess: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: void;
 } | undefined, void, {}>;
+export declare const onCloseCompleteBank: import("@reduxjs/toolkit").AsyncThunk<void, void, {}>;
 declare type VerifyData = {
     token: string;
 };

package/build/features/app/bank/bankStore.js

@@ -49,7 +49,7 @@ var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { DocumentPurpose, FlowsTypes } from '../../../@types';
-import { handleCurrentActiveScreen, handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2 } from '../../../app/settings';
+import { handleCurrentActiveScreen, handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../../app/settings';
 import { BANK_STEP_NAMES } from '../../../constants';
 import { hasNoneEditableValue, isStringHasOneAsterisk, retrieveIndividualData, sleep } from '../../../utils';
 export var verifyLeadToken = createAsyncThunk('bankVerifyLeadToken', function (_a, thunkApi) {
@@ -310,6 +310,21 @@ export var updateBoardSuccess = createAsyncThunk('updateBoardBankSuccess', funct
         }
     });
 }); });
+export var onCloseCompleteBank = createAsyncThunk('bank/onCloseCompleteBank', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var bank, id;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                bank = thunkApi.getState().bank;
+                id = (((_a = bank.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant) || {}).id;
+                return [4, thunkApi.dispatch(onCloseComplete(id))];
+            case 1:
+                _b.sent();
+                return [2];
+        }
+    });
+}); });
 var initialState = {
     error: null,
     loading: false,
@@ -495,6 +510,18 @@ export var bankSlice = createSlice({
             if (action.error.message === 'Aborted')
                 return;
             state.error = action.error.message;
+        })
+            .addCase(onCloseCompleteBank.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(onCloseCompleteBank.fulfilled, function (state) {
+            state.loading = false;
+            state.error = null;
+        })
+            .addCase(onCloseCompleteBank.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         });
     }
 });

package/build/features/app/brand/brandStore.d.ts

@@ -94,6 +94,7 @@ export declare const updateBoardSuccess: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: void;
 } | undefined, void, {}>;
+export declare const onCloseCompleteBrand: import("@reduxjs/toolkit").AsyncThunk<void, void, {}>;
 declare type VerifyData = {
     token: string;
 };

package/build/features/app/brand/brandStore.js

@@ -60,7 +60,7 @@ var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
-import { handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2 } from '../../../app/settings';
+import { handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../../app/settings';
 import { BRAND_STEP_NAMES } from '../../../constants';
 import { hasNoneEditableValue, isKW, isTwitter, isWebsite, mapSalesChannel, retrieveIndividualData, sleep } from '../../../utils';
 export var verifyLeadToken = createAsyncThunk('brandVerifyLeadToken', function (_a, thunkApi) {
@@ -549,6 +549,21 @@ export var updateBoardSuccess = createAsyncThunk('updateBoardBrandSuccess', func
         }
     });
 }); });
+export var onCloseCompleteBrand = createAsyncThunk('brand/onCloseCompleteBrand', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var brand, id;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                brand = thunkApi.getState().brand;
+                id = (((_a = brand.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant) || {}).id;
+                return [4, thunkApi.dispatch(onCloseComplete(id))];
+            case 1:
+                _b.sent();
+                return [2];
+        }
+    });
+}); });
 var initialState = {
     error: null,
     loading: false,
@@ -844,6 +859,18 @@ export var brandSlice = createSlice({
             .addCase(updateBoardSuccess.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(onCloseCompleteBrand.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(onCloseCompleteBrand.fulfilled, function (state) {
+            state.loading = false;
+            state.error = null;
+        })
+            .addCase(onCloseCompleteBrand.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         });
     }
 });

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

@@ -108,7 +108,6 @@ interface ResponseData {
 export interface ConnectExpressData {
     isLeadIdPassed: boolean;
     showBoard: boolean;
-    postURL: string;
     mobileData: MobileFormValues;
     nidData: NIDFormValues;
     civilIdData: CivilFormValues;
@@ -119,8 +118,6 @@ export interface ConnectExpressData {
     leadId?: string;
     individualData: IndividualFormValues;
     businessData: BusinessDataFormValues;
-    redirectUrl: string;
-    authData: Array<string>;
     authenticationData: AuthenticationListFormValues;
 }
 export interface ConnectExpressState extends SharedState<ConnectExpressData & ResponseData> {
@@ -131,8 +128,6 @@ export interface ConnectExpressState extends SharedState<ConnectExpressData & Re
 export declare const connectSlice: import("@reduxjs/toolkit").Slice<ConnectExpressState, {
     setLeadId(state: ConnectExpressState, action: ActionState<string>): void;
     setShowBoard(state: ConnectExpressState, action: ActionState<boolean>): void;
-    setRedirectUrl: (state: ConnectExpressState, action: ActionState<string>) => void;
-    setAuthData: (state: ConnectExpressState, action: ActionState<Array<string>>) => void;
     setIsLeadIdPassed: (state: ConnectExpressState, action: ActionState<boolean>) => void;
     clearError: (state: ConnectExpressState) => void;
     setError(state: ConnectExpressState, action: ActionState<string>): void;
@@ -141,11 +136,10 @@ export declare const connectSlice: import("@reduxjs/toolkit").Slice<ConnectExpre
     resetNIDScreen: (state: ConnectExpressState) => void;
     resetCivilScreen: (state: ConnectExpressState) => void;
     resetOTPValue: (state: ConnectExpressState) => void;
-    setPostUrl: (state: ConnectExpressState, action: ActionState<string>) => void;
     resetStore: (state: ConnectExpressState) => void;
     resetIndividualScreen: (state: ConnectExpressState) => void;
 }, "connectExpress/store">;
-export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setIsLeadIdPassed: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetMobileScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, resetOTPValue: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetNIDScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetCivilScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetStore: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setError: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setPostUrl: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setRedirectUrl: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setAuthData: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], string>, setLeadId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setShowBoard: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetIndividualScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setIsLeadIdPassed: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetMobileScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, resetOTPValue: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetNIDScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetCivilScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetStore: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setError: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setLeadId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setShowBoard: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetIndividualScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
 declare const _default: import("redux").Reducer<ConnectExpressState, import("redux").AnyAction>;
 export default _default;
 export declare const connectExpressSelector: (state: RootState) => ConnectExpressState;

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

@@ -56,7 +56,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { handleNextScreenStep, handleCurrentActiveScreen, handleOpen, handleSetCountryByIso2 } from '../../../app/settings';
+import { handleNextScreenStep, handleCurrentActiveScreen, handleOpen, handleSetCountryByIso2, onCloseComplete, storeAuthId } from '../../../app/settings';
 import { FlowsTypes, AuthForType, BusinessType, LicenseType } from '../../../@types';
 import API from '../../../api';
 import { CONNECT_EXPRESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_FL_LICENSE, SCOPE_AUTH } from '../../../constants';
@@ -367,20 +367,20 @@ export var createCivilIdAuthAsync = createAsyncThunk('connectExpress/createCivil
     });
 }); });
 export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileOtpAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, _b, responseData, leadId, isLeadIdPassed, mobileData, _c, auth_token, device_token, service_name, isScopeAuthentication, redirectUrl, bi, isDataHasOperator, payload, data, authId, urlQueryStart, _d, brandList, entityList, isSaudi, next;
-    var _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _a, settings, connectExpress, _b, responseData, leadId, isLeadIdPassed, mobileData, _c, auth_token, device_token, service_name, _d, scope, redirectUrl, authData, isScopeAuthentication, bi, isDataHasOperator, payload, data, authId, urlQueryStart, _e, brandList, entityList, isSaudi, next;
+    var _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
                 _b = connectExpress.data || {}, responseData = _b.responseData, leadId = _b.leadId, isLeadIdPassed = _b.isLeadIdPassed, mobileData = _b.mobileData;
                 if (!(responseData === null || responseData === void 0 ? void 0 : responseData.authData))
                     throw new Error('Auth data is missing');
                 _c = responseData.authData, auth_token = _c.auth_token, device_token = _c.device_token, service_name = _c.service_name;
-                isScopeAuthentication = settings.data.appConfig.scope === SCOPE_AUTH;
-                redirectUrl = connectExpress.data.redirectUrl;
+                _d = settings.data.appConfig, scope = _d.scope, redirectUrl = _d.redirectUrl, authData = _d.data;
+                isScopeAuthentication = scope === SCOPE_AUTH;
                 bi = settings.data.deviceInfo.browser.browser_id;
-                isDataHasOperator = connectExpress.data.authData.includes('operator');
+                isDataHasOperator = authData === null || authData === void 0 ? void 0 : authData.includes('operator');
                 payload = {
                     auth_token: auth_token,
                     lead_id: leadId,
@@ -395,9 +395,10 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
                 };
                 return [4, API.authService.verifyExpressAuth(payload)];
             case 1:
-                data = _g.sent();
-                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
+                data = _h.sent();
+                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
                 authId = data.auth.id;
+                thunkApi.dispatch(storeAuthId(authId));
                 if (isScopeAuthentication && redirectUrl && !data.new_user && !isDataHasOperator && authId) {
                     urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
                     window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
@@ -406,15 +407,15 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
                 if (!(isScopeAuthentication && redirectUrl && !data.new_user && isDataHasOperator)) return [3, 3];
                 return [4, thunkApi.dispatch(retrieveAuthenticationListAsync({ individualId: data.individual_id })).unwrap()];
             case 2:
-                _d = _g.sent(), brandList = _d.brandList, entityList = _d.entityList;
+                _e = _h.sent(), brandList = _e.brandList, entityList = _e.entityList;
                 if (brandList.length && entityList.length) {
                     sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_AUTHENTICATION_LIST_STEP')); });
                     return [2, data];
                 }
-                _g.label = 3;
+                _h.label = 3;
             case 3: return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead_id)).unwrap()];
             case 4:
-                _g.sent();
+                _h.sent();
                 isSaudi = isSA(settings.data.businessCountry.iso2);
                 next = isSaudi ? 'CONNECT_EXPRESS_NID_MISSED_STEP' : 'CONNECT_EXPRESS_CIVIL_ID_MISSED_STEP';
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep(next)); });
@@ -423,20 +424,20 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
     });
 }); });
 export var verifyNIDOtpAsync = createAsyncThunk('connectExpress/verifyNIDOtpAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, _b, responseData, leadId, isLeadIdPassed, nidData, _c, auth_token, device_token, service_name, isScopeAuthentication, redirectUrl, bi, isDataHasOperator, payload, data, authId, urlQueryStart, _d, brandList, entityList, stepName, needToCollectMoreInfo, creatingAccount;
-    var _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _a, settings, connectExpress, _b, responseData, leadId, isLeadIdPassed, nidData, _c, auth_token, device_token, service_name, _d, scope, redirectUrl, authData, isScopeAuthentication, bi, isDataHasOperator, payload, data, authId, urlQueryStart, _e, brandList, entityList, stepName, needToCollectMoreInfo, creatingAccount;
+    var _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
                 _b = connectExpress.data || {}, responseData = _b.responseData, leadId = _b.leadId, isLeadIdPassed = _b.isLeadIdPassed, nidData = _b.nidData;
                 if (!(responseData === null || responseData === void 0 ? void 0 : responseData.authData))
                     throw new Error('Auth data is missing');
                 _c = responseData.authData, auth_token = _c.auth_token, device_token = _c.device_token, service_name = _c.service_name;
-                isScopeAuthentication = settings.data.appConfig.scope === SCOPE_AUTH;
-                redirectUrl = connectExpress.data.redirectUrl;
+                _d = settings.data.appConfig, scope = _d.scope, redirectUrl = _d.redirectUrl, authData = _d.data;
+                isScopeAuthentication = scope === SCOPE_AUTH;
                 bi = settings.data.deviceInfo.browser.browser_id;
-                isDataHasOperator = connectExpress.data.authData.includes('operator');
+                isDataHasOperator = authData === null || authData === void 0 ? void 0 : authData.includes('operator');
                 payload = {
                     auth_token: auth_token,
                     lead_id: leadId,
@@ -451,9 +452,10 @@ export var verifyNIDOtpAsync = createAsyncThunk('connectExpress/verifyNIDOtpAsyn
                 };
                 return [4, API.authService.verifyExpressAuth(payload)];
             case 1:
-                data = _g.sent();
-                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
+                data = _h.sent();
+                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
                 authId = data.auth.id;
+                thunkApi.dispatch(storeAuthId(authId));
                 if (isScopeAuthentication && redirectUrl && !data.new_user && !isDataHasOperator && authId) {
                     urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
                     window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
@@ -462,15 +464,15 @@ export var verifyNIDOtpAsync = createAsyncThunk('connectExpress/verifyNIDOtpAsyn
                 if (!(isScopeAuthentication && redirectUrl && !data.new_user && isDataHasOperator)) return [3, 3];
                 return [4, thunkApi.dispatch(retrieveAuthenticationListAsync({ individualId: data.individual_id })).unwrap()];
             case 2:
-                _d = _g.sent(), brandList = _d.brandList, entityList = _d.entityList;
+                _e = _h.sent(), brandList = _e.brandList, entityList = _e.entityList;
                 if (brandList.length && entityList.length) {
                     sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_AUTHENTICATION_LIST_STEP')); });
                     return [2, data];
                 }
-                _g.label = 3;
+                _h.label = 3;
             case 3: return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
             case 4:
-                _g.sent();
+                _h.sent();
                 stepName = data.step_name;
                 needToCollectMoreInfo = stepName === 'collect_info';
                 creatingAccount = stepName === 'create_account';
@@ -704,16 +706,16 @@ export var checkBrandNameAvailabilityAsync = createAsyncThunk('connectExpress/ch
     });
 });
 export var createAccountAsync = createAsyncThunk('connectExpress/createAccountAsync', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, connectExpress, settings, _b, postURL, responseData, showBoard, body, data, _c, boardInfo, boardData;
+    var _a, connectExpress, settings, _b, responseData, showBoard, body, data, _c, boardInfo, boardData;
     var _d, _e, _f, _g, _h, _j;
     return __generator(this, function (_k) {
         switch (_k.label) {
             case 0:
                 _a = thunkApi.getState(), connectExpress = _a.connectExpress, settings = _a.settings;
-                _b = connectExpress.data, postURL = _b.postURL, responseData = _b.responseData, showBoard = _b.showBoard;
+                _b = connectExpress.data, responseData = _b.responseData, showBoard = _b.showBoard;
                 body = {
                     lead_id: responseData === null || responseData === void 0 ? void 0 : responseData.leadData.id,
-                    post_url: postURL
+                    post_url: settings.data.appConfig.postURL || ''
                 };
                 return [4, API.accountService.expressCreateAccount(body)];
             case 1:
@@ -821,25 +823,25 @@ export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDat
 export var updateOperatorInfoAsync = createAsyncThunk('connectExpress/updateOperatorInfoAsync', function (_a, thunkApi) {
     var terminalInfo = _a.terminalInfo;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, connectExpress, settings, _c, postURL, responseData, redirectUrl, bi, body, data, authId, urlQueryStart;
+        var _b, connectExpress, settings, responseData, _c, postURL, redirectUrl, bi, body, data, authId, urlQueryStart;
         var _d, _e, _f, _g, _h;
         return __generator(this, function (_j) {
             switch (_j.label) {
                 case 0:
                     _b = thunkApi.getState(), connectExpress = _b.connectExpress, settings = _b.settings;
-                    _c = connectExpress.data, postURL = _c.postURL, responseData = _c.responseData;
-                    redirectUrl = connectExpress.data.redirectUrl;
+                    responseData = connectExpress.data.responseData;
+                    _c = settings.data.appConfig, postURL = _c.postURL, redirectUrl = _c.redirectUrl;
                     bi = settings.data.deviceInfo.browser.browser_id;
                     body = {
                         id: ((_d = terminalInfo === null || terminalInfo === void 0 ? void 0 : terminalInfo.operator) === null || _d === void 0 ? void 0 : _d.id) || '',
-                        post_url: postURL
+                        post_url: postURL || ''
                     };
                     return [4, API.operatorService.updateOperator(body)];
                 case 1:
                     data = _j.sent();
                     (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, data);
                     authId = (_h = (_g = responseData === null || responseData === void 0 ? void 0 : responseData.authData) === null || _g === void 0 ? void 0 : _g.auth) === null || _h === void 0 ? void 0 : _h.id;
-                    if (authId) {
+                    if (authId && redirectUrl) {
                         urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
                         window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
                     }
@@ -849,33 +851,16 @@ export var updateOperatorInfoAsync = createAsyncThunk('connectExpress/updateOper
     });
 });
 export var onCloseCompleteAsync = createAsyncThunk('connectExpress/onCloseCompleteAsync', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, connectExpress, settings, _b, postURL, responseData, redirectUrl, bi, merchant, list, id, body, data, authId, urlQueryStart;
-    var _c, _d, _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var connectExpress, id;
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
-                _a = thunkApi.getState(), connectExpress = _a.connectExpress, settings = _a.settings;
-                _b = connectExpress.data, postURL = _b.postURL, responseData = _b.responseData;
-                redirectUrl = connectExpress.data.redirectUrl;
-                bi = settings.data.deviceInfo.browser.browser_id;
-                merchant = ((responseData === null || responseData === void 0 ? void 0 : responseData.boardData) || {}).merchant;
-                return [4, thunkApi.dispatch(getTerminalListAsync(merchant === null || merchant === void 0 ? void 0 : merchant.id)).unwrap()];
+                connectExpress = thunkApi.getState().connectExpress;
+                id = (((_b = (_a = connectExpress.data.responseData) === null || _a === void 0 ? void 0 : _a.boardData) === null || _b === void 0 ? void 0 : _b.merchant) || {}).id;
+                return [4, thunkApi.dispatch(onCloseComplete(id))];
             case 1:
-                list = _j.sent();
-                id = ((_d = (_c = list === null || list === void 0 ? void 0 : list[0]) === null || _c === void 0 ? void 0 : _c.operator) === null || _d === void 0 ? void 0 : _d.id) || '';
-                body = {
-                    id: id,
-                    post_url: postURL
-                };
-                return [4, API.operatorService.updateOperator(body)];
-            case 2:
-                data = _j.sent();
-                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, data);
-                authId = (_h = (_g = responseData === null || responseData === void 0 ? void 0 : responseData.authData) === null || _g === void 0 ? void 0 : _g.auth) === null || _h === void 0 ? void 0 : _h.id;
-                if (authId) {
-                    urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
-                    window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
-                }
+                _c.sent();
                 return [2];
         }
     });
@@ -889,9 +874,6 @@ var initialState = {
     data: {
         showBoard: true,
         isLeadIdPassed: false,
-        postURL: '',
-        redirectUrl: '',
-        authData: [],
         flowName: FlowsTypes.CONNECT_EXPRESS,
         mobileData: {
             countryCode: defaultCountry,
@@ -939,12 +921,6 @@ export var connectSlice = createSlice({
         setShowBoard: function (state, action) {
             state.data.showBoard = action.payload;
         },
-        setRedirectUrl: function (state, action) {
-            state.data.redirectUrl = action.payload;
-        },
-        setAuthData: function (state, action) {
-            state.data.authData = action.payload;
-        },
         setIsLeadIdPassed: function (state, action) {
             state.data.isLeadIdPassed = action.payload;
         },
@@ -969,9 +945,6 @@ export var connectSlice = createSlice({
         resetOTPValue: function (state) {
             state.data.otpData.otp = '';
         },
-        setPostUrl: function (state, action) {
-            state.data.postURL = action.payload;
-        },
         resetStore: function (state) {
             state.data = __assign(__assign({}, state.data), { responseData: undefined });
         },
@@ -1391,6 +1364,6 @@ export var connectSlice = createSlice({
         });
     }
 });
-export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, setIsLeadIdPassed = _a.setIsLeadIdPassed, resetMobileScreen = _a.resetMobileScreen, resetOTPValue = _a.resetOTPValue, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, resetStore = _a.resetStore, setError = _a.setError, setPostUrl = _a.setPostUrl, setRedirectUrl = _a.setRedirectUrl, setAuthData = _a.setAuthData, setLeadId = _a.setLeadId, setShowBoard = _a.setShowBoard, resetIndividualScreen = _a.resetIndividualScreen;
+export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, setIsLeadIdPassed = _a.setIsLeadIdPassed, resetMobileScreen = _a.resetMobileScreen, resetOTPValue = _a.resetOTPValue, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, resetStore = _a.resetStore, setError = _a.setError, setLeadId = _a.setLeadId, setShowBoard = _a.setShowBoard, resetIndividualScreen = _a.resetIndividualScreen;
 export default connectSlice.reducer;
 export var connectExpressSelector = function (state) { return state.connectExpress; };

package/build/features/app/entity/entityStore.d.ts

@@ -61,6 +61,7 @@ export declare const updateBoardSuccess: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: void;
 } | undefined, void, {}>;
+export declare const onCloseCompleteEntity: import("@reduxjs/toolkit").AsyncThunk<void, void, {}>;
 declare type VerifyData = {
     token: string;
 };

package/build/features/app/entity/entityStore.js

@@ -60,7 +60,7 @@ var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { BusinessType, DocumentPurpose, FlowsTypes, LicenseType } from '../../../@types';
-import { handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2 } from '../../../app/settings';
+import { handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../../app/settings';
 import { ENTITY_STEP_NAMES } from '../../../constants';
 import moment from 'moment';
 import { convertNumbers2English, getRecentDocumentBasedOnPurpose, hasVerifiedValue, hasNoneEditableValue, sleep, formatNumberAsCurrency, removeAllCharsFromNumber, retrieveIndividualData } from '../../../utils';
@@ -452,6 +452,21 @@ export var updateBoardSuccess = createAsyncThunk('updateBoardEntitySuccess', fun
         }
     });
 }); });
+export var onCloseCompleteEntity = createAsyncThunk('entity/onCloseCompleteEntity', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var entity, id;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                entity = thunkApi.getState().entity;
+                id = (((_a = entity.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant) || {}).id;
+                return [4, thunkApi.dispatch(onCloseComplete(id))];
+            case 1:
+                _b.sent();
+                return [2];
+        }
+    });
+}); });
 var initialState = {
     error: null,
     loading: false,
@@ -739,6 +754,18 @@ export var entitySlice = createSlice({
             .addCase(updateBoardSuccess.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(onCloseCompleteEntity.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(onCloseCompleteEntity.fulfilled, function (state) {
+            state.loading = false;
+            state.error = null;
+        })
+            .addCase(onCloseCompleteEntity.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         });
     }
 });