-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
chore: integrate @metamask/gator-permissions-controller #20006
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
jeffsmale90
merged 10 commits into
main
from
feat/integrate-gator-permissions-controller
Sep 22, 2025
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
bb1b21b
Integrate @metamask/gator-permissions-controller. Presently it doesn'…
jeffsmale90 c2abce6
Add gator-permissions-controller-init.ts and gator-permissions-contro…
jeffsmale90 f5e7d22
Merge branch 'main' into feat/integrate-gator-permissions-controller
jeffsmale90 7e600ec
Merge branch 'main' into feat/integrate-gator-permissions-controller
jeffsmale90 42257b1
Merge branch 'main' into feat/integrate-gator-permissions-controller
jeffsmale90 420a352
Merge branch 'main' into feat/integrate-gator-permissions-controller
jeffsmale90 da055e2
Merge branch 'main' into feat/integrate-gator-permissions-controller
jeffsmale90 3f6d636
Add @MetaMask/delegation to codeowners for delegation specific code
jeffsmale90 c5cc68a
Merge branch 'main' into feat/integrate-gator-permissions-controller
jeffsmale90 98652a2
Add gator-permissions-controller-messenger to CODEOWNERS
jeffsmale90 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
152 changes: 152 additions & 0 deletions
152
...Engine/controllers/gator-permissions-controller/gator-permissions-controller-init.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| import { GatorPermissionsController } from '@metamask/gator-permissions-controller'; | ||
| import { buildControllerInitRequestMock } from '../../utils/test-utils'; | ||
| import type { ControllerInitRequest } from '../../types'; | ||
| import { isGatorPermissionsFeatureEnabled } from '../../../../util/environment'; | ||
| import { | ||
| getGatorPermissionsControllerMessenger, | ||
| GatorPermissionsControllerMessenger, | ||
| } from '../../messengers/gator-permissions-controller-messenger/gator-permissions-controller-messenger'; | ||
| import { GatorPermissionsControllerInit } from './gator-permissions-controller-init'; | ||
| import { ExtendedControllerMessenger } from '../../../ExtendedControllerMessenger'; | ||
|
|
||
| jest.mock('@metamask/gator-permissions-controller'); | ||
| jest.mock('../../../../util/environment'); | ||
|
|
||
| function buildInitRequestMock(): jest.Mocked< | ||
| ControllerInitRequest<GatorPermissionsControllerMessenger> | ||
| > { | ||
| const baseControllerMessenger = new ExtendedControllerMessenger(); | ||
|
|
||
| return { | ||
| ...buildControllerInitRequestMock(baseControllerMessenger), | ||
| controllerMessenger: getGatorPermissionsControllerMessenger( | ||
| baseControllerMessenger, | ||
| ), | ||
| initMessenger: undefined, | ||
| }; | ||
| } | ||
|
|
||
| describe('GatorPermissionsControllerInit', () => { | ||
| const MOCK_GATOR_PERMISSIONS_PROVIDER_SNAP_ID = 'npm:mock-snap-id'; | ||
| const GatorPermissionsControllerClassMock = jest.mocked( | ||
| GatorPermissionsController, | ||
| ); | ||
| const originalGatorPermissionProviderSnapId = | ||
| process.env.GATOR_PERMISSIONS_PROVIDER_SNAP_ID; | ||
|
|
||
| beforeEach(() => { | ||
| jest.resetAllMocks(); | ||
| jest.mocked(isGatorPermissionsFeatureEnabled).mockReturnValue(true); | ||
| process.env.GATOR_PERMISSIONS_PROVIDER_SNAP_ID = | ||
| MOCK_GATOR_PERMISSIONS_PROVIDER_SNAP_ID; | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| if (originalGatorPermissionProviderSnapId) { | ||
| process.env.GATOR_PERMISSIONS_PROVIDER_SNAP_ID = | ||
| originalGatorPermissionProviderSnapId; | ||
| } else { | ||
| delete process.env.GATOR_PERMISSIONS_PROVIDER_SNAP_ID; | ||
| } | ||
| }); | ||
|
|
||
| it('returns controller instance', () => { | ||
| const requestMock = buildInitRequestMock(); | ||
| expect( | ||
| GatorPermissionsControllerInit(requestMock).controller, | ||
| ).toBeInstanceOf(GatorPermissionsController); | ||
| }); | ||
|
|
||
| it('initializes with correct messenger and state(gator permissions feature enabled)', () => { | ||
| const requestMock = buildInitRequestMock(); | ||
| jest.mocked(isGatorPermissionsFeatureEnabled).mockReturnValue(true); | ||
| GatorPermissionsControllerInit(requestMock); | ||
|
|
||
| expect(GatorPermissionsControllerClassMock).toHaveBeenCalledWith({ | ||
| messenger: requestMock.controllerMessenger, | ||
| state: { | ||
| isGatorPermissionsEnabled: true, | ||
| gatorPermissionsProviderSnapId: MOCK_GATOR_PERMISSIONS_PROVIDER_SNAP_ID, | ||
| ...requestMock.persistedState.GatorPermissionsController, | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| it('initializes with correct messenger and state(gator permissions feature disabled)', () => { | ||
| const requestMock = buildInitRequestMock(); | ||
| jest.mocked(isGatorPermissionsFeatureEnabled).mockReturnValue(false); | ||
| GatorPermissionsControllerInit(requestMock); | ||
|
|
||
| expect(GatorPermissionsControllerClassMock).toHaveBeenCalledWith({ | ||
| messenger: requestMock.controllerMessenger, | ||
| state: { | ||
| isGatorPermissionsEnabled: false, | ||
| gatorPermissionsProviderSnapId: MOCK_GATOR_PERMISSIONS_PROVIDER_SNAP_ID, | ||
| ...requestMock.persistedState.GatorPermissionsController, | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| it('handles undefined persistedState.GatorPermissionsController', () => { | ||
| const requestMock = buildInitRequestMock(); | ||
| requestMock.persistedState.GatorPermissionsController = undefined; | ||
| jest.mocked(isGatorPermissionsFeatureEnabled).mockReturnValue(true); | ||
|
|
||
| GatorPermissionsControllerInit(requestMock); | ||
|
|
||
| expect(GatorPermissionsControllerClassMock).toHaveBeenCalledWith({ | ||
| messenger: requestMock.controllerMessenger, | ||
| state: { | ||
| isGatorPermissionsEnabled: true, | ||
| gatorPermissionsProviderSnapId: MOCK_GATOR_PERMISSIONS_PROVIDER_SNAP_ID, | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| it('resolves the default when GATOR_PERMISSIONS_PROVIDER_SNAP_ID is not specified', () => { | ||
| const requestMock = buildInitRequestMock(); | ||
|
|
||
| delete process.env.GATOR_PERMISSIONS_PROVIDER_SNAP_ID; | ||
|
|
||
| GatorPermissionsControllerInit(requestMock); | ||
|
|
||
| expect(GatorPermissionsControllerClassMock).toHaveBeenCalledWith({ | ||
| messenger: requestMock.controllerMessenger, | ||
| state: { | ||
| isGatorPermissionsEnabled: true, | ||
| }, | ||
| }); | ||
|
|
||
| const calledWithState = | ||
| GatorPermissionsControllerClassMock.mock.calls[0][0].state; | ||
|
|
||
| expect(calledWithState).toEqual({ | ||
| isGatorPermissionsEnabled: true, | ||
| }); | ||
|
|
||
| // GatorPermissionsController requires that the key does not exist if the snap id is not specified | ||
| expect( | ||
| Object.prototype.hasOwnProperty.call( | ||
| calledWithState, | ||
| 'gatorPermissionsProviderSnapId', | ||
| ), | ||
| ).toBe(false); | ||
| }); | ||
|
|
||
| describe('GATOR_PERMISSIONS_PROVIDER_SNAP_ID incorrectly specified', () => { | ||
| ['', ' ', 'invalid-snap-id'].forEach((invalidSnapId) => { | ||
| it(`throws when provided invalid GATOR_PERMISSIONS_PROVIDER_SNAP_ID: ${invalidSnapId}`, () => { | ||
| const requestMock = buildInitRequestMock(); | ||
|
|
||
| process.env.GATOR_PERMISSIONS_PROVIDER_SNAP_ID = | ||
| invalidSnapId as string; | ||
|
|
||
| expect(() => GatorPermissionsControllerInit(requestMock)).toThrow( | ||
| 'GATOR_PERMISSIONS_PROVIDER_SNAP_ID must be set to a valid snap id', | ||
| ); | ||
|
|
||
| expect(GatorPermissionsControllerClassMock).not.toHaveBeenCalled(); | ||
| }); | ||
| }); | ||
| }); | ||
| }); |
55 changes: 55 additions & 0 deletions
55
...core/Engine/controllers/gator-permissions-controller/gator-permissions-controller-init.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| import type { ControllerInitFunction } from '../../types'; | ||
| import type { GatorPermissionsControllerMessenger } from '../../messengers/gator-permissions-controller-messenger/gator-permissions-controller-messenger'; | ||
| import { | ||
| GatorPermissionsController, | ||
| GatorPermissionsControllerState, | ||
| } from '@metamask/gator-permissions-controller'; | ||
| import { isSnapId } from '@metamask/snaps-utils'; | ||
| import { isGatorPermissionsFeatureEnabled } from '../../../../util/environment'; | ||
|
|
||
| const generateDefaultGatorPermissionsControllerState = | ||
| (): Partial<GatorPermissionsControllerState> => { | ||
| const gatorPermissionsProviderSnapId = | ||
| process.env.GATOR_PERMISSIONS_PROVIDER_SNAP_ID; | ||
|
|
||
| // if GATOR_PERMISSIONS_PROVIDER_SNAP_ID is not specified, GatorPermissionsController will initialize it's default | ||
| if ( | ||
| gatorPermissionsProviderSnapId !== undefined && | ||
| !isSnapId(gatorPermissionsProviderSnapId) | ||
| ) { | ||
| throw new Error( | ||
| 'GATOR_PERMISSIONS_PROVIDER_SNAP_ID must be set to a valid snap id', | ||
| ); | ||
| } | ||
|
|
||
| const isGatorPermissionsEnabled = isGatorPermissionsFeatureEnabled(); | ||
|
|
||
| const state: Partial<GatorPermissionsControllerState> = { | ||
| isGatorPermissionsEnabled, | ||
| }; | ||
|
|
||
| if (gatorPermissionsProviderSnapId) { | ||
| state.gatorPermissionsProviderSnapId = gatorPermissionsProviderSnapId; | ||
| } | ||
|
|
||
| return state; | ||
| }; | ||
|
|
||
| export const GatorPermissionsControllerInit: ControllerInitFunction< | ||
| GatorPermissionsController, | ||
| GatorPermissionsControllerMessenger | ||
| > = (request) => { | ||
| const { controllerMessenger: messenger, persistedState } = request; | ||
|
|
||
| const controller = new GatorPermissionsController({ | ||
| messenger, | ||
| state: { | ||
| ...generateDefaultGatorPermissionsControllerState(), | ||
| ...persistedState.GatorPermissionsController, | ||
| }, | ||
| }); | ||
|
|
||
| return { | ||
| controller, | ||
| }; | ||
| }; |
1 change: 1 addition & 0 deletions
1
app/core/Engine/controllers/gator-permissions-controller/index.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export * from './gator-permissions-controller-init'; |
14 changes: 14 additions & 0 deletions
14
...ssengers/gator-permissions-controller-messenger/gator-permissions-controller-messenger.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import type { GatorPermissionsControllerMessenger } from '@metamask/gator-permissions-controller'; | ||
sethkfman marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| import { BaseControllerMessenger } from '../../types'; | ||
|
|
||
| export type { GatorPermissionsControllerMessenger }; | ||
|
|
||
| export function getGatorPermissionsControllerMessenger( | ||
| messenger: BaseControllerMessenger, | ||
| ): GatorPermissionsControllerMessenger { | ||
| return messenger.getRestricted({ | ||
| name: 'GatorPermissionsController', | ||
| allowedActions: [], | ||
| allowedEvents: [], | ||
| }); | ||
| } | ||
1 change: 1 addition & 0 deletions
1
app/core/Engine/messengers/gator-permissions-controller-messenger/index.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export * from './gator-permissions-controller-messenger'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.