Merge pull request #2095 from AmbireTech/update/revoke-all-policies-method

feat: add revokeAllPoliciesForDomain method and corresponding tests

Author: gergana95

src/controllers/autoLogin/autoLogin.test.ts

@@ -576,4 +576,111 @@ URI: https://docs.fileverse.io
 
     expect(controller.getAccountPolicies(EOA_ACC.addr)).toEqual([])
   })
+  it('revokeAllPoliciesForDomain works', async () => {
+    const POLICY_1: AutoLoginPolicy = {
+      domain: 'docs.fileverse.io',
+      uriPrefix: 'https://docs.fileverse.io/login',
+      allowedChains: [1],
+      allowedResources: ['https://privy.io'],
+      supportsEIP6492: false,
+      expiresAt: Date.now() + 60000,
+      lastAuthenticated: Date.now()
+    }
+
+    const POLICY_2: AutoLoginPolicy = {
+      domain: 'docs.fileverse.io',
+      uriPrefix: 'https://docs.fileverse.io/admin',
+      allowedChains: [1, 137],
+      allowedResources: ['https://privy.io'],
+      supportsEIP6492: false,
+      expiresAt: Date.now() + 60000,
+      lastAuthenticated: Date.now()
+    }
+
+    const OTHER_DOMAIN_POLICY: AutoLoginPolicy = {
+      domain: 'other-site.com',
+      uriPrefix: 'https://other-site.com/login',
+      allowedChains: [1],
+      allowedResources: [],
+      supportsEIP6492: false,
+      expiresAt: Date.now() + 60000,
+      lastAuthenticated: Date.now()
+    }
+
+    const { controller } = await prepareTest((s) => {
+      return s.set('autoLoginPolicies', {
+        [EOA_ACC.addr]: [POLICY_1, POLICY_2, OTHER_DOMAIN_POLICY]
+      })
+    })
+
+    expect(controller.getAccountPolicies(EOA_ACC.addr)).toEqual([
+      POLICY_1,
+      POLICY_2,
+      OTHER_DOMAIN_POLICY
+    ])
+
+    await controller.revokeAllPoliciesForDomain(
+      'docs.fileverse.io',
+      'https://docs.fileverse.io/login'
+    )
+    await controller.revokeAllPoliciesForDomain(
+      'docs.fileverse.io',
+      'https://docs.fileverse.io/admin'
+    )
+
+    expect(controller.getAccountPolicies(EOA_ACC.addr)).toEqual([OTHER_DOMAIN_POLICY])
+  })
+
+  it('revokeAllPoliciesForDomain removes policies across multiple accounts', async () => {
+    const SHARED_POLICY: AutoLoginPolicy = {
+      domain: 'docs.fileverse.io',
+      uriPrefix: 'https://docs.fileverse.io/login',
+      allowedChains: [1],
+      allowedResources: ['https://privy.io'],
+      supportsEIP6492: false,
+      expiresAt: Date.now() + 60000,
+      lastAuthenticated: Date.now()
+    }
+
+    const EOA_POLICY: AutoLoginPolicy = {
+      domain: 'eoa-only.com',
+      uriPrefix: 'https://eoa-only.com/login',
+      allowedChains: [1],
+      allowedResources: [],
+      supportsEIP6492: false,
+      expiresAt: Date.now() + 60000,
+      lastAuthenticated: Date.now()
+    }
+
+    const HW_POLICY: AutoLoginPolicy = {
+      domain: 'hw-only.com',
+      uriPrefix: 'https://hw-only.com/login',
+      allowedChains: [137],
+      allowedResources: [],
+      supportsEIP6492: false,
+      expiresAt: Date.now() + 60000,
+      lastAuthenticated: Date.now()
+    }
+
+    const { controller } = await prepareTest((s) => {
+      return s.set('autoLoginPolicies', {
+        [EOA_ACC.addr]: [SHARED_POLICY, EOA_POLICY],
+        [HW_ACC.addr]: [SHARED_POLICY, HW_POLICY]
+      })
+    })
+
+    // Verify initial state
+    expect(controller.getAccountPolicies(EOA_ACC.addr)).toEqual([SHARED_POLICY, EOA_POLICY])
+    expect(controller.getAccountPolicies(HW_ACC.addr)).toEqual([SHARED_POLICY, HW_POLICY])
+
+    // Remove the shared policy from all accounts
+    await controller.revokeAllPoliciesForDomain(
+      'docs.fileverse.io',
+      'https://docs.fileverse.io/login'
+    )
+
+    // Verify the shared policy is removed from both accounts, but other policies remain
+    expect(controller.getAccountPolicies(EOA_ACC.addr)).toEqual([EOA_POLICY])
+    expect(controller.getAccountPolicies(HW_ACC.addr)).toEqual([HW_POLICY])
+  })
 })

src/controllers/autoLogin/autoLogin.ts

@@ -24,7 +24,8 @@ import EventEmitter from '../eventEmitter/eventEmitter'
 import { SignMessageController } from '../signMessage/signMessage'
 
 export const STATUS_WRAPPED_METHODS = {
-  revokePolicy: 'INITIAL'
+  revokePolicy: 'INITIAL',
+  revokeAllPoliciesForDomain: 'INITIAL'
 } as const
 
 // Taken from viem's parseSiweMessage.ts
@@ -354,6 +355,24 @@ export class AutoLoginController extends EventEmitter implements IAutoLoginContr
     })
   }
 
+  async revokeAllPoliciesForDomain(policyDomain: string, policyUriPrefix: string) {
+    await this.initialLoadPromise
+
+    await this.withStatus('revokeAllPoliciesForDomain', async () => {
+      Object.keys(this.#policiesByAccount).forEach((accountAddress) => {
+        const accountPolicies = this.#policiesByAccount[accountAddress] || []
+
+        if (accountPolicies.length === 0) return
+
+        this.#policiesByAccount[accountAddress] = accountPolicies.filter(
+          (p) => !(p.domain === policyDomain && p.uriPrefix === policyUriPrefix)
+        )
+      })
+
+      await this.#storage.set('autoLoginPolicies', this.#policiesByAccount)
+    })
+  }
+
   async onSiweMessageSigned(
     parsedSiwe: SiweMessageType,
     isAutoLoginEnabledByUser: boolean,