Feat/sdk disconnect (#93)

Deland-Labs · Aug 6, 2024 · fa72eea · fa72eea
1 parent dd6169b
commit fa72eea
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/apps/wallet/src/stores/session.ts b/apps/wallet/src/stores/session.ts
@@ -15,6 +15,7 @@ import { GetMnemonicResult, UpdateMnemonicInput } from "../apis/models";
 import { AES, enc, MD5 } from "crypto-js";
 import { HIBIT_ENV } from "../utils/env";
 import { getChainByChainId } from "../utils/chain";
+import authManager from "../utils/auth";
 
 const SESSION_CONFIG_KEY = 'hibitIdSessionConfig'
 
@@ -116,12 +117,15 @@ export class HibitIdSession {
     }
   }
 
-  public disconnect = () => {
+  public disconnect = async () => {
     this.auth = null
     this.wallet = null
     this._account = null
     this._mnemonic = null
     this._password = null
+    if (RUNTIME_ENV === RuntimeEnv.SDK) {
+      await authManager.logout()
+    }
   }
 
   public switchChain = async (chain: ChainInfo) => {

diff --git a/apps/wallet/src/utils/auth/index.ts b/apps/wallet/src/utils/auth/index.ts
@@ -2,6 +2,9 @@ import { IAuthenticateProvider } from "./types";
 import { TelegramAuthenticateProvider } from "./providers/telegram";
 import { AuthenticatorType } from "@deland-labs/hibit-id-sdk";
 import { prOidc } from "../oidc";
+import { RUNTIME_ENV } from "../runtime";
+import { RuntimeEnv } from "../basicEnums";
+import rpcManager from "../../stores/rpc";
 
 const HIBIT_ID_WEB = import.meta.env.VITE_HIBIT_ID_WEB
 
@@ -36,6 +39,9 @@ export class AuthManager {
     if (!oidc.isUserLoggedIn) {
       return;
     }
+    if (RUNTIME_ENV === RuntimeEnv.SDK) {
+      rpcManager.notifyAccountsChanged(null)
+    }
     await oidc.logout({
       redirectTo: 'specific url',
       url: HIBIT_ID_WEB,

diff --git a/apps/wallet/src/utils/auth/providers/telegram.ts b/apps/wallet/src/utils/auth/providers/telegram.ts
@@ -28,9 +28,7 @@ export class TelegramAuthenticateProvider implements IAuthenticateProvider {
   public authenticate: (launchParams?: any) => Promise<any> = async (launchParams?: string) => {
     // mini app
     if (launchParams) {
-      // const query = location.hash.slice(1)
-      // window.location.href = `${AUTH_SERVER_URL}Telegram/Login?${query}`
-      sessionStorage.removeItem('telegram-apps/launch-params')
+      // sessionStorage.removeItem('telegram-apps/launch-params')
       window.location.href = `${AUTH_SERVER_URL}Telegram/Login?tgWebAppData=${encodeURIComponent(launchParams)}&returnUrl=${encodeURIComponent(`${location.origin}/oidc-login`)}`
       return
     }
@@ -44,12 +42,8 @@ export class TelegramAuthenticateProvider implements IAuthenticateProvider {
             reject(new Error('Telegram login failed'))
             return
           }
-          // const userData: any = { ...data }
-          // delete userData.hash
-          // delete userData.auth_date
-          // const queryValue = `user=${encodeURIComponent(JSON.stringify(userData))}&auth_date=${data.auth_date}&hash=${data.hash}`
           const queryValue = objToQuery(data)
-          sessionStorage.removeItem('telegram-apps/launch-params')
+          // sessionStorage.removeItem('telegram-apps/launch-params')
           window.location.href = `${AUTH_SERVER_URL}Telegram/WebLogin?${queryValue}&returnUrl=${encodeURIComponent(`${location.origin}/oidc-login`)}`
           resolve(true)
         },

diff --git a/packages/sdk/src/lib/wallet.tsx b/packages/sdk/src/lib/wallet.tsx
@@ -52,7 +52,6 @@ export class HibitIdWallet {
       if (this._hasSession) {
         this.showIframe()
       }
-      // this._iframe!.show({ fullscreen: true, style: {} })
       const res = await this._rpc!.call<ConnectResponse>(HibitIdExposeRPCMethod.CONNECT, {
         chainId,
       })
@@ -62,7 +61,6 @@ export class HibitIdWallet {
       this._iframe!.hide()
       this._controller?.setOpen(false)
       this._connected = true
-      // this._controller = new HibitIdController(this.toggleIframe)
       console.log('[hibit id connected]')
 
       return {