v4.5.3

src/components/TopNav.js

@@ -49,6 +49,7 @@ function TopNav({ isMaintenance, loggedIn = false }) {
       appState.update((s) => {
         s.auth = false;
       });
+      setPersistedUser({ theme });
     }
     navigate('/');
   };

src/components/auth/SignIn.js

@@ -14,13 +14,12 @@ import usePersistedUser from '../../functions/state/persistedUser';
 function SignIn() {
   const { search } = useLocation();
   const { user, token } = queryString.parse(search, { decode: false });
-  const auth = useStoreState(appState, (s) => s.auth);
   const theme = useStoreState(appState, (s) => s.theme);
   const [formState, setFormState] = useState({});
   const [formData, setFormData] = useState({});
   const [persistedUser, setPersistedUser] = usePersistedUser({});
 
-  const submit = () => {
+  const submit = async () => {
     setFormState({ submitted: true });
     const { email, pass } = formData;
     if (!isEmail(email)) {
@@ -31,23 +30,17 @@ function SignIn() {
       setFormState({ error: 'portal access denied' });
     } else {
       setFormState({ processing: true });
-      setPersistedUser({ ...persistedUser, email, pass });
-      getUser({ email, pass, loggingIn: true });
-    }
-  };
 
-  useEffect(() => {
-    if (auth?.error) {
-      setFormState({ error: ['Unauthorized', 'User does not exist'].includes(auth.message) ? 'Login Failed' : auth.message });
-      setTimeout(() => setFormState({}), 3000);
-    }
-  }, [auth]);
+      const newAuth = await getUser({ email, pass, loggingIn: true });
 
-  useEffect(
-    () => !formState.submitted && setFormState({}),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [formData],
-  );
+      if (!newAuth || newAuth?.error) {
+        setFormState({ error: ['Unauthorized', 'User does not exist'].includes(newAuth?.message) ? 'Login Failed' : newAuth?.message || 'Login Failed' });
+        setTimeout(() => setFormState({}), 5000);
+      } else {
+        setPersistedUser({ ...persistedUser, email, pass });
+      }
+    }
+  };
 
   useEffect(() => {
     if (user && token) {

src/functions/api/lms/getUser.js

@@ -36,9 +36,12 @@ export default async ({ email, pass, loggingIn = false, signal }) => {
       response.orgs = [response.orgs];
     }
 
-    return appState.update((s) => {
-      s.auth = { email, pass, ...response };
+    const newAuth = { email, pass, ...response };
+    appState.update((s) => {
+      s.auth = newAuth;
     });
+
+    return newAuth;
   } catch (e) {
     if (!loggingIn) {
       addError({