fix: update logout function

Authing · Aug 25, 2022 · e65864a · e65864a
1 parent f504a5e
commit e65864a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/examples/guard/src/config.ts b/examples/guard/src/config.ts
@@ -1,7 +1,7 @@
 import { GuardOptions } from '@authing/guard'
 
 export const guardOptions: GuardOptions = {
-  appId: '62e8d32e4feac0ba0a75edf5',
+  appId: '62e7f0c91073aaba0db4d65b',
   // host: 'https://ipehegkanbpgkdho-demo.authing.cn',
   align: 'center'
 }
diff --git a/examples/guard/src/pages/Jump.tsx b/examples/guard/src/pages/Jump.tsx
@@ -8,10 +8,16 @@ export default function Jump() {
 
   const onLogin = () => guard.startWithRedirect()
 
+  const checkLoginStatus = async () => {
+    const user = await guard.checkLoginStatus()
+    console.log('user: ', user)
+  }
+
   return (
     <div>
       <div>
         <button onClick={onLogin}>登录</button>
+        <button onClick={checkLoginStatus}>checkLoginStatus</button>
       </div>
     </div>
   )

diff --git a/examples/guard/src/pages/Login.tsx b/examples/guard/src/pages/Login.tsx
@@ -34,6 +34,11 @@ export default function Login () {
     guardEffects()
   }, [])
 
+  const checkLoginStatus = async () => {
+    const user = await guard.checkLoginStatus()
+    console.log('user: ', user)
+  }
+
   const onmountGuard = () => guard.unmount()
 
   const startRegister = () => guard.startRegister()
@@ -55,10 +60,7 @@ export default function Login () {
     console.log('userInfo: ', userInfo)
   }
 
-  const checkLoginStatus = async () => {
-    const user = await guard.checkLoginStatus()
-    console.log('user: ', user)
-  }
+  const onLogout = () => guard.logout()
 
   return <>
     <div style={{ marginBottom: '100px' }}>
@@ -67,6 +69,7 @@ export default function Login () {
       <button onClick={changeLang}>changeLang</button>
       <button onClick={getUserInfo}>getUserInfo</button>
       <button onClick={checkLoginStatus}>checkLoginStatus</button>
+      <button onClick={onLogout}>onLogout</button>
     </div>
 
     <div id="guard-container"></div>

diff --git a/packages/guard/src/index.tsx b/packages/guard/src/index.tsx
@@ -309,12 +309,22 @@ export class Guard {
   }
 
   async logout() {
-    const redirectUri = window.location.origin
+    const publicConfig = await this.then()
+
+    let redirectUri = ''
+    try {
+      redirectUri = publicConfig.logoutRedirectUris[0]
+    } catch (e) {
+      redirectUri = window.location.origin
+    }
+
     const idToken = localStorage.getItem('idToken')
     let logoutUrl = ''
 
     const authClient = await this.getAuthClient()
 
+    authClient.logout()
+
     if (idToken) {
       logoutUrl = authClient.buildLogoutUrl({
         expert: true,