@opexa/portal-components 0.0.434 → 0.0.436

package/dist/client/hooks/useIdleLogout.d.ts

@@ -1 +1,4 @@
-export declare function useIdleLogout(timer?: number): void;
+export declare function useIdleLogout(timer?: number): {
+    isIdle: boolean;
+    isLoggingOut: boolean;
+};

package/dist/client/hooks/useIdleLogout.js

@@ -14,68 +14,58 @@ export function useIdleLogout(timer = DEFAULT_IDLE_TIMER) {
     const isLoggingOut = useRef(false);
     const signOutMutation = useSignOutMutation({
         onSuccess: () => {
-            router.refresh();
+            router.push("/");
             localStorage.removeItem(IDLE_TIMESTAMP_KEY);
+            logoutInitiated.current = false;
+            isLoggingOut.current = false;
         },
         onError: () => {
             isLoggingOut.current = false;
+            logoutInitiated.current = false;
         },
     });
     const isIdle = useIdle(timer);
-    const sessionStatusRef = useRef(sessionQuery.data?.status);
-    sessionStatusRef.current = sessionQuery.data?.status;
     useEffect(() => {
-        const handleUnload = () => {
-            if (sessionStatusRef.current === 'authenticated' && !isLoggingOut.current) {
-                localStorage.setItem(IDLE_TIMESTAMP_KEY, Date.now().toString());
-            }
-        };
-        if (sessionQuery.data?.status === 'authenticated') {
-            const lastActivityTimestamp = localStorage.getItem(IDLE_TIMESTAMP_KEY);
-            if (lastActivityTimestamp) {
-                localStorage.removeItem(IDLE_TIMESTAMP_KEY);
-                const timeElapsed = Date.now() - parseInt(lastActivityTimestamp, 10);
-                if (timeElapsed > timer) {
-                    if (!logoutInitiated.current) {
-                        logoutInitiated.current = true;
-                        setTimeout(() => {
-                            toaster.warning({
-                                title: 'You have been away for a while.',
-                                description: 'You have been logged out for inactivity.',
-                            });
-                            isLoggingOut.current = true;
-                            signOutMutation.mutate();
-                        }, 0);
-                    }
-                    return;
-                }
-            }
-            window.addEventListener('beforeunload', handleUnload);
-        }
-        else {
+        if (sessionQuery.data?.status === 'unauthenticated') {
+            logoutInitiated.current = false;
+            isLoggingOut.current = false;
             localStorage.removeItem(IDLE_TIMESTAMP_KEY);
         }
-        return () => {
-            window.removeEventListener('beforeunload', handleUnload);
-        };
-    }, [sessionQuery.data?.status, signOutMutation, timer]);
+    }, [sessionQuery.data?.status]);
     useEffect(() => {
-        if (isIdle && sessionQuery.data?.status === 'authenticated') {
-            if (logoutInitiated.current) {
-                return;
-            }
-            logoutInitiated.current = true;
-            setTimeout(() => {
-                toaster.warning({
-                    title: 'You have been idle for a while.',
-                    description: 'You will be logged out for inactivity.',
-                });
-                isLoggingOut.current = true;
-                signOutMutation.mutate();
-            }, 0);
-        }
-        else {
-            logoutInitiated.current = false;
+        if (sessionQuery.data?.status === 'unauthenticated' || !isIdle || logoutInitiated.current || isLoggingOut.current) {
+            return;
         }
+        const handleIdleLogout = async () => {
+            logoutInitiated.current = true;
+            isLoggingOut.current = true;
+            const timestamp = Date.now().toString();
+            localStorage.setItem(IDLE_TIMESTAMP_KEY, timestamp);
+            toaster.warning({ description: 'You have been logged out due to inactivity.' });
+            try {
+                await signOutMutation.mutateAsync();
+            }
+            catch {
+                logoutInitiated.current = false;
+                isLoggingOut.current = false;
+            }
+        };
+        handleIdleLogout();
     }, [isIdle, sessionQuery.data?.status, signOutMutation]);
+    useEffect(() => {
+        const handleStorageChange = (e) => {
+            if (e.key === IDLE_TIMESTAMP_KEY && e.newValue && sessionQuery.data?.status === 'authenticated') {
+                if (!logoutInitiated.current) {
+                    logoutInitiated.current = true;
+                    router.push('/');
+                }
+            }
+        };
+        window.addEventListener('storage', handleStorageChange);
+        return () => window.removeEventListener('storage', handleStorageChange);
+    }, [router, sessionQuery.data?.status]);
+    return {
+        isIdle,
+        isLoggingOut: isLoggingOut.current,
+    };
 }

package/dist/components/SignUp/SignUpDefault/SignUpDefaultForm.js

@@ -83,7 +83,7 @@ export function SignUpDefaultForm() {
         }),
         firstName: z
             .string()
-            .regex(/^[a-z0-9 ]+$/gi, 'First name must contain only letters')
+            .regex(/^[a-z ]+$/gi, 'First name must contain only letters')
             .transform((val) => val.trim())
             .refine((val) => val.length >= 2, {
             message: 'First name must be 2 or more characters',
@@ -93,7 +93,7 @@ export function SignUpDefaultForm() {
         }),
         lastName: z
             .string()
-            .regex(/^[a-z0-9 ]+$/gi, 'Last name must contain only letters')
+            .regex(/^[a-z ]+$/gi, 'Last name must contain only letters')
             .transform((val) => val.trim())
             .refine((val) => val.length >= 2, {
             message: 'Last name must be 2 or more characters',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@opexa/portal-components",
-	"version": "0.0.434",
+	"version": "0.0.436",
 	"exports": {
 		"./ui/*": {
 			"types": "./dist/ui/*/index.d.ts",