@truworth/twc-auth 1.2.9 → 1.2.11

package/build/src/contexts/AuthContext.js

@@ -39,7 +39,7 @@ const AuthProvider = ({ children, LogoComponent, session, appConfig, onLogin, on
     const [profile, setProfile] = useState(null);
     const [client, setClient] = useState(null);
     const [registrationMethod, setRegistrationMethod] = useState(null);
-    const [token, setToken] = useState('');
+    const [token, setToken] = useState(session?.token || '');
     const [otpValue, setOtpValue] = useState('');
     const { request } = useMemo(() => createHttpClient({
         token,

package/build/src/hooks/useRequest.js

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useMemo } from 'react';
 import { showMessage } from '../helpers/show-message';
 import { useAuthPackageContext } from './internal/useAuthPackageContext';
 import { createHttpClient } from '../helpers/network';
@@ -10,9 +10,6 @@ const useRequest = () => {
         onLogout: async () => logout(),
     }), [token]);
     const makeRequest = async ({ url, method, body, onSuccess, onFailure, ...axiosOptions }) => {
-        if (!token) {
-            return;
-        }
         try {
             const response = await request({
                 url,

package/build/src/screens/CreatePassword/hooks/internal/useCreatePassword.js

@@ -23,7 +23,7 @@ const useCreatePassword = () => {
         setConfirmPassword('');
         onResult();
     };
-    const disabled = !Object.keys(criteria).every(c => criteria[c]) || (password !== confirmPassword);
+    const isContinueDisabled = !Object.keys(criteria).every(c => criteria[c]) || (password !== confirmPassword);
     return {
         password, setPassword,
         confirmPassword, setConfirmPassword,
@@ -33,7 +33,7 @@ const useCreatePassword = () => {
         criteria, setCriteria,
         handlePassword, handleConfirmPassword,
         handleSkip,
-        disabled
+        isContinueDisabled
     };
 };
 export { useCreatePassword };

package/build/src/screens/CreatePassword/index.js

@@ -12,12 +12,12 @@ const CreatePassword = ({ userDetails, handleBack, onContinue }) => {
         }
     });
     const { password, confirmPassword } = form.watch();
-    const { criteria, setCriteria, maxLength, setMaxLength, handleSkip, } = useCreatePassword();
+    const { criteria, setCriteria, maxLength, setMaxLength, handleSkip, isContinueDisabled } = useCreatePassword();
     return (_jsx(ScreenLayout, { title: _jsxs(Flex, { justify: "between", align: "center", children: [_jsx(Typography, { type: "heading", size: "h5", children: "Create your Password" }), countryCode == '91' &&
                     _jsx(Button, { label: "Skip Now", variant: "link", onClick: () => handleSkip({ onResult: onContinue }) })] }), subTitle: "Use a password that's easy to remember and fulfills all the requirements listed below.", buttonProps: {
             label: 'Continue',
             onClick: () => onContinue(password, confirmPassword),
-            disabled: !password || !confirmPassword || (password !== confirmPassword)
+            disabled: isContinueDisabled
         }, onPressBack: handleBack, children: _jsxs(Form, { form: form, className: 'w-full', children: [_jsx(Form.Item, { name: "password", label: "Enter Password", normalize: (value) => value.replace(/\s/g, ''), rules: [
                         {
                             required: true,

package/build/src/screens/CreatePassword/index.native.js

@@ -8,14 +8,14 @@ import { PasswordCriteria } from '../../components/PasswordCriteria/index.native
 const { primary } = Colors;
 const CreatePassword = ({ navigation, route }) => {
     const { countryCode, email } = route.params;
-    const { password, confirmPassword, passwordVisible, setPasswordVisible, confirmPasswordVisible, setConfirmPasswordVisible, maxLength, setMaxLength, criteria, setCriteria, handlePassword, handleConfirmPassword, handleSkip, disabled } = useCreatePassword();
+    const { password, confirmPassword, passwordVisible, setPasswordVisible, confirmPasswordVisible, setConfirmPasswordVisible, maxLength, setMaxLength, criteria, setCriteria, handlePassword, handleConfirmPassword, handleSkip, isContinueDisabled } = useCreatePassword();
     const onContinue = () => {
         navigation.navigate('UserConsent', { ...route.params, password });
     };
     return (_jsx(Layout, { style: { flex: 1, backgroundColor: primary.white }, children: _jsxs(ScreenLayout, { title: "Create your Password", subTitle: "Use a password that\u2019s easy to remember and fulfills all the requirement listed below.", buttonProps: {
                 label: 'Continue',
                 onPress: onContinue,
-                disabled: disabled,
+                disabled: isContinueDisabled,
             }, accessoryRight: countryCode == '91'
                 ? _jsx(TouchableOpacity, { activeOpacity: 0.8, onPress: () => {
                         Keyboard.dismiss();

package/build/src/screens/EnterPassword/hooks/internal/useEnterPassword.js

@@ -49,7 +49,9 @@ const useEnterPassword = () => {
             const errorMessage = error?.response?.data?.errors?.[0]?.message;
             if (error?.response?.status === 400) {
                 setInvalidPassword(true);
-                showMessage({ message: errorMessage ?? 'Email and password do not match!' });
+                if (source === 'web') {
+                    showMessage({ message: errorMessage ?? 'Email and password do not match!' });
+                }
                 return;
             }
             showMessage({ message: errorMessage ?? 'Something went wrong. Please try again.' });

package/build/src/screens/LoginWithEmailOTP/hooks/internal/useLoginWithEmailOTP.js

@@ -45,9 +45,7 @@ const useLoginWithEmailOTP = ({ email, password, source, sessionToken, mfaEnable
         }).then((res) => {
             setStatus('valid');
             const { token, member } = res.data;
-            if (token) {
-                onTokenChange(token);
-            }
+            onTokenChange(token);
             onLogin({ token, member });
         }).catch((error) => {
             const errorCode = error?.response?.status;

package/build/src/screens/LoginWithMobileOTP/hooks/internal/useLoginWithMobileOTP.js

@@ -7,7 +7,7 @@ const useLoginWithMobileOTP = ({ phone, email, source }) => {
     const [timer, setTimer] = useState(180);
     const [status, setStatus] = useState('timer');
     const [sessionToken, setSessionToken] = useState('');
-    const { onLogin } = useAuthPackageContext();
+    const { onLogin, onTokenChange } = useAuthPackageContext();
     useInterval(() => {
         if (!timer) {
             return;
@@ -42,6 +42,7 @@ const useLoginWithMobileOTP = ({ phone, email, source }) => {
         }).then((res) => {
             setStatus('valid');
             const { token, member } = res.data;
+            onTokenChange(token);
             onLogin({ token, member });
         }).catch((error) => {
             const errorCode = error?.response?.status;

package/build/src/screens/ResetPassword/hooks/internal/useResetPassword.js

@@ -39,6 +39,7 @@ const useResetPassword = ({ sessionToken }) => {
             showMessage({ message: err?.response?.data?.errors?.[0]?.message || 'An unexpected error occurred' });
         }).finally(() => setLoading(false));
     };
+    const isContinueDisabled = !Object.keys(criteria).every(c => criteria[c]) || (password !== confirmPassword);
     return {
         loading,
         password, setPassword,
@@ -50,6 +51,7 @@ const useResetPassword = ({ sessionToken }) => {
         handlePassword,
         handleContinue,
         handleConfirmPassword,
+        isContinueDisabled
     };
 };
 export { useResetPassword };

package/build/src/screens/ResetPassword/index.js

@@ -11,12 +11,12 @@ const ResetPassword = ({ email, sessionToken, onPressBack, onContinue }) => {
         }
     });
     const { password, confirmPassword } = form.watch();
-    const { loading, criteria, setCriteria, maxLength, setMaxLength, handlePassword, handleConfirmPassword, handleContinue, } = useResetPassword({ sessionToken });
+    const { loading, criteria, setCriteria, maxLength, setMaxLength, handlePassword, handleConfirmPassword, handleContinue, isContinueDisabled } = useResetPassword({ sessionToken });
     return (_jsx(ScreenLayout, { title: "Reset your Password", subTitle: "Use a password that\u2019s easy to remember and fulfills all the requirements listed below.", buttonProps: {
             loading,
             label: 'Continue',
             onClick: () => handleContinue({ onResult: onContinue }),
-            disabled: !password || !confirmPassword || (password !== confirmPassword)
+            disabled: isContinueDisabled
         }, onPressBack: onPressBack, children: _jsx(Flex, { direction: "column", children: _jsxs(Form, { form: form, className: "w-full", children: [_jsx(Form.Item, { label: "Enter Password", normalize: (value) => value.replace(/\s/g, ''), rules: [
                             {
                                 required: true,

package/build/src/screens/ResetPassword/index.native.js

@@ -7,7 +7,7 @@ import { PasswordCriteria } from '../../components/PasswordCriteria/index.native
 const { primary } = Colors;
 const ResetPassword = ({ navigation, route }) => {
     const { sessionToken, email } = route.params || {};
-    const { loading, password, confirmPassword, passwordVisible, setPasswordVisible, confirmPasswordVisible, setConfirmPasswordVisible, maxLength, setMaxLength, criteria, setCriteria, handlePassword, handleContinue, handleConfirmPassword, } = useResetPassword({ sessionToken });
+    const { loading, password, confirmPassword, passwordVisible, setPasswordVisible, confirmPasswordVisible, setConfirmPasswordVisible, maxLength, setMaxLength, criteria, setCriteria, handlePassword, handleContinue, handleConfirmPassword, isContinueDisabled } = useResetPassword({ sessionToken });
     return (_jsx(Layout, { style: { flex: 1, backgroundColor: primary.white }, children: _jsxs(ScreenLayout, { title: "Reset your Password", subTitle: "Use a password that\u2019s easy to remember and fulfills all the requirements listed below.", buttonProps: {
                 loading,
                 label: 'Continue',
@@ -16,7 +16,7 @@ const ResetPassword = ({ navigation, route }) => {
                         onResult: () => navigation.navigate('EnterEmail')
                     });
                 },
-                disabled: !Object.keys(criteria).every(c => criteria[c]) || (password !== confirmPassword),
+                disabled: isContinueDisabled
             }, children: [_jsx(TextInputField, { placeholder: "Enter password...", onChangeValue: handlePassword, secureTextEntry: !passwordVisible, value: password, rightIcon2: passwordVisible
                         ? 'eye-outline'
                         : 'eye-off-outline', onPressRightIcon2: () => setPasswordVisible(!passwordVisible), autoFocus: true, maxLength: maxLength }), _jsx(PasswordCriteria, { email: email, criteria: criteria, onCriteriaChange: setCriteria, onMaxLengthChange: setMaxLength, password: password }), _jsx(TextInputField, { placeholder: "Confirm password...", onChangeValue: handleConfirmPassword, secureTextEntry: !confirmPasswordVisible, value: confirmPassword, rightIcon2: confirmPasswordVisible

package/build/src/screens/SSOLogin/SSOCallback/hooks/internal/useSSOCallback.js

@@ -11,7 +11,7 @@ import { RegistrationMethod } from "../../../../../enums";
 const useSSOCallback = ({ clientId, code }) => {
     const [error, setError] = useState(null);
     const [result, setResult] = useState(null);
-    const { onLogin, onRegistrationMethodChange } = useAuthPackageContext();
+    const { onLogin, onRegistrationMethodChange, onTokenChange } = useAuthPackageContext();
     const processOAuthCallback = useCallback((code) => {
         setError(null);
         axiosClient({
@@ -24,6 +24,7 @@ const useSSOCallback = ({ clientId, code }) => {
                 setResult(res.data);
             }
             else {
+                onTokenChange(res?.data?.token);
                 return onLogin({ token: res?.data?.token, member: res?.data?.member });
             }
         }).catch((error) => {

package/build/src/screens/SignUp/components/SignUpForm/index.js

@@ -27,8 +27,8 @@ const SignUpFormComponent = ({ userDetails, onContinue }) => {
     const form = useForm({
         liveValidation: true,
         defaultValues: {
-            firstName: userDetails.firstName ?? "",
-            lastName: userDetails.lastName ?? "",
+            firstName: userDetails.firstName ?? getQueryParam(router.query.firstName),
+            lastName: userDetails.lastName ?? getQueryParam(router.query.lastName),
             dateOfBirth: userDetails.selectedDOB,
             email: userDetails.email ?? "",
             phone: userDetails.phone ?? "",

package/build/src/screens/UserConsent/index.js

@@ -20,11 +20,12 @@ const UserConsent = ({ userDetails, handleBack }) => {
     const [showVerifyMobileModal, setShowVerifyMobileModal] = useState(false);
     const [showVerifyEmailModal, setShowVerifyEmailModal] = useState(false);
     const [sessionToken, setSessionToken] = useState('');
-    const { onLogin, appConfig: { appName, privacyPolicyUrl }, LogoComponent } = useAuthPackageContext();
+    const { onLogin, appConfig: { appName, privacyPolicyUrl }, LogoComponent, onTokenChange } = useAuthPackageContext();
     const { loading, onAgree } = useConsent();
     const onAgreeHandler = (res) => {
         const { token, member, emailVerificationRequired, mobileVerificationRequired, sessionToken } = res;
         if (token && member) {
+            onTokenChange(token);
             return onLogin({ token, member });
         }
         if (emailVerificationRequired) {

package/build/src/screens/UserConsent/index.native.js

@@ -8,11 +8,12 @@ import { useConsent } from './hooks/internal/useConsent';
 const { primary, gray } = Colors;
 const UserConsent = ({ navigation, route }) => {
     const { email, phone } = route.params || {};
-    const { onLogin, appConfig: { appName, privacyPolicyUrl } } = useAuthPackageContext();
+    const { onLogin, appConfig: { appName, privacyPolicyUrl }, onTokenChange } = useAuthPackageContext();
     const { loading, onAgree } = useConsent();
     const onAgreeHandler = (res) => {
         const { token, member, emailVerificationRequired, mobileVerificationRequired, sessionToken } = res;
         if (token && member) {
+            onTokenChange(token);
             return onLogin({ token, member });
         }
         if (emailVerificationRequired) {

package/build/src/screens/VerifyLinkPrimaryAccountMobileOTP/hooks/internal/useVerifyLinkPrimaryAccountMobileOTP.js

@@ -12,7 +12,7 @@ const initialTimer = 180;
 const useVerifyLinkPrimaryAccountMobileOTP = ({ sessionToken }) => {
     const [status, setStatus] = useState('timer');
     const [timer, setTimer] = useState(initialTimer);
-    const { onLogin } = useAuthPackageContext();
+    const { onLogin, onTokenChange } = useAuthPackageContext();
     const invalidTimerRef = useRef(null);
     const sessionTokenRef = useRef(sessionToken);
     useInterval(() => {
@@ -47,6 +47,7 @@ const useVerifyLinkPrimaryAccountMobileOTP = ({ sessionToken }) => {
         }).then((res) => {
             const { token, member } = res.data;
             setStatus('valid');
+            onTokenChange(token);
             onLogin({ token, member });
         }).catch((err) => {
             if (err?.response?.status === 400) {

package/build/src/screens/VerifyMobile/hooks/internal/useVerifyMobile.js

@@ -13,7 +13,7 @@ const useVerifyMobile = ({ sessionToken }) => {
     const [sessionTokenState, setSessionToken] = useState(sessionToken || '');
     const [timer, setTimer] = useState(initialTimer);
     const [status, setStatus] = useState('timer');
-    const { onLogin } = useAuthPackageContext();
+    const { onLogin, onTokenChange } = useAuthPackageContext();
     useEffect(() => {
         resendOTP();
     }, []);
@@ -48,6 +48,7 @@ const useVerifyMobile = ({ sessionToken }) => {
             data: { otp, sessionToken: sessionTokenState },
         }).then((res) => {
             const { token, member } = res.data;
+            onTokenChange(token);
             onLogin({ token, member });
             setStatus('valid');
         }).catch((err) => {

package/build/src/screens/Welcome/SocialAuth/hooks/useSocialAuth.native.js

@@ -11,7 +11,7 @@ import appleAuth from '@invertase/react-native-apple-authentication';
 import { axiosClient } from "../../../../api/axiosClient";
 const useSocialAuth = () => {
     const [loading, setLoading] = useState(false);
-    const { onLogin, socialLoginConfig, onRegistrationMethodChange } = useAuthPackageContext();
+    const { onLogin, socialLoginConfig, onRegistrationMethodChange, onTokenChange } = useAuthPackageContext();
     const navigation = useNavigation();
     const googleAppId = socialLoginConfig?.google?.webClientId;
     const loginWithGoogle = useCallback(async () => {
@@ -107,10 +107,8 @@ const useSocialAuth = () => {
                         token: appleAuthResponse.identityToken,
                         source: Platform.OS,
                     });
-                    onLogin({
-                        token: data.token,
-                        member: data.member
-                    });
+                    onTokenChange(data.token);
+                    onLogin({ token: data.token, member: data.member });
                     return;
                 }
                 catch (error) {
@@ -174,10 +172,8 @@ const useSocialAuth = () => {
                     type: 'error'
                 });
             case SocialAuthStatus.SUCCESS:
-                onLogin({
-                    token: result.data.token,
-                    member: result.data.member
-                });
+                onTokenChange(result.data.token);
+                onLogin({ token: result.data.token, member: result.data.member });
                 break;
         }
     };

package/build/src/screens/Welcome/SocialAuth/hooks/web/useFacebookAuth.web.js

@@ -6,7 +6,7 @@ import { handleFacebookAuth } from "../../commonSocialAuth";
 import { showMessage } from "../../../../../helpers/show-message";
 export const useFacebookAuth = () => {
     const [error, setError] = useState(null);
-    const { onLogin, socialLoginConfig, onRegistrationMethodChange } = useAuthPackageContext();
+    const { onLogin, socialLoginConfig, onRegistrationMethodChange, onTokenChange } = useAuthPackageContext();
     const router = useRouter();
     const facebookAppId = socialLoginConfig?.facebook?.webClientId;
     // Load Facebook SDK once
@@ -95,10 +95,8 @@ export const useFacebookAuth = () => {
                                 type: "error",
                             });
                         case "SUCCESS":
-                            onLogin({
-                                token: result.data.token,
-                                member: result.data.member
-                            });
+                            onTokenChange(result.data.token);
+                            onLogin({ token: result.data.token, member: result.data.member });
                             break;
                     }
                 });

package/build/src/screens/Welcome/SocialAuth/hooks/web/useGoogleAuth.web.js

@@ -7,7 +7,7 @@ import { useRouter } from "next/router";
 import { handleGoogleAuth } from "../../commonSocialAuth";
 export const useGoogleAuth = () => {
     const router = useRouter();
-    const { onLogin, socialLoginConfig, onRegistrationMethodChange } = useAuthPackageContext();
+    const { onLogin, socialLoginConfig, onRegistrationMethodChange, onTokenChange } = useAuthPackageContext();
     const googleAppId = socialLoginConfig?.google?.webClientId;
     const onSuccess = async (response) => {
         const { tokenId, profileObj, googleId } = response;
@@ -36,10 +36,8 @@ export const useGoogleAuth = () => {
                     type: "error",
                 });
             case "SUCCESS":
-                onLogin({
-                    token: result.data.token,
-                    member: result.data.member
-                });
+                onTokenChange(result.data.token);
+                onLogin({ token: result.data.token, member: result.data.member });
                 break;
         }
     };

package/build/types/screens/CreatePassword/hooks/internal/useCreatePassword.d.ts

@@ -21,6 +21,6 @@ declare const useCreatePassword: () => {
     handleSkip: ({ onResult }: {
         onResult: () => void;
     }) => void;
-    disabled: boolean;
+    isContinueDisabled: boolean;
 };
 export { useCreatePassword };

package/build/types/screens/ResetPassword/hooks/internal/useResetPassword.d.ts

@@ -24,5 +24,6 @@ declare const useResetPassword: ({ sessionToken }: {
         onResult: () => void;
     }) => void;
     handleConfirmPassword: (text: string) => void;
+    isContinueDisabled: boolean;
 };
 export { useResetPassword };

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "description": "Truworth Auth Package for React Native and Web",
-  "version": "1.2.9",
+  "version": "1.2.11",
   "main": "build/src/index.js",
   "types": "build/types/index.d.ts",
   "files": [
@@ -46,7 +46,7 @@
     "lottie-react": "^2.4.1",
     "lottie-react-native": "6.7.2",
     "moment": "^2.30.1",
-    "next": "^15.0.4",
+    "next": "15.5.9",
     "react": "18.3.1",
     "react-dom": "^18.2.0",
     "react-google-login": "^5.2.2",
@@ -63,7 +63,6 @@
     "react-native-rsa-native": "2.0.5",
     "react-native-safe-area-context": "4.14.0",
     "react-native-svg": "15.8.0",
-    "react-native-svg-uri": "^1.2.3",
     "react-native-vector-icons": "9.2.0",
     "react-redux": "^9.2.0",
     "sweetalert2": "^11.23.0",