From 4b73ace2f0387ea4370b41239b398c294041d63f Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Fri, 23 Feb 2024 10:39:35 +0300
Subject: [PATCH] session-modal-hotfix

---
 src/context/session.tsx | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/context/session.tsx b/src/context/session.tsx
index 8da23006..67495f73 100644
--- a/src/context/session.tsx
+++ b/src/context/session.tsx
@@ -92,30 +92,34 @@ export const SessionProvider = (props: {
   const authorizer = createMemo(() => new Authorizer(config()))
   const [oauthState, setOauthState] = createSignal<string>()
 
-  // handle callback's redirect_uri
-  createEffect(() => {
-    // oauth
-    const state = searchParams()?.state
-    if (state) {
-      setOauthState((_s) => state)
-      const scope = searchParams()?.scope
-        ? searchParams()?.scope?.toString().split(' ')
-        : ['openid', 'profile', 'email']
-      if (scope) console.info(`[context.session] scope: ${scope}`)
-      const url = searchParams()?.redirect_uri || searchParams()?.redirectURL || window.location.href
-      setConfig((c: ConfigType) => ({ ...c, redirectURL: url.split('?')[0] }))
-      changeSearchParams({ mode: 'confirm-email', modal: 'auth' }, true)
-    }
-  })
+  // handle auth state callback
+  createEffect(
+    on(
+      () => searchParams()?.state,
+      (state) => {
+        if (state) {
+          setOauthState((_s) => state)
+          const scope = searchParams()?.scope
+            ? searchParams()?.scope?.toString().split(' ')
+            : ['openid', 'profile', 'email']
+          if (scope) console.info(`[context.session] scope: ${scope}`)
+          const url = searchParams()?.redirect_uri || searchParams()?.redirectURL || window.location.href
+          setConfig((c: ConfigType) => ({ ...c, redirectURL: url.split('?')[0] }))
+          changeSearchParams({ mode: 'confirm-email', m: 'auth' }, true)
+        }
+      },
+      { defer: true }
+    )
+  )
 
-  // handle email confirm
+  // handle token confirm
   createEffect(() => {
     const token = searchParams()?.token
     const access_token = searchParams()?.access_token
     if (access_token)
       changeSearchParams({
         mode: 'confirm-email',
-        modal: 'auth',
+        m: 'auth',
         access_token,
       })
     else if (token) changeSearchParams({ mode: 'change-password', modal: 'auth', token })