Merge branch 'master' into login-error-msg-timeout

.env

@@ -18,4 +18,5 @@ REACT_APP_TERMS_LINK='https://www.float.sg/terms'
 REACT_APP_CONTACT_LINK='https://www.float.sg/contact'
 REACT_APP_ABOUT_LINK='https://www.float.sg/about'
 
-REACT_APP_LOGIN_ERROR_TIMEOUT=5000
+REACT_APP_LOGIN_ERROR_TIMEOUT=5000
+REACT_APP_LOGOUT_SESSION_TIMEOUT=300000

src/app/modules/auth/core/Auth.tsx

@@ -8,6 +8,7 @@ import {
   Dispatch,
   SetStateAction,
 } from 'react'
+import {useLocation} from 'react-router-dom'
 import {LayoutSplashScreen} from '../../../../_res/layout/core'
 import {AuthModel, UserModel} from './_models'
 import * as authHelper from './AuthHelpers'
@@ -61,6 +62,7 @@ const AuthProvider: FC<WithChildren> = ({children}) => {
 }
 
 const AuthInit: FC<WithChildren> = ({children}) => {
+  const {pathname} = useLocation()
   const {auth, logout, setCurrentUser} = useAuth()
   const didRequest = useRef(false)
   const [showSplashScreen, setShowSplashScreen] = useState(true)
@@ -95,8 +97,17 @@ const AuthInit: FC<WithChildren> = ({children}) => {
       logout()
       setShowSplashScreen(false)
     }
+
+    // adding a timeout for 5mins 
+    const logOutSession = setTimeout(() => {
+      logout()
+    }, Number(process.env.REACT_APP_LOGOUT_SESSION_TIMEOUT))
+    
+    return (() => {
+      clearInterval(logOutSession)
+    })
     // eslint-disable-next-line
-  }, [])
+  }, [pathname])
 
   return showSplashScreen ? <LayoutSplashScreen /> : <>{children}</>
 }