fix react rehydration error caused by not evaluating hook in any case.

GBSL-Informatik · Aug 3, 2024 · 9dc25fc · 9dc25fc
1 parent 7c3343e
commit 9dc25fc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/pages/login.tsx b/src/pages/login.tsx
@@ -25,10 +25,10 @@ function HomepageHeader() {
     );
 }
 
-const Login = observer(() => {
+const LoginPage = observer(() => {
     const sessionStore = useStore('sessionStore');
     const { instance } = useMsal();
-    const isAuthenticated = sessionStore.isLoggedIn || useIsAuthenticated();
+    const isAuthenticated = useIsAuthenticated();
     if (isAuthenticated || NO_AUTH) {
         console.log('redirect');
         return <Redirect to={'/user'} />;
@@ -56,4 +56,13 @@ const Login = observer(() => {
         </Layout>
     );
 });
+
+const Login = observer(() => {
+    const sessionStore = useStore('sessionStore');
+    if (sessionStore.isLoggedIn || NO_AUTH) {
+        console.log('redirect');
+        return <Redirect to={'/user'} />;
+    }
+    return <LoginPage />;
+});
 export default Login;
diff --git a/src/stores/SessionStore.ts b/src/stores/SessionStore.ts
@@ -21,7 +21,7 @@ export class SessionStore extends iStore {
 
     @observable.ref private accessor stateRef: State = new State();
 
-    @observable accessor authMethod: 'apiKey' | 'msal';
+    @observable accessor authMethod: 'apiKey' | 'msal' = 'msal';
 
     @observable accessor currentUserId: string | undefined;
 
@@ -39,7 +39,7 @@ export class SessionStore extends iStore {
             () => this.root.userStore?.current?.id,
             (id) => {
                 if (id) {
-                    const user = this.root.userStore.current;
+                    const user = this.root.userStore.current!;
                     Storage.set(StorageKey.SessionStore, {
                         user: { ...user.props, role: Role.USER }
                     });