Merge branch 'feat/auth-methods' into deploy/dev

langgenius · Oct 15, 2024 · a05f249 · a05f249
2 parents 0f0326c + 7f9278e
commit a05f249
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/web/app/signin/invite-settings/page.tsx b/web/app/signin/invite-settings/page.tsx
@@ -52,15 +52,16 @@ export default function InviteSettingsPage() {
         },
       })
       if (res.result === 'success') {
-        localStorage.setItem('console_token', res.data)
+        localStorage.setItem('console_token', res.data.access_token)
+        localStorage.setItem('refresh_token', res.data.refresh_token)
         setLocaleOnClient(language, false)
         router.replace('/apps')
       }
     }
     catch {
       recheck()
     }
-  }, [language, name, recheck, setLocaleOnClient, timezone, token, router])
+  }, [language, name, recheck, setLocaleOnClient, timezone, token, router, t])
 
   if (!checkRes)
     return <Loading />

diff --git a/web/service/common.ts b/web/service/common.ts
@@ -174,8 +174,8 @@ export const invitationCheck: Fetcher<CommonResponse & { is_valid: boolean; data
   return get<CommonResponse & { is_valid: boolean; data: { workspace_name: string; email: string; workspace_id: string } }>(url, { params })
 }
 
-export const activateMember: Fetcher<CommonResponse & { data: string }, { url: string; body: any }> = ({ url, body }) => {
-  return post<CommonResponse & { data: string }>(url, { body })
+export const activateMember: Fetcher<LoginResponse, { url: string; body: any }> = ({ url, body }) => {
+  return post<LoginResponse>(url, { body })
 }
 
 export const fetchModelProviders: Fetcher<{ data: ModelProvider[] }, string> = (url) => {