@tap-payments/auth-jsconnect 2.11.0-development → 2.11.0

package/build/features/app/business/businessStore.js

@@ -59,7 +59,7 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { BusinessType, FlowsTypes, DocumentPurpose, LicenseType } from '../../../@types';
 import { BUSINESS_STEP_NAMES, COLLECT_DOB_INFO_NAFATH, EXPECTED_SALES_LIST, IDENTIFICATION_TYPE, NAFATH_PACI_TIMEOUT_DURATION, NAFATH_VERIFICATION_FAILED, OTHER_CR_LICENSE, OTHER_ENTITY_LICENSE, OTHER_FL_LICENSE, defaultCountry } from '../../../constants';
-import { convertNumbers2English, hasKey, sleep, isKW, isSA, dateFormat, isOtherLicense, isOtherThanKWOrSA, hasNoneEditableValue, sendCustomEventToGTM, findCountryByIddPrefix, isNetworkError, isTimeoutError } from '../../../utils';
+import { convertNumbers2English, hasKey, sleep, isKW, isSA, dateFormat, isOtherLicense, isOtherThanKWOrSA, hasNoneEditableValue, sendCustomEventToGTM, findCountryByIddPrefix, isNetworkError, isTimeoutError, isAuthenticationVerificationFailed } from '../../../utils';
 import { handleNextScreenStep, handlePublicKey, handleSetCountryByIso2 } from '../../../app/settings';
 export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var payload, data, publicKey, countryIso2, boardData, brandData, isicActivityList, leadData, _a, steps, brand, board_id, business_id, entity, brandID, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted, list, list;
@@ -198,9 +198,9 @@ export var resendOTP = createAsyncThunk('resendOTPBusiness', function (params, t
 }); });
 export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, business, settings, isNID, responseBody, stepName, payload, data, publicKey, brandData, isicActivityList, leadData, brand, country_code, steps, board_id, business_id, entity, brandID, countryIso2, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted, isIdentityAuthStep, boardResponse, list, list;
-    var _b, _c, _d, _e, _f, _g, _h, _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var _b, _c, _d, _e, _f, _g, _h;
+    return __generator(this, function (_j) {
+        switch (_j.label) {
             case 0:
                 _a = thunkApi.getState(), business = _a.business, settings = _a.settings;
                 isNID = business.data.otpData.isNID;
@@ -213,26 +213,28 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                     step_name: stepName,
                     encryption_contract: ['data']
                 };
-                return [4, API.leadService.verifyLeadOTP(payload)];
+                return [4, API.leadService.verifyTokenOTP(payload).catch(function (err) {
+                        if (isAuthenticationVerificationFailed(err === null || err === void 0 ? void 0 : err.message))
+                            thunkApi.dispatch(handleNextScreenStep('BUSINESS_OTP_VERIFY_SECURITY_ERROR_STEP'));
+                        throw new Error(err === null || err === void 0 ? void 0 : err.message);
+                    })];
             case 1:
-                data = (_k.sent()).data;
-                if ((_f = data.errors) === null || _f === void 0 ? void 0 : _f.length)
-                    throw new Error(data.errors[0].description);
-                publicKey = (_g = data === null || data === void 0 ? void 0 : data.config) === null || _g === void 0 ? void 0 : _g.public_key;
+                data = _j.sent();
+                publicKey = (_f = data === null || data === void 0 ? void 0 : data.config) === null || _f === void 0 ? void 0 : _f.public_key;
                 if (publicKey) {
                     thunkApi.dispatch(handlePublicKey(publicKey));
                 }
                 isicActivityList = undefined;
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
-                leadData = (_k.sent()).data;
+                leadData = (_j.sent()).data;
                 thunkApi.dispatch(updateStepName(stepName));
                 brand = leadData.brand, country_code = leadData.country_code, steps = leadData.steps, board_id = leadData.board_id, business_id = leadData.business_id, entity = leadData.entity;
                 brandID = brand === null || brand === void 0 ? void 0 : brand.id;
                 countryIso2 = country_code;
                 if (countryIso2)
                     thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, { otp: params.otp });
+                (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, { otp: params.otp });
                 hasBusinessCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_SUCCESS);
                 hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO) && hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_INFO_CONFIRM);
                 hasBusinessCRActivitiesCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_ACTIVITIES);
@@ -241,14 +243,14 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 if (!(!isIdentityAuthStep && !hasBusinessCRInfoCompleted)) return [3, 4];
                 return [4, thunkApi.dispatch(retrieveAllEntityList({ businessId: business_id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
             case 3:
-                _k.sent();
-                _k.label = 4;
+                _j.sent();
+                _j.label = 4;
             case 4:
                 if (!(isSA(countryIso2) && !isIdentityAuthStep && !hasBusinessCRInfoCompleted)) return [3, 6];
                 return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
             case 5:
-                _k.sent();
-                _k.label = 6;
+                _j.sent();
+                _j.label = 6;
             case 6:
                 if (!isNID) return [3, 7];
                 thunkApi.dispatch(handleNextScreenStep());
@@ -262,12 +264,12 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 if (!board_id) return [3, 11];
                 return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
             case 9:
-                boardResponse = _k.sent();
+                boardResponse = _j.sent();
                 leadData = __assign(__assign({}, leadData), { flows: (boardResponse === null || boardResponse === void 0 ? void 0 : boardResponse.info) || [] });
                 return [4, thunkApi.dispatch(retrieveBoardDetails(board_id))];
             case 10:
-                _k.sent();
-                _k.label = 11;
+                _j.sent();
+                _j.label = 11;
             case 11:
                 sleep(50).then(function () { return thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP')); });
                 return [3, 23];
@@ -287,30 +289,30 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 if (!hasBusinessCRActivitiesCompleted) return [3, 19];
                 return [4, API.dataService.getActivitiesIsIc()];
             case 16:
-                list = (_k.sent()).list;
+                list = (_j.sent()).list;
                 isicActivityList = list || [];
                 return [4, thunkApi.dispatch(retrieveDataList())];
             case 17:
-                _k.sent();
+                _j.sent();
                 return [4, API.brandService.retrieveBrand(brandID)];
             case 18:
-                brandData = _k.sent();
+                brandData = _j.sent();
                 sleep(50).then(function () { return thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP')); });
                 return [3, 23];
             case 19:
                 if (!hasBusinessCRInfoCompleted) return [3, 22];
                 return [4, API.dataService.getActivitiesIsIc()];
             case 20:
-                list = (_k.sent()).list;
+                list = (_j.sent()).list;
                 isicActivityList = list || [];
                 return [4, API.brandService.retrieveBrand(brandID)];
             case 21:
-                brandData = _k.sent();
+                brandData = _j.sent();
                 sleep(50).then(function () { return thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP')); });
                 return [3, 23];
             case 22:
                 sleep(50).then(function () { return thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP')); });
-                _k.label = 23;
+                _j.label = 23;
             case 23: return [2, { data: data, verifyNextStepName: data.step_name, isicActivityList: isicActivityList, formData: __assign(__assign({}, params), { isNID: isNID }), brand: brandData === null || brandData === void 0 ? void 0 : brandData.brand, leadData: leadData }];
         }
     });
@@ -1135,9 +1137,11 @@ export var businessSlice = createSlice({
             var licenseList = [OTHER_CR_LICENSE, OTHER_FL_LICENSE];
             state.data.businessTypeData.responseBody = __assign(__assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activityList: isicActivityList }), (!((_e = (_d = (_c = state.data.businessTypeData) === null || _c === void 0 ? void 0 : _c.responseBody) === null || _d === void 0 ? void 0 : _d.licenseList) === null || _e === void 0 ? void 0 : _e.length) && { licenseList: licenseList }));
         })
-            .addCase(verifyLeadOTP.rejected, function (state, action) {
+            .addCase(verifyLeadOTP.rejected, function (state, _a) {
+            var message = _a.error.message;
             state.loading = false;
-            state.error = action.error.message;
+            if (!isAuthenticationVerificationFailed(message))
+                state.error = message;
         })
             .addCase(createCivilIdAuth.pending, function (state) {
             state.loading = true;

package/build/features/app/connect/connectStore.d.ts

@@ -82,14 +82,15 @@ export declare const updateLeadMobile: import("@reduxjs/toolkit").AsyncThunk<{
 export declare const skipUpdateLeadMobile: import("@reduxjs/toolkit").AsyncThunk<{
     leadResponse: any;
 }, void, {}>;
+interface EmailCheckProps {
+    email: string;
+    cancelToken: CancelToken;
+    onSuccess?: () => void;
+}
 export declare const checkEmailAvailability: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: string;
-} | undefined, {
-    email: string;
-    cancelToken: CancelToken;
-    onSuccess?: (() => void) | undefined;
-}, {}>;
+} | undefined, EmailCheckProps, {}>;
 export declare const checkBrandNameAvailability: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: {

package/build/features/app/connect/connectStore.js

@@ -71,7 +71,7 @@ import { handleCurrentActiveScreen, handleNextScreenStep, handleSetCountryByIso2
 import { COLLECT_DOB_INFO_NAFATH, CONNECT_STEP_NAMES, defaultCountry, IDENTIFICATION_TYPE, NAFATH_PACI_TIMEOUT_DURATION, NAFATH_VERIFICATION_FAILED, OTHER_BRAND } from '../../../constants';
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { AuthForType, FlowsTypes } from '../../../@types';
-import { capitalizeTheFirstLetterOfEachWord, concatenateObjectValues, findCountryByIddPrefix, fixBrandList, isTwitter, getIndividualName, isWebsite, sleep, sendCustomEventToGTM, isOtherThanKWOrSA, isKW, findCountryByIso2, getMetaData, isNetworkError, isTimeoutError } from '../../../utils';
+import { capitalizeTheFirstLetterOfEachWord, concatenateObjectValues, findCountryByIddPrefix, fixBrandList, isTwitter, getIndividualName, isWebsite, sleep, sendCustomEventToGTM, isOtherThanKWOrSA, isKW, findCountryByIso2, getMetaData, isNetworkError, isTimeoutError, isInternalServerError, isAuthenticationVerificationFailed } from '../../../utils';
 export var updateBusinessCountry = createAsyncThunk('connect/updateBusinessCountry', function (countryCode, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var connect, payload, data;
     return __generator(this, function (_a) {
@@ -209,9 +209,9 @@ export var createNafathAuth = createAsyncThunk('connect/createNafathAuth', funct
 }); });
 export var verifyAuth = createAsyncThunk('connect/verifyAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, connect, settings, startWithNID, _b, mobileData, nidData, responseBody, stepName, payload, data, lead_id, leadResponse, channels, brand, err_1, brands, err_2, countryCode, phone;
-    var _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _c, _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), connect = _a.connect, settings = _a.settings;
                 startWithNID = connect.data.otpData.authFor === AuthForType.NATIONAL_ID;
@@ -229,11 +229,13 @@ export var verifyAuth = createAsyncThunk('connect/verifyAuth', function (params,
                     step_name: stepName,
                     encryption_contract: ['data']
                 };
-                return [4, API.authService.verifyAuth(payload)];
+                return [4, API.authService.verifyAuth(payload).catch(function (err) {
+                        if (isAuthenticationVerificationFailed(err === null || err === void 0 ? void 0 : err.message))
+                            thunkApi.dispatch(handleNextScreenStep('CONNECT_OTP_VERIFY_SECURITY_ERROR_STEP'));
+                        throw new Error(err === null || err === void 0 ? void 0 : err.message);
+                    })];
             case 1:
-                data = (_g.sent()).data;
-                if ((_c = data.errors) === null || _c === void 0 ? void 0 : _c.length)
-                    throw new Error(data.errors[0].description);
+                data = _f.sent();
                 sendCustomEventToGTM({
                     event: 'Send Event',
                     event_category: 'User Registration Flow',
@@ -244,41 +246,41 @@ export var verifyAuth = createAsyncThunk('connect/verifyAuth', function (params,
                     throw new Error('Lead id is missing');
                 return [4, API.leadService.retrieveLead(lead_id)];
             case 2:
-                leadResponse = (_g.sent()).data;
-                if ((_d = leadResponse.errors) === null || _d === void 0 ? void 0 : _d.length)
+                leadResponse = (_f.sent()).data;
+                if ((_c = leadResponse.errors) === null || _c === void 0 ? void 0 : _c.length)
                     throw new Error(leadResponse.errors[0].description);
                 return [4, API.dataService.getChannelsOfServices({ page: 0 })];
             case 3:
-                channels = (_g.sent()).list;
+                channels = (_f.sent()).list;
                 leadResponse.channel_list = channels;
-                _g.label = 4;
+                _f.label = 4;
             case 4:
-                _g.trys.push([4, 6, , 7]);
+                _f.trys.push([4, 6, , 7]);
                 return [4, API.brandService.retrieveBrand(leadResponse.brand.id)];
             case 5:
-                brand = (_g.sent()).brand;
+                brand = (_f.sent()).brand;
                 leadResponse.brand = __assign(__assign({}, leadResponse.brand), brand);
                 return [3, 7];
             case 6:
-                err_1 = _g.sent();
+                err_1 = _f.sent();
                 return [3, 7];
             case 7:
-                _g.trys.push([7, 9, , 10]);
+                _f.trys.push([7, 9, , 10]);
                 return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
             case 8:
-                brands = (_g.sent()).brands;
+                brands = (_f.sent()).brands;
                 leadResponse.brand_list = fixBrandList(brands, channels);
                 return [3, 10];
             case 9:
-                err_2 = _g.sent();
+                err_2 = _f.sent();
                 return [3, 10];
             case 10:
                 countryCode = settings.data.businessCountry;
                 phone = (leadResponse.contact || {}).phone;
                 if (phone === null || phone === void 0 ? void 0 : phone.country_code)
                     countryCode = findCountryByIddPrefix(settings.data.countries, phone.country_code);
-                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, { otp: params.otp });
-                thunkApi.dispatch(handleNextScreenStep());
+                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, { otp: params.otp });
+                thunkApi.dispatch(handleNextScreenStep('CONNECT_INDIVIDUAL_STEP'));
                 return [2, { authResponse: data, leadResponse: leadResponse, countryCode: countryCode }];
         }
     });
@@ -763,23 +765,36 @@ export var skipUpdateLeadMobile = createAsyncThunk('connect/skipUpdateLeadMobile
 export var checkEmailAvailability = createAsyncThunk('checkEmailAvailability', function (_a, thunkApi) {
     var email = _a.email, cancelToken = _a.cancelToken, onSuccess = _a.onSuccess;
     return __awaiter(void 0, void 0, void 0, function () {
-        var connect, requestBody, data;
-        var _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var responseBody, requestBody, data, retryData;
+        var _b, _c, _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
-                    connect = thunkApi.getState().connect;
+                    responseBody = thunkApi.getState().connect.data.otpData.responseBody;
                     requestBody = {
                         email: email,
-                        country: (_c = (_b = connect.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.leadData) === null || _c === void 0 ? void 0 : _c.country_code,
+                        country: (_b = responseBody === null || responseBody === void 0 ? void 0 : responseBody.leadData) === null || _b === void 0 ? void 0 : _b.country_code,
                         encryption_contract: ['email']
                     };
                     return [4, API.availabilityServices.checkEmail(requestBody, { cancelToken: cancelToken })];
                 case 1:
-                    data = (_d.sent()).data;
-                    onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
-                    if (!data.errors)
+                    data = (_f.sent()).data;
+                    if (!data.errors) {
+                        onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
                         return [2, { response: data, formData: email }];
+                    }
+                    if (!isInternalServerError((_d = (_c = data.errors) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.error)) {
+                        onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
+                        return [2];
+                    }
+                    return [4, API.availabilityServices.checkEmail(requestBody, { cancelToken: cancelToken })];
+                case 2:
+                    retryData = (_f.sent()).data;
+                    onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
+                    if (!retryData.errors)
+                        return [2, { response: retryData, formData: email }];
+                    if (isInternalServerError((_e = retryData.errors) === null || _e === void 0 ? void 0 : _e[0].error))
+                        return [2, { response: { is_available: true }, formData: email }];
                     return [2];
             }
         });
@@ -1122,9 +1137,11 @@ export var connectSlice = createSlice({
             state.loading = true;
             state.error = null;
         })
-            .addCase(verifyAuth.rejected, function (state, action) {
+            .addCase(verifyAuth.rejected, function (state, _a) {
+            var message = _a.error.message;
             state.loading = false;
-            state.error = action.error.message;
+            if (!isAuthenticationVerificationFailed(message))
+                state.error = message;
         })
             .addCase(updateLeadDOB.fulfilled, function (state, action) {
             state.loading = false;

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

@@ -82,14 +82,15 @@ export declare const verifyNafathIdentityAsync: import("@reduxjs/toolkit").Async
     isNextScreenIsDob: boolean;
 }, verifyPACIAsyncParams, {}>;
 export declare const verifyPaciLeadIdentityAsync: import("@reduxjs/toolkit").AsyncThunk<any, verifyPACIAsyncParams, {}>;
+interface EmailCheckProps {
+    email: string;
+    cancelToken: CancelToken;
+    onSuccess?: () => void;
+}
 export declare const checkEmailAvailabilityAsync: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: string;
-} | undefined, {
-    email: string;
-    cancelToken: CancelToken;
-    onSuccess?: (() => void) | undefined;
-}, {}>;
+} | undefined, EmailCheckProps, {}>;
 export declare const checkBrandNameAvailabilityAsync: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: {

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

@@ -61,7 +61,7 @@ import { FlowsTypes, AuthForType, BusinessType, LicenseType, AuthForScreen } fro
 import API from '../../../api';
 import { ADD_NEW_ENTITY, COLLECT_DOB_INFO_NAFATH, CONNECT_EXPRESS_STEP_NAMES, IDENTIFICATION_TYPE, NAFATH_PACI_TIMEOUT_DURATION, NAFATH_VERIFICATION_FAILED, OTHER_CR_LICENSE, OTHER_FL_LICENSE, SCOPE_AUTH, SCOPE_MERCHANT } from '../../../constants';
 import { defaultCountry } from '../../../constants';
-import { getIndividualName, capitalizeTheFirstLetterOfEachWord, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA, isKW, isOtherThanKWOrSA, sendCustomEventToGTM, sendCustomDimension, getMetaData, isNetworkError, isTimeoutError } from '../../../utils';
+import { getIndividualName, capitalizeTheFirstLetterOfEachWord, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA, isKW, isOtherThanKWOrSA, sendCustomEventToGTM, sendCustomDimension, getMetaData, isNetworkError, isTimeoutError, isInternalServerError, isAuthenticationVerificationFailed } from '../../../utils';
 export var updateBusinessCountryAsync = createAsyncThunk('connectExpress/updateBusinessCountryAsync', function (countryCode, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var connectExpress, payload, data;
     return __generator(this, function (_a) {
@@ -499,7 +499,11 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
                     step_name: CONNECT_EXPRESS_STEP_NAMES.VERIFY_AUTH_MOBILE,
                     encryption_contract: ['data']
                 };
-                return [4, API.authService.verifyExpressAuth(payload)];
+                return [4, API.authService.verifyExpressAuth(payload).catch(function (err) {
+                        if (isAuthenticationVerificationFailed(err === null || err === void 0 ? void 0 : err.message))
+                            thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_OTP_VERIFY_SECURITY_ERROR_STEP'));
+                        throw new Error(err === null || err === void 0 ? void 0 : err.message);
+                    })];
             case 1:
                 data = _h.sent();
                 sendCustomEventToGTM({
@@ -838,23 +842,36 @@ export var verifyPaciLeadIdentityAsync = createAsyncThunk('connectExpress/verify
 export var checkEmailAvailabilityAsync = createAsyncThunk('connectExpress/CheckEmailAvailabilityAsync', function (_a, thunkApi) {
     var email = _a.email, cancelToken = _a.cancelToken, onSuccess = _a.onSuccess;
     return __awaiter(void 0, void 0, void 0, function () {
-        var connectExpress, requestBody, data;
-        var _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var responseData, requestBody, data, retryData;
+        var _b, _c, _d, _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0:
-                    connectExpress = thunkApi.getState().connectExpress;
+                    responseData = thunkApi.getState().connectExpress.data.responseData;
                     requestBody = {
                         email: email,
-                        country: (_c = (_b = connectExpress.data.responseData) === null || _b === void 0 ? void 0 : _b.leadData) === null || _c === void 0 ? void 0 : _c.country_code,
+                        country: (_b = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _b === void 0 ? void 0 : _b.country_code,
                         encryption_contract: ['email']
                     };
                     return [4, API.availabilityServices.checkEmail(requestBody, { cancelToken: cancelToken })];
                 case 1:
-                    data = (_d.sent()).data;
-                    onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
-                    if (!data.errors)
+                    data = (_g.sent()).data;
+                    if (!data.errors) {
+                        onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
                         return [2, { response: data, formData: email }];
+                    }
+                    if (!isInternalServerError((_d = (_c = data.errors) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.error)) {
+                        onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
+                        return [2];
+                    }
+                    return [4, API.availabilityServices.checkEmail(requestBody, { cancelToken: cancelToken })];
+                case 2:
+                    retryData = (_g.sent()).data;
+                    onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
+                    if (!retryData.errors)
+                        return [2, { response: retryData, formData: email }];
+                    if (isInternalServerError((_f = (_e = retryData.errors) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.error))
+                        return [2, { response: { is_available: true }, formData: email }];
                     return [2];
             }
         });
@@ -1294,7 +1311,11 @@ export var verifyAuthMobileOtpAsync = createAsyncThunk('connectExpress/verifyAut
                     step_name: CONNECT_EXPRESS_STEP_NAMES.VERIFY_AUTH_MOBILE_OTP,
                     encryption_contract: ['data']
                 };
-                return [4, API.authService.verifyExpressLeadIdentity(payload)];
+                return [4, API.authService.verifyExpressLeadIdentity(payload).catch(function (err) {
+                        if (isAuthenticationVerificationFailed(err === null || err === void 0 ? void 0 : err.message))
+                            thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_OTP_VERIFY_SECURITY_ERROR_STEP'));
+                        throw new Error(err === null || err === void 0 ? void 0 : err.message);
+                    })];
             case 1:
                 data = _e.sent();
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
@@ -1699,9 +1720,11 @@ export var connectSlice = createSlice({
             state.loading = false;
             state.data.responseData = __assign(__assign({}, state.data.responseData), { authData: __assign(__assign({}, (_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.authData), action.payload) });
         })
-            .addCase(verifyMobileOtpAsync.rejected, function (state, action) {
+            .addCase(verifyMobileOtpAsync.rejected, function (state, _a) {
+            var message = _a.error.message;
             state.loading = false;
-            state.error = action.error.message;
+            if (!isAuthenticationVerificationFailed(message))
+                state.error = message;
         })
             .addCase(verifyNafathAsync.pending, function (state) {
             state.loading = true;
@@ -1929,6 +1952,7 @@ export var connectSlice = createSlice({
             state.loading = false;
             state.error = null;
             state.data.individualData.mobile = action.payload.formData.mobile;
+            state.data.individualData.countryCode = action.payload.formData.countryCode;
             state.data.responseData = __assign(__assign({}, state.data.responseData), { individualData: action.payload.leadResponse, verifyAuthMobile: action.payload.leadResponse });
             state.data.verifyAuthOtpData.authFor = AuthForScreen.MOBILE_OWNERSHIP;
         })
@@ -1964,9 +1988,11 @@ export var connectSlice = createSlice({
             state.loading = true;
             state.error = null;
         })
-            .addCase(verifyAuthMobileOtpAsync.rejected, function (state, action) {
+            .addCase(verifyAuthMobileOtpAsync.rejected, function (state, _a) {
+            var message = _a.error.message;
             state.loading = false;
-            state.error = action.error.message;
+            if (!isAuthenticationVerificationFailed(message))
+                state.error = message;
         })
             .addCase(resendLeadMobileAuthOTP.pending, function (state) {
             state.loading = true;

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

@@ -63,7 +63,7 @@ import { BusinessType, DocumentPurpose, FlowsTypes, LicenseType } from '../../..
 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, sendCustomEventToGTM } from '../../../utils';
+import { convertNumbers2English, getRecentDocumentBasedOnPurpose, hasVerifiedValue, hasNoneEditableValue, sleep, formatNumberAsCurrency, removeAllCharsFromNumber, retrieveIndividualData, sendCustomEventToGTM, isAuthenticationVerificationFailed } from '../../../utils';
 export var verifyLeadToken = createAsyncThunk('entityVerifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -145,9 +145,9 @@ export var resendOTP = createAsyncThunk('entityResendOTP', function (params, thu
 }); });
 export var verifyEntityLeadOTP = createAsyncThunk('verifyEntityLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, entity, settings, responseBody, payload, data, _b, entity_id, config, boardId, country_code, entityData, publicKey, countryIso2, data_2, entityTypes;
-    var _c, _d, _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var _c, _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
                 _a = thunkApi.getState(), entity = _a.entity, settings = _a.settings;
                 responseBody = entity.data.verify.responseBody;
@@ -158,11 +158,13 @@ export var verifyEntityLeadOTP = createAsyncThunk('verifyEntityLeadOTP', functio
                     step_name: ENTITY_STEP_NAMES.PHONE_AUTH,
                     encryption_contract: ['data']
                 };
-                return [4, API.leadService.verifyLeadOTP(payload)];
+                return [4, API.leadService.verifyTokenOTP(payload).catch(function (err) {
+                        if (isAuthenticationVerificationFailed(err === null || err === void 0 ? void 0 : err.message))
+                            thunkApi.dispatch(handleNextScreenStep('ENTITY_OTP_VERIFY_SECURITY_ERROR_STEP'));
+                        throw new Error(err === null || err === void 0 ? void 0 : err.message);
+                    })];
             case 1:
-                data = (_j.sent()).data;
-                if ((_d = data === null || data === void 0 ? void 0 : data.errors) === null || _d === void 0 ? void 0 : _d.length)
-                    throw new Error(data.errors[0].description);
+                data = _h.sent();
                 _b = data || {}, entity_id = _b.entity_id, config = _b.config, boardId = _b.id, country_code = _b.country_code;
                 entityData = undefined;
                 publicKey = config === null || config === void 0 ? void 0 : config.public_key;
@@ -174,22 +176,22 @@ export var verifyEntityLeadOTP = createAsyncThunk('verifyEntityLeadOTP', functio
                 if (!!entity_id) return [3, 3];
                 return [4, API.boardService.retrieveBoardDetails(boardId)];
             case 2:
-                data_2 = _j.sent();
-                if (!((_e = data_2 === null || data_2 === void 0 ? void 0 : data_2.entity) === null || _e === void 0 ? void 0 : _e.id))
+                data_2 = _h.sent();
+                if (!((_d = data_2 === null || data_2 === void 0 ? void 0 : data_2.entity) === null || _d === void 0 ? void 0 : _d.id))
                     throw new Error('entity_id_missing');
                 entityData = data_2;
                 return [3, 5];
             case 3: return [4, API.entityService.retrieveEntity(entity_id)];
             case 4:
-                entityData = _j.sent();
-                _j.label = 5;
+                entityData = _h.sent();
+                _h.label = 5;
             case 5:
-                if (!countryIso2 && ((_f = entityData === null || entityData === void 0 ? void 0 : entityData.entity) === null || _f === void 0 ? void 0 : _f.country))
+                if (!countryIso2 && ((_e = entityData === null || entityData === void 0 ? void 0 : entityData.entity) === null || _e === void 0 ? void 0 : _e.country))
                     thunkApi.dispatch(handleSetCountryByIso2(entityData.entity.country));
-                (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, { otp: params.otp });
+                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, { otp: params.otp });
                 return [4, API.entityService.retrieveEntityType()];
             case 6:
-                entityTypes = _j.sent();
+                entityTypes = _h.sent();
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('ENTITY_NAME_STEP')); });
                 return [2, {
                         data: data,
@@ -649,9 +651,11 @@ export var entitySlice = createSlice({
                 state.data.entityCapitalData.capitalShareValue = formatNumberAsCurrency(shares === null || shares === void 0 ? void 0 : shares.value);
             state.data.entityNameData = __assign(__assign({}, state.data.entityNameData), { responseBody: __assign(__assign({}, state.data.entityNameData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id }) });
         })
-            .addCase(verifyEntityLeadOTP.rejected, function (state, action) {
+            .addCase(verifyEntityLeadOTP.rejected, function (state, _a) {
+            var message = _a.error.message;
             state.loading = false;
-            state.error = action.error.message;
+            if (!isAuthenticationVerificationFailed(message))
+                state.error = message;
         })
             .addCase(updateEntityName.pending, function (state) {
             state.loading = true;