@truworth/twc-auth 1.2.10 → 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/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/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/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/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "description": "Truworth Auth Package for React Native and Web",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "main": "build/src/index.js",
   "types": "build/types/index.d.ts",
   "files": [