diff --git a/packages/backend-app-api/src/services/implementations/permissions/permissionsServiceFactory.ts b/packages/backend-app-api/src/services/implementations/permissions/permissionsServiceFactory.ts index ecdaa1e938..c8fa0e7bbf 100644 --- a/packages/backend-app-api/src/services/implementations/permissions/permissionsServiceFactory.ts +++ b/packages/backend-app-api/src/services/implementations/permissions/permissionsServiceFactory.ts @@ -31,14 +31,12 @@ export const permissionsServiceFactory = createServiceFactory({ config: coreServices.rootConfig, discovery: coreServices.discovery, tokenManager: coreServices.tokenManager, - pluginMetadata: coreServices.pluginMetadata, }, - async factory({ auth, config, discovery, tokenManager, pluginMetadata }) { + async factory({ auth, config, discovery, tokenManager }) { return ServerPermissionClient.fromConfig(config, { auth, discovery, tokenManager, - pluginId: pluginMetadata.getId(), }); }, }); diff --git a/plugins/permission-node/api-report.md b/plugins/permission-node/api-report.md index fab3bc7742..7d2910d391 100644 --- a/plugins/permission-node/api-report.md +++ b/plugins/permission-node/api-report.md @@ -291,7 +291,6 @@ export class ServerPermissionClient implements PermissionsService { discovery: DiscoveryService; tokenManager: TokenManager; auth?: AuthService; - pluginId?: string; }, ): ServerPermissionClient; } diff --git a/plugins/permission-node/src/ServerPermissionClient.test.ts b/plugins/permission-node/src/ServerPermissionClient.test.ts index 68c675745a..9becad4d7b 100644 --- a/plugins/permission-node/src/ServerPermissionClient.test.ts +++ b/plugins/permission-node/src/ServerPermissionClient.test.ts @@ -371,7 +371,6 @@ describe('ServerPermissionClient', () => { discovery, tokenManager: mockServices.tokenManager(), auth: mockServices.auth(), - pluginId: 'test', }); // no restrictions for the given plugin diff --git a/plugins/permission-node/src/ServerPermissionClient.ts b/plugins/permission-node/src/ServerPermissionClient.ts index 2c2ccefbf4..6e3901d65b 100644 --- a/plugins/permission-node/src/ServerPermissionClient.ts +++ b/plugins/permission-node/src/ServerPermissionClient.ts @@ -47,7 +47,6 @@ export class ServerPermissionClient implements PermissionsService { readonly #auth: AuthService; readonly #permissionClient: PermissionClient; readonly #permissionEnabled: boolean; - readonly #pluginId?: string; static fromConfig( config: Config, @@ -55,7 +54,6 @@ export class ServerPermissionClient implements PermissionsService { discovery: DiscoveryService; tokenManager: TokenManager; auth?: AuthService; - pluginId?: string; }, ) { const { discovery, tokenManager } = options; @@ -78,7 +76,6 @@ export class ServerPermissionClient implements PermissionsService { auth, permissionClient, permissionEnabled, - pluginId: options.pluginId, }); } @@ -86,12 +83,10 @@ export class ServerPermissionClient implements PermissionsService { auth: AuthService; permissionClient: PermissionClient; permissionEnabled: boolean; - pluginId?: string; }) { this.#auth = options.auth; this.#permissionClient = options.permissionClient; this.#permissionEnabled = options.permissionEnabled; - this.#pluginId = options.pluginId; } async authorizeConditional( @@ -164,12 +159,10 @@ export class ServerPermissionClient implements PermissionsService { // Bail out to the old behavior if // - the principal is not a service // - the principal was apparently unrestricted - // - we are in legacy mode because nobody passed in a plugin ID const credentials = options.credentials; if ( !this.#auth.isPrincipal(credentials, 'service') || - !credentials.principal.accessRestrictions || - !this.#pluginId + !credentials.principal.accessRestrictions ) { return undefined; }