remove unused parameter from RequireGlobalScope

packages/cli/src/decorators/Scopes.ts

@@ -1,17 +1,14 @@
-import type { Scope, ScopeOptions } from '@n8n/permissions';
+import type { Scope } from '@n8n/permissions';
 import type { ScopeMetadata } from './types';
 import { CONTROLLER_REQUIRED_SCOPES } from './constants';
 
-export const RequireGlobalScope = (scope: Scope | Scope[], scopeOptions?: ScopeOptions) => {
+export const RequireGlobalScope = (scope: Scope | Scope[]) => {
 	// eslint-disable-next-line @typescript-eslint/ban-types
 	return (target: Function | object, handlerName?: string) => {
 		const controllerClass = handlerName ? target.constructor : target;
 		const scopes = (Reflect.getMetadata(CONTROLLER_REQUIRED_SCOPES, controllerClass) ??
-			{}) as ScopeMetadata;
-		scopes[handlerName ?? '*'] = {
-			scopes: Array.isArray(scope) ? scope : [scope],
-			options: scopeOptions,
-		};
+			[]) as ScopeMetadata;
+		scopes[handlerName ?? '*'] = Array.isArray(scope) ? scope : [scope];
 		Reflect.defineMetadata(CONTROLLER_REQUIRED_SCOPES, scopes, controllerClass);
 	};
 };

packages/cli/src/decorators/registerController.ts

@@ -19,11 +19,11 @@ import type {
 	MiddlewareMetadata,
 	RouteMetadata,
 	ScopeMetadata,
-	ScopeWithOptions,
 } from './types';
 import type { BooleanLicenseFeature } from '@/Interfaces';
 import Container from 'typedi';
 import { License } from '@/License';
+import type { Scope } from '@n8n/permissions';
 
 export const createAuthMiddleware =
 	(authRole: AuthRole): RequestHandler =>
@@ -59,15 +59,15 @@ export const createLicenseMiddleware =
 	};
 
 export const createGlobalScopeMiddleware =
-	(scopes: ScopeWithOptions): RequestHandler =>
+	(scopes: Scope[]): RequestHandler =>
 	async ({ user }: AuthenticatedRequest, res, next) => {
-		if (scopes.scopes.length === 0) {
+		if (scopes.length === 0) {
 			return next();
 		}
 
 		if (!user) return res.status(401).json({ status: 'error', message: 'Unauthorized' });
 
-		const hasScopes = await user.hasGlobalScope(scopes.scopes, scopes.options);
+		const hasScopes = await user.hasGlobalScope(scopes);
 		if (!hasScopes) {
 			return res.status(403).json({ status: 'error', message: 'Unauthorized' });
 		}

packages/cli/src/decorators/types.ts

@@ -1,7 +1,7 @@
 import type { Request, Response, RequestHandler } from 'express';
 import type { RoleNames, RoleScopes } from '@db/entities/Role';
 import type { BooleanLicenseFeature } from '@/Interfaces';
-import type { ScopeOptions, Scope } from '@n8n/permissions';
+import type { Scope } from '@n8n/permissions';
 
 export type Method = 'get' | 'post' | 'put' | 'patch' | 'delete';
 
@@ -10,11 +10,7 @@ export type AuthRoleMetadata = Record<string, AuthRole>;
 
 export type LicenseMetadata = Record<string, BooleanLicenseFeature[]>;
 
-export interface ScopeWithOptions {
-	scopes: Scope[];
-	options?: ScopeOptions;
-}
-export type ScopeMetadata = Record<string, ScopeWithOptions>;
+export type ScopeMetadata = Record<string, Scope[]>;
 
 export interface MiddlewareMetadata {
 	handlerName: string;