@tap-payments/auth-jsconnect 2.4.57-test → 2.4.59-test

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

@@ -593,4 +593,11 @@ export interface CountryTrackingData extends CommonDataLayer {
 export interface LeadIdentificationData extends CommonDataLayer {
     lead_ID?: string;
 }
+export type VerifyExpressTokenParams = {
+    public_key: string;
+    post: {
+        url: string;
+    };
+    lead_id: string;
+};
 export {};

package/build/app/settings.d.ts

@@ -1,10 +1,12 @@
 import { RootState } from './store';
-import { ActionState, LanguageMode, SharedState, ThemeMode, ScreenStepNavigation, DeviceInfo, LibConfig, CountryCode, MerchantInfo } from '../@types';
+import { ActionState, LanguageMode, SharedState, ThemeMode, ScreenStepNavigation, DeviceInfo, LibConfig, CountryCode, MerchantInfo, VerifyExpressTokenParams } from '../@types';
 interface SettingParams {
     disableCountries?: boolean;
     disableLocale?: boolean;
     mdn: string;
     maturity?: 'full' | 'express';
+    expressToken?: string;
+    onExpressVerifyTokenSuccess?: (data: VerifyExpressTokenParams) => Promise<void>;
 }
 export declare const fetchAppSettingsSync: import("@reduxjs/toolkit").AsyncThunk<any, SettingParams, {
     state?: unknown;

package/build/app/settings.js

@@ -53,22 +53,43 @@ import i18n from '../i18n';
 import { updateLocale } from '../utils/locale';
 import API, { 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, _c, visitorId, locale, initPayload, _d, country_list, ip_info, merchant, operator, list, _e, ip, latitude, longitude, deviceInfo, isValidOperator, countries, countryCode, isKWOrSA, businessCountry;
+    var settings, _a, appConfig, language, _b, client, device, os, disableLocale, maturity, disableCountries, expressToken, onExpressVerifyTokenSuccess, _c, visitorId, locale, publicKey, payload, data, public_key, initPayload, _d, country_list, ip_info, merchant, operator, list, _e, ip, latitude, longitude, deviceInfo, isValidOperator, countries, countryCode, isKWOrSA, businessCountry;
     return __generator(this, function (_f) {
         switch (_f.label) {
             case 0:
                 settings = thunkApi.getState().settings;
                 _a = settings.data, appConfig = _a.appConfig, language = _a.language;
                 _b = getBrowserInfo(), client = _b.client, device = _b.device, os = _b.os;
-                disableLocale = params.disableLocale, maturity = params.maturity, disableCountries = params.disableCountries;
+                disableLocale = params.disableLocale, maturity = params.maturity, disableCountries = params.disableCountries, expressToken = params.expressToken, onExpressVerifyTokenSuccess = params.onExpressVerifyTokenSuccess;
                 return [4, Promise.all([getFingerPrint(), API.firebaseService.getLocale(disableLocale)])];
             case 1:
                 _c = _f.sent(), visitorId = _c[0].visitorId, locale = _c[1];
+                publicKey = appConfig.publicKey;
                 setAxiosGlobalHeaders({
                     bi: visitorId || '',
                     mdn: encryptString(params.mdn || window.location.origin),
-                    authorization: encryptString(appConfig.publicKey)
+                    authorization: encryptString(publicKey)
                 });
+                if (!expressToken) return [3, 3];
+                payload = {
+                    token: expressToken
+                };
+                return [4, API.leadService.verifyExpressLeadToken(payload)];
+            case 2:
+                data = _f.sent();
+                onExpressVerifyTokenSuccess === null || onExpressVerifyTokenSuccess === void 0 ? void 0 : onExpressVerifyTokenSuccess(data);
+                public_key = (data || {}).public_key;
+                if (public_key) {
+                    publicKey = public_key;
+                    setAxiosGlobalHeaders({
+                        bi: visitorId || '',
+                        mdn: encryptString(params.mdn || window.location.origin),
+                        authorization: encryptString(publicKey)
+                    });
+                    thunkApi.dispatch(handlePublicKey(publicKey));
+                }
+                _f.label = 3;
+            case 3:
                 initPayload = {
                     type: 'website',
                     app_client_version: 'js-auth-connect',
@@ -80,7 +101,7 @@ export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', funct
                     }
                 };
                 return [4, API.initService.getInitialData(initPayload)];
-            case 2:
+            case 4:
                 _d = _f.sent(), country_list = _d.country_list, ip_info = _d.ip_info, merchant = _d.merchant, operator = _d.operator;
                 list = (country_list || { list: [] }).list;
                 _e = ip_info || {}, ip = _e.ip, latitude = _e.latitude, longitude = _e.longitude;
@@ -115,13 +136,15 @@ export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', funct
                     },
                     source: 'browser'
                 };
-                setAxiosGlobalHeaders(__assign(__assign(__assign({}, getRequestHeaders(deviceInfo)), { authorization: encryptString(appConfig.publicKey), mdn: encryptString(params.mdn || window.location.origin), cu: window.location.href }), (maturity && { maturity: maturity })));
+                setAxiosGlobalHeaders(__assign(__assign(__assign({}, getRequestHeaders(deviceInfo)), { authorization: encryptString(publicKey), mdn: encryptString(params.mdn || window.location.origin), cu: window.location.href }), (maturity && { maturity: maturity })));
                 isValidOperator = operator === 'valid';
                 countries = sortCountries(list);
                 countryCode = appConfig.businessCountryCode;
+                if (maturity === 'express' && (merchant === null || merchant === void 0 ? void 0 : merchant.country_code))
+                    countryCode = merchant === null || merchant === void 0 ? void 0 : merchant.country_code;
                 isKWOrSA = isKW(countryCode) || isSA(countryCode);
                 if (!isKWOrSA)
-                    countryCode = 'SA';
+                    countryCode = 'KW';
                 businessCountry = findCountryByIso2(countries, countryCode);
                 if (!businessCountry)
                     throw new Error('Business country not found, you have to pass a valid business country code in the lib config');

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

@@ -1,22 +1,6 @@
 import { RootState } from '../../../app/store';
 import { MobileFormValues, NIDFormValues, CivilFormValues, OTPFormValues, IndividualFormValues, SharedState, FlowsTypes, ActionState, CountryCode, AuthForType, BusinessDataFormValues, AsyncThunkParams } from '../../../@types';
 import { CancelToken } from 'axios';
-interface VerifyLeadTokenProps {
-    token: string;
-}
-export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
-    data: any;
-    token: string;
-}, VerifyLeadTokenProps, {
-    state?: unknown;
-    dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
-    extra?: unknown;
-    rejectValue?: unknown;
-    serializedErrorType?: unknown;
-    pendingMeta?: unknown;
-    fulfilledMeta?: unknown;
-    rejectedMeta?: unknown;
-}>;
 export declare const retrieveLeadIdentityByIdAsync: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     countryCode: CountryCode;

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

@@ -56,45 +56,12 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { handleNextScreenStep, handleCurrentActiveScreen, handleOpen, handlePublicKey } from '../../../app/settings';
+import { handleNextScreenStep, handleCurrentActiveScreen, handleOpen } 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 } from '../../../constants';
 import { defaultCountry } from '../../../constants';
 import { getIndividualName, capitalizeTheFirstLetterOfEachWord, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA } from '../../../utils';
-export var verifyLeadToken = createAsyncThunk('expressVerifyLeadToken', function (_a, thunkApi) {
-    var token = _a.token;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var payload, data, _b, lead_id, post, public_key;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    payload = {
-                        token: token
-                    };
-                    return [4, API.leadService.verifyExpressLeadToken(payload)];
-                case 1:
-                    data = _c.sent();
-                    _b = data || {}, lead_id = _b.lead_id, post = _b.post, public_key = _b.public_key;
-                    if (public_key)
-                        thunkApi.dispatch(handlePublicKey(public_key));
-                    if (post === null || post === void 0 ? void 0 : post.url)
-                        thunkApi.dispatch(setPostUrl(post.url));
-                    if (!lead_id) return [3, 3];
-                    thunkApi.dispatch(setIsLeadIdPassed(true));
-                    thunkApi.dispatch(setLeadId(lead_id));
-                    return [4, thunkApi.dispatch(retrieveLeadIdentityByIdAsync(lead_id))];
-                case 2:
-                    _c.sent();
-                    _c.label = 3;
-                case 3: return [2, {
-                        data: data,
-                        token: token
-                    }];
-            }
-        });
-    });
-});
 export var retrieveLeadIdentityByIdAsync = createAsyncThunk('expressConnect/retrieveLeadIdentityByIdAsync', function (leadId, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, connectExpress, countryCode, showBoard, data, phone, status, board_id, board_info_id, isRegistered, _b, boardInfo, boardData, error_1;
     var _c, _d;
@@ -839,17 +806,6 @@ export var connectSlice = createSlice({
     },
     extraReducers: function (builder) {
         builder
-            .addCase(verifyLeadToken.pending, function (state) {
-            state.customLoading = true;
-            state.error = null;
-        })
-            .addCase(verifyLeadToken.fulfilled, function (state, action) {
-            state.customLoading = false;
-        })
-            .addCase(verifyLeadToken.rejected, function (state, action) {
-            state.customLoading = false;
-            state.error = action.error.message;
-        })
             .addCase(retrieveLeadIdentityByIdAsync.pending, function (state) {
             state.error = null;
             state.customLoading = true;

package/build/features/connectExpress/ConnectExpress.js

@@ -9,6 +9,42 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -28,7 +64,7 @@ import { useAppTheme, useAppSelector, useAppConfig, useErrorListener, useStepSta
 import { handleCurrentActiveScreen, handleLanguage, settingsSelector } from '../../app/settings';
 import AnimationFlow from '../../components/AnimationFlow';
 import { store } from '../../app/store';
-import { connectExpressSelector, setIsLeadIdPassed, setPostUrl, setLeadId, retrieveLeadIdentityByIdAsync, setShowBoard, verifyLeadToken } from '../app/connectExpress/connectExpressStore';
+import { connectExpressSelector, setIsLeadIdPassed, setPostUrl, setLeadId, retrieveLeadIdentityByIdAsync, setShowBoard } from '../app/connectExpress/connectExpressStore';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
 import { isKW, findOrCreateElementAndInject, getParameterByName } from '../../utils';
@@ -40,8 +76,23 @@ var ConnectExpress = memo(function (_a) {
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
     var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
-    var _c = useAppSelector(connectExpressSelector), connectExpressError = _c.error, loading = _c.loading, customLoading = _c.customLoading;
-    useAppConfig(__assign({ navigation: CONNECT_EXPRESS_SCREENS_NAVIGATION, maturity: 'express' }, props));
+    var _c = useAppSelector(connectExpressSelector), connectExpressError = _c.error, loading = _c.loading, customLoading = _c.customLoading, connectData = _c.data;
+    var onExpressVerifyTokenSuccess = verifyToken
+        ? function (data) { return __awaiter(void 0, void 0, void 0, function () {
+            var _a, post, lead_id;
+            return __generator(this, function (_b) {
+                _a = data || {}, post = _a.post, lead_id = _a.lead_id;
+                if (post === null || post === void 0 ? void 0 : post.url)
+                    dispatch(setPostUrl(post.url));
+                if (lead_id) {
+                    dispatch(setIsLeadIdPassed(true));
+                    dispatch(setLeadId(lead_id));
+                }
+                return [2];
+            });
+        }); }
+        : undefined;
+    useAppConfig(__assign(__assign({ navigation: CONNECT_EXPRESS_SCREENS_NAVIGATION, maturity: 'express' }, props), { expressToken: verifyToken, onExpressVerifyTokenSuccess: onExpressVerifyTokenSuccess }));
     useErrorListener(connectExpressError || error);
     useStepStartedListener();
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, merchant = data.merchant;
@@ -60,7 +111,8 @@ var ConnectExpress = memo(function (_a) {
                 var lang = getParameterByName('lang');
                 if (lang)
                     dispatch(handleLanguage(lang));
-                dispatch(verifyLeadToken({ token: verifyToken }));
+                if (connectData.leadId)
+                    dispatch(retrieveLeadIdentityByIdAsync(connectData.leadId));
                 return;
             }
             if (leadId) {

package/build/hooks/useAppConfig.d.ts

@@ -1,10 +1,12 @@
-import { LibConfig, ScreenStepNavigation } from '../@types';
+import { LibConfig, ScreenStepNavigation, VerifyExpressTokenParams } from '../@types';
 interface AppConfigProps extends LibConfig {
     navigation: ScreenStepNavigation[];
     disableCountries?: boolean;
     disableLocale?: boolean;
     disableSettingFetching?: boolean;
     maturity?: 'full' | 'express';
+    expressToken?: string;
+    onExpressVerifyTokenSuccess?: (data: VerifyExpressTokenParams) => Promise<void>;
 }
-export declare const useAppConfig: ({ appInfo, navigation, publicKey, disableCountries, disableLocale, disableSettingFetching, maturity, boardMaturity, ...rest }: AppConfigProps) => void;
+export declare const useAppConfig: ({ appInfo, navigation, publicKey, disableCountries, disableLocale, disableSettingFetching, maturity, boardMaturity, expressToken, onExpressVerifyTokenSuccess, ...rest }: AppConfigProps) => void;
 export {};

package/build/hooks/useAppConfig.js

@@ -28,7 +28,7 @@ import { axiosInstance } from '../api';
 import { isTapDomain, removeRequestHeaders } from '../utils';
 import { ENDPOINT_PATHS } from '../constants';
 export var useAppConfig = function (_a) {
-    var appInfo = _a.appInfo, navigation = _a.navigation, publicKey = _a.publicKey, disableCountries = _a.disableCountries, disableLocale = _a.disableLocale, disableSettingFetching = _a.disableSettingFetching, maturity = _a.maturity, boardMaturity = _a.boardMaturity, rest = __rest(_a, ["appInfo", "navigation", "publicKey", "disableCountries", "disableLocale", "disableSettingFetching", "maturity", "boardMaturity"]);
+    var appInfo = _a.appInfo, navigation = _a.navigation, publicKey = _a.publicKey, disableCountries = _a.disableCountries, disableLocale = _a.disableLocale, disableSettingFetching = _a.disableSettingFetching, maturity = _a.maturity, boardMaturity = _a.boardMaturity, expressToken = _a.expressToken, onExpressVerifyTokenSuccess = _a.onExpressVerifyTokenSuccess, rest = __rest(_a, ["appInfo", "navigation", "publicKey", "disableCountries", "disableLocale", "disableSettingFetching", "maturity", "boardMaturity", "expressToken", "onExpressVerifyTokenSuccess"]);
     var dispatch = useAppDispatch();
     var data = useAppSelector(settingsSelector).data;
     var setBaseUrl = function () {
@@ -63,6 +63,6 @@ export var useAppConfig = function (_a) {
         if (!data.isMaturityExpress)
             dispatch(handleLanguage(rest.language));
         if (!disableSettingFetching)
-            dispatch(fetchAppSettingsSync({ disableCountries: disableCountries, disableLocale: disableLocale, mdn: rest.merchantDomain, maturity: maturity }));
+            dispatch(fetchAppSettingsSync({ disableCountries: disableCountries, disableLocale: disableLocale, mdn: rest.merchantDomain, maturity: maturity, expressToken: expressToken, onExpressVerifyTokenSuccess: onExpressVerifyTokenSuccess }));
     }, []);
 };

package/package.json

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