fix: clear siwx sessions on disconnect

.changeset/rude-peaches-kick.md

@@ -0,0 +1,22 @@
+---
+'@reown/appkit': patch
+'@reown/appkit-core': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-cli': patch
+'@reown/appkit-common': patch
+'@reown/appkit-experimental': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-siwx': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wallet': patch
+'@reown/appkit-wallet-button': patch
+---
+
+Clear SIWX sessions when calling ConnectionController.disconnect

packages/appkit/src/tests/siwe.test.ts

@@ -1,5 +1,11 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { ModalController, OptionsController, RouterController, SIWXUtil } from '@reown/appkit-core'
+import {
+  ConnectionController,
+  ModalController,
+  OptionsController,
+  RouterController,
+  SIWXUtil
+} from '@reown/appkit-core'
 import { AppKit } from '@reown/appkit'
 import * as networks from '@reown/appkit/networks'
 import { createSIWEConfig, type AppKitSIWEClient } from '@reown/appkit-siwe'
@@ -57,10 +63,15 @@ describe('SIWE mapped to SIWX', () => {
     })
 
     // Wait for the appkit to be ready
-    await new Promise(resolve => setTimeout(resolve, 1))
+    await new Promise(resolve => setTimeout(resolve, 100))
 
     // Set CAIP address to represent connected state
     appkit.setCaipAddress('eip155:1:mock-address', 'eip155')
+    appkit.setCaipNetwork({
+      ...networks.mainnet,
+      caipNetworkId: 'eip155:1',
+      chainNamespace: 'eip155'
+    })
   })
 
   it('should fulfill siwx', () => {
@@ -170,6 +181,16 @@ describe('SIWE mapped to SIWX', () => {
         signature: 'mock-signature'
       })
     })
+
+    it('should clear sessions on Connection.disconnect', async () => {
+      const signOutSpy = vi.spyOn(siweConfig.methods, 'signOut')
+      const setSessionsSpy = vi.spyOn(OptionsController.state.siwx!, 'setSessions')
+
+      await ConnectionController.disconnect()
+
+      expect(signOutSpy).toHaveBeenCalled()
+      expect(setSessionsSpy).toHaveBeenCalledWith([])
+    })
   })
 
   describe('siweConfig should still work outside of AppKit', () => {

packages/core/src/controllers/ConnectionController.ts

@@ -16,7 +16,7 @@ import { ModalController } from './ModalController.js'
 import { ConnectorController } from './ConnectorController.js'
 import { EventsController } from './EventsController.js'
 import type { CaipNetwork, ChainNamespace } from '@reown/appkit-common'
-import { OptionsController } from './OptionsController.js'
+import { SIWXUtil } from '../utils/SIWXUtil.js'
 
 // -- Types --------------------------------------------- //
 export interface ConnectExternalOptions {
@@ -249,16 +249,7 @@ export const ConnectionController = {
 
   async disconnect() {
     try {
-      const siwx = OptionsController.state.siwx
-      if (siwx) {
-        const activeCaipNetwork = ChainController.getActiveCaipNetwork()
-        const address = CoreHelperUtil.getPlainAddress(ChainController.getActiveCaipAddress())
-
-        if (activeCaipNetwork && address) {
-          await siwx.revokeSession(activeCaipNetwork.caipNetworkId, address)
-        }
-      }
-
+      await SIWXUtil.clearSessions()
       await ChainController.disconnect()
     } catch (error) {
       throw new Error('Failed to disconnect')

packages/core/src/utils/SIWXUtil.ts

@@ -276,6 +276,13 @@ export const SIWXUtil = {
         AccountController.state.preferredAccountType ===
         W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT
     }
+  },
+  async clearSessions() {
+    const siwx = this.getSIWX()
+
+    if (siwx) {
+      await siwx.setSessions([])
+    }
   }
 }