npm - n8n - Versions diffs - 1.89.1 → 1.90.0 - Mend

n8n 1.89.1 → 1.90.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (154) hide show

package/dist/requests.d.ts CHANGED Viewed

@@ -1,10 +1,10 @@
 import type { ProjectIcon, ProjectRole, ProjectType } from '@n8n/api-types';
-import type { Scope } from '@n8n/permissions';
+import type { AssignableRole, GlobalRole, Scope } from '@n8n/permissions';
 import type express from 'express';
 import type { ICredentialDataDecryptedObject, IDataObject, INodeCredentialTestRequest, IPersonalizationSurveyAnswersV4, IUser } from 'n8n-workflow';
 import type { CredentialsEntity } from './databases/entities/credentials-entity';
 import type { Project } from './databases/entities/project';
-import type { AssignableRole, GlobalRole, User } from './databases/entities/user';
+import type { User } from './databases/entities/user';
 import type { Variables } from './databases/entities/variables';
 import type { WorkflowEntity } from './databases/entities/workflow-entity';
 import type { WorkflowHistory } from './databases/entities/workflow-history';
@@ -232,12 +232,6 @@ export declare namespace LicenseRequest {
         activationKey: string;
     }, {}>;
 }
-export type BinaryDataRequest = AuthenticatedRequest<{}, {}, {}, {
-    id: string;
-    action: 'view' | 'download';
-    fileName?: string;
-    mimeType?: string;
-}>;
 export declare namespace VariablesRequest {
     type CreateUpdatePayload = Omit<Variables, 'id'> & {
         id?: unknown;

package/dist/scaling/multi-main-setup.ee.js CHANGED Viewed

@@ -73,11 +73,10 @@ let MultiMainSetup = class MultiMainSetup extends typed_emitter_1.TypedEmitter {
     }
     async tryBecomeLeader() {
         const { hostId } = this.instanceSettings;
-        const keySetSuccessfully = await this.publisher.setIfNotExists(this.leaderKey, hostId);
+        const keySetSuccessfully = await this.publisher.setIfNotExists(this.leaderKey, hostId, this.leaderKeyTtl);
         if (keySetSuccessfully) {
             this.logger.debug(`[Instance ID ${hostId}] Leader is now this instance`);
             this.instanceSettings.markAsLeader();
-            await this.publisher.setExpiration(this.leaderKey, this.leaderKeyTtl);
             this.emit('leader-takeover');
         }
         else {

package/dist/scaling/multi-main-setup.ee.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"multi-main-setup.ee.js","sourceRoot":"","sources":["../../src/scaling/multi-main-setup.ee.ts"],"names":[],"mappings":"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~~CAAC~~,IAAI,CAAC,SAAS,~~EAAE~~,MAAM,CAAC,CAAC;~~QAEvF~~,IAAI,kBAAkB,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,MAAM,+BAA+B,CAAC,CAAC;YAEzE,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;YAErC,~~MAAM,~~IAAI,CAAC,~~SAAS,CAAC,aAAa,CAAC,~~IAAI,CAAC,~~SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YAEtE,IAAI,CAAC,IAAI,CAAC,~~iBAAiB,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,CAAC;QACxC,CAAC;IACF,CAAC;IAED,KAAK,CAAC,cAAc;QACnB,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;CACD,CAAA;~~AApGY~~,wCAAc;yBAAd,cAAc;IAD1B,IAAA,YAAO,GAAE;qCAGiB,iBAAM;QACI,2BAAgB;QACvB,6BAAS;QACA,yCAAkB;QACxB,qBAAY;GANhC,cAAc,~~CAoG1B~~"}
1	+ {"version":3,"file":"multi-main-setup.ee.js","sourceRoot":"","sources":["../../src/scaling/multi-main-setup.ee.ts"],"names":[],"mappings":"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"}

package/dist/scaling/pubsub/publisher.service.d.ts CHANGED Viewed

@@ -12,7 +12,7 @@ export declare class Publisher {
     shutdown(): void;
     publishCommand(msg: PubSub.Command): Promise<void>;
     publishWorkerResponse(msg: PubSub.WorkerResponse): Promise<void>;
-    setIfNotExists(key: string, value: string): Promise<boolean>;
+    setIfNotExists(key: string, value: string, ttl: number): Promise<boolean>;
     setExpiration(key: string, ttl: number): Promise<void>;
     get(key: string): Promise<string | null>;
     clear(key: string): Promise<void>;

package/dist/scaling/pubsub/publisher.service.js CHANGED Viewed

@@ -58,9 +58,9 @@ let Publisher = class Publisher {
         await this.client.publish('n8n.worker-response', JSON.stringify(msg));
         this.logger.debug(`Published ${msg.response} to worker response channel`);
     }
-    async setIfNotExists(key, value) {
-        const success = await this.client.setnx(key, value);
-        return !!success;
+    async setIfNotExists(key, value, ttl) {
+        const result = await this.client.set(key, value, 'EX', ttl, 'NX');
+        return result === 'OK';
     }
     async setExpiration(key, ttl) {
         await this.client.expire(key, ttl);

package/dist/scaling/pubsub/publisher.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/publisher.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gCAAkC;AAElC,uCAAoD;AAGpD,sDAA8B;AAC9B,0EAAqE;AAGrE,4CAAsE;AAM/D,IAAM,SAAS,GAAf,MAAM,SAAS;IAKrB,YACkB,MAAc,EACd,kBAAsC,EACtC,gBAAkC;QAFlC,WAAM,GAAN,MAAM,CAAQ;QACd,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAGnD,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO;YAAE,OAAO;QAEzD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;QAExD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,SAAS;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAGD,QAAQ;QACP,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IAOD,KAAK,CAAC,cAAc,CAAC,GAAmB;QAEvC,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO;YAAE,OAAO;QAEzD,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CACxB,cAAc,EACd,IAAI,CAAC,SAAS,CAAC;YACd,GAAG,GAAG;YACN,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM;YACtC,QAAQ,EAAE,8BAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;YAC7C,QAAQ,EAAE,CAAC,8BAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;SAC9C,CAAC,CACF,CAAC;QAEF,IAAI,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAE1B,MAAM,QAAQ,GAAgB,EAAE,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;QAE5E,IAAI,GAAG,CAAC,OAAO,KAAK,iCAAiC,EAAE,CAAC;YACvD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YACnC,OAAO,IAAI,KAAK,IAAI,GAAG,CAAC;YACxB,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;YACrB,IAAI,aAAa,IAAI,IAAI;gBAAE,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpE,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAC;IACjE,CAAC;IAGD,KAAK,CAAC,qBAAqB,CAAC,GAA0B;QACrD,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QAEtE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,QAAQ,6BAA6B,CAAC,CAAC;IAC3E,CAAC;IAQD,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,KAAa;~~QAC9C~~,MAAM,~~OAAO~~,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,~~KAAK~~,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;~~QAEpD~~,OAAO,~~CAAC~~,~~CAAC~~,~~OAAO~~,CAAC;~~IAClB~~,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAW,EAAE,GAAW;QAC3C,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACpB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAW;QACtB,MAAM,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;CAGD,CAAA;~~AA5FY~~,8BAAS;oBAAT,SAAS;IADrB,IAAA,YAAO,GAAE;qCAOiB,iBAAM;QACM,yCAAkB;QACpB,2BAAgB;GARxC,SAAS,~~CA4FrB~~"}
1	+ {"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/publisher.service.ts"],"names":[],"mappings":"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"}

package/dist/services/credentials-tester.service.js CHANGED Viewed

@@ -164,7 +164,7 @@ let CredentialsTester = CredentialsTester_1 = class CredentialsTester {
         if (credentialsDecrypted.data) {
             try {
                 const additionalData = await WorkflowExecuteAdditionalData.getBase(userId);
-                credentialsDecrypted.data = this.credentialsHelper.applyDefaultsAndOverwrites(additionalData, credentialsDecrypted.data, credentialType, 'internal', undefined, undefined, await this.credentialsHelper.credentialCanUseExternalSecrets(credentialsDecrypted));
+                credentialsDecrypted.data = await this.credentialsHelper.applyDefaultsAndOverwrites(additionalData, credentialsDecrypted.data, credentialsDecrypted, credentialType, 'internal', undefined, undefined);
             }
             catch (error) {
                 this.logger.debug('Credential test failed', error);

package/dist/services/credentials-tester.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"credentials-tester.service.js","sourceRoot":"","sources":["../../src/services/credentials-tester.service.ts"],"names":[],"mappings":"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~~CAC5E~~,cAAc,EACd,oBAAoB,CAAC,IAAI,EACzB,cAAc,EACd,UAAiC,EACjC,SAAS,EACT,SAAS,~~EACT~~,~~MAAM,IAAI,~~CAAC~~,iBAAiB,CAAC,+BAA+B,CAAC,oBAAoB,CAAC,CAClF,CAAC~~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"}
1	+ {"version":3,"file":"credentials-tester.service.js","sourceRoot":"","sources":["../../src/services/credentials-tester.service.ts"],"names":[],"mappings":"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"}

package/dist/services/frontend.service.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import type { FrontendSettings } from '@n8n/api-types';
 import { GlobalConfig, SecurityConfig } from '@n8n/config';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { BinaryDataConfig, InstanceSettings, Logger } from 'n8n-core';
 import { CredentialTypes } from '../credential-types';
 import { CredentialsOverwrites } from '../credentials-overwrites';
 import { License } from '../license';
@@ -22,9 +22,10 @@ export declare class FrontendService {
     private readonly securityConfig;
     private readonly modulesConfig;
     private readonly pushConfig;
+    private readonly binaryDataConfig;
     settings: FrontendSettings;
     private communityPackagesService?;
-    constructor(globalConfig: GlobalConfig, logger: Logger, loadNodesAndCredentials: LoadNodesAndCredentials, credentialTypes: CredentialTypes, credentialsOverwrites: CredentialsOverwrites, license: License, mailer: UserManagementMailer, instanceSettings: InstanceSettings, urlService: UrlService, securityConfig: SecurityConfig, modulesConfig: ModulesConfig, pushConfig: PushConfig);
+    constructor(globalConfig: GlobalConfig, logger: Logger, loadNodesAndCredentials: LoadNodesAndCredentials, credentialTypes: CredentialTypes, credentialsOverwrites: CredentialsOverwrites, license: License, mailer: UserManagementMailer, instanceSettings: InstanceSettings, urlService: UrlService, securityConfig: SecurityConfig, modulesConfig: ModulesConfig, pushConfig: PushConfig, binaryDataConfig: BinaryDataConfig);
     private initSettings;
     generateTypes(): Promise<void>;
     getSettings(): FrontendSettings;

package/dist/services/frontend.service.js CHANGED Viewed

@@ -69,7 +69,7 @@ const email_1 = require("../user-management/email");
 const workflow_history_helper_ee_1 = require("../workflows/workflow-history.ee/workflow-history-helper.ee");
 const url_service_1 = require("./url.service");
 let FrontendService = class FrontendService {
-    constructor(globalConfig, logger, loadNodesAndCredentials, credentialTypes, credentialsOverwrites, license, mailer, instanceSettings, urlService, securityConfig, modulesConfig, pushConfig) {
+    constructor(globalConfig, logger, loadNodesAndCredentials, credentialTypes, credentialsOverwrites, license, mailer, instanceSettings, urlService, securityConfig, modulesConfig, pushConfig, binaryDataConfig) {
         this.globalConfig = globalConfig;
         this.logger = logger;
         this.loadNodesAndCredentials = loadNodesAndCredentials;
@@ -82,6 +82,7 @@ let FrontendService = class FrontendService {
         this.securityConfig = securityConfig;
         this.modulesConfig = modulesConfig;
         this.pushConfig = pushConfig;
+        this.binaryDataConfig = binaryDataConfig;
         loadNodesAndCredentials.addPostProcessor(async () => await this.generateTypes());
         void this.generateTypes();
         this.initSettings();
@@ -129,7 +130,7 @@ let FrontendService = class FrontendService {
             timezone: this.globalConfig.generic.timezone,
             urlBaseWebhook: this.urlService.getWebhookBaseUrl(),
             urlBaseEditor: instanceBaseUrl,
-            binaryDataMode: config_2.default.getEnv('binaryDataManager.mode'),
+            binaryDataMode: this.binaryDataConfig.mode,
             nodeJsVersion: process.version.replace(/^v/, ''),
             versionCli: constants_1.N8N_VERSION,
             concurrency: config_2.default.getEnv('executions.concurrency.productionLimit'),
@@ -218,6 +219,7 @@ let FrontendService = class FrontendService {
                 workflowHistory: false,
                 workerView: false,
                 advancedPermissions: false,
+                apiKeyScopes: false,
                 projects: {
                     team: {
                         limit: 0,
@@ -307,8 +309,8 @@ let FrontendService = class FrontendService {
         catch {
             this.settings.easyAIWorkflowOnboarded = false;
         }
-        const isS3Selected = config_2.default.getEnv('binaryDataManager.mode') === 's3';
-        const isS3Available = config_2.default.getEnv('binaryDataManager.availableModes').includes('s3');
+        const isS3Selected = this.binaryDataConfig.mode === 's3';
+        const isS3Available = this.binaryDataConfig.availableModes.includes('s3');
         const isS3Licensed = this.license.isBinaryDataS3Licensed();
         const isAiAssistantEnabled = this.license.isAiAssistantEnabled();
         const isAskAiEnabled = this.license.isAskAiEnabled();
@@ -327,9 +329,10 @@ let FrontendService = class FrontendService {
             showNonProdBanner: this.license.isFeatureEnabled(constants_1.LICENSE_FEATURES.SHOW_NON_PROD_BANNER),
             debugInEditor: this.license.isDebugInEditorLicensed(),
             binaryDataS3: isS3Available && isS3Selected && isS3Licensed,
-            workflowHistory: this.license.isWorkflowHistoryLicensed() && config_2.default.getEnv('workflowHistory.enabled'),
+            workflowHistory: this.license.isWorkflowHistoryLicensed() && this.globalConfig.workflowHistory.enabled,
             workerView: this.license.isWorkerViewLicensed(),
             advancedPermissions: this.license.isAdvancedPermissionsLicensed(),
+            apiKeyScopes: this.license.isApiKeyScopesEnabled(),
         });
         if (this.license.isLdapEnabled()) {
             Object.assign(this.settings.sso.ldap, {
@@ -346,7 +349,7 @@ let FrontendService = class FrontendService {
         if (this.license.isVariablesEnabled()) {
             this.settings.variables.limit = this.license.getVariablesLimit();
         }
-        if (this.license.isWorkflowHistoryLicensed() && config_2.default.getEnv('workflowHistory.enabled')) {
+        if (this.globalConfig.workflowHistory.enabled && this.license.isWorkflowHistoryLicensed()) {
             Object.assign(this.settings.workflowHistory, {
                 pruneTime: (0, workflow_history_helper_ee_1.getWorkflowHistoryPruneTime)(),
                 licensePruneTime: (0, workflow_history_helper_ee_1.getWorkflowHistoryLicensePruneTime)(),
@@ -372,7 +375,7 @@ let FrontendService = class FrontendService {
         });
         this.settings.mfa.enabled = config_2.default.get('mfa.enabled');
         this.settings.executionMode = config_2.default.getEnv('executions.mode');
-        this.settings.binaryDataMode = config_2.default.getEnv('binaryDataManager.mode');
+        this.settings.binaryDataMode = this.binaryDataConfig.mode;
         this.settings.enterprise.projects.team.limit = this.license.getTeamProjectLimit();
         this.settings.folders.enabled = this.license.isFoldersEnabled();
         return this.settings;
@@ -427,6 +430,7 @@ exports.FrontendService = FrontendService = __decorate([
         url_service_1.UrlService,
         config_1.SecurityConfig,
         modules_config_1.ModulesConfig,
-        push_config_1.PushConfig])
+        push_config_1.PushConfig,
+        n8n_core_1.BinaryDataConfig])
 ], FrontendService);
 //# sourceMappingURL=frontend.service.js.map

package/dist/services/frontend.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"frontend.service.js","sourceRoot":"","sources":["../../src/services/frontend.service.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"frontend.service.js","sourceRoot":"","sources":["../../src/services/frontend.service.ts"],"names":[],"mappings":"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"}

package/dist/services/public-api-key.service.d.ts CHANGED Viewed

@@ -1,5 +1,8 @@
 import type { UpdateApiKeyRequestDto } from '@n8n/api-types';
 import type { CreateApiKeyRequestDto } from '@n8n/api-types/src/dto/api-keys/create-api-key-request.dto';
+import type { GlobalRole, ApiKeyScope } from '@n8n/permissions';
+import type { EntityManager } from '@n8n/typeorm';
+import type { NextFunction, Request, Response } from 'express';
 import type { OpenAPIV3 } from 'openapi-types';
 import { ApiKey } from '../databases/entities/api-key';
 import type { User } from '../databases/entities/user';
@@ -14,22 +17,27 @@ export declare class PublicApiKeyService {
     private readonly jwtService;
     private readonly eventService;
     constructor(apiKeyRepository: ApiKeyRepository, userRepository: UserRepository, jwtService: JwtService, eventService: EventService);
-    createPublicApiKeyForUser(user: User, { label, expiresAt }: CreateApiKeyRequestDto): Promise<ApiKey>;
+    createPublicApiKeyForUser(user: User, { label, expiresAt, scopes }: CreateApiKeyRequestDto): Promise<ApiKey>;
     getRedactedApiKeysForUser(user: User): Promise<{
         apiKey: string;
         expiresAt: number | null;
         user: User;
         userId: string;
         label: string;
+        scopes: ApiKeyScope[];
         id: string;
         createdAt: Date;
         updatedAt: Date;
     }[]>;
     deleteApiKeyForUser(user: User, apiKeyId: string): Promise<void>;
-    updateApiKeyForUser(user: User, apiKeyId: string, { label }: UpdateApiKeyRequestDto): Promise<void>;
+    updateApiKeyForUser(user: User, apiKeyId: string, { label, scopes }: UpdateApiKeyRequestDto): Promise<void>;
     private getUserForApiKey;
     redactApiKey(apiKey: string): string;
     getAuthMiddleware(version: string): (req: AuthenticatedRequest, _scopes: unknown, schema: OpenAPIV3.ApiKeySecurityScheme) => Promise<boolean>;
     private generateApiKey;
     private getApiKeyExpiration;
+    apiKeyHasValidScopesForRole(role: GlobalRole, apiKeyScopes: ApiKeyScope[]): boolean;
+    apiKeyHasValidScopes(apiKey: string, endpointScope: ApiKeyScope): Promise<boolean>;
+    getApiKeyScopeMiddleware(endpointScope: ApiKeyScope): (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    removeOwnerOnlyScopesFromApiKeys(user: User, tx?: EntityManager): Promise<import("@n8n/typeorm").UpdateResult[]>;
 }

package/dist/services/public-api-key.service.js CHANGED Viewed

@@ -16,6 +16,7 @@ const api_key_1 = require("../databases/entities/api-key");
 const api_key_repository_1 = require("../databases/repositories/api-key.repository");
 const user_repository_1 = require("../databases/repositories/user.repository");
 const event_service_1 = require("../events/event.service");
+const permissions_ee_1 = require("../public-api/permissions.ee");
 const jwt_service_1 = require("./jwt.service");
 const API_KEY_AUDIENCE = 'public-api';
 const API_KEY_ISSUER = 'n8n';
@@ -28,21 +29,18 @@ let PublicApiKeyService = class PublicApiKeyService {
         this.userRepository = userRepository;
         this.jwtService = jwtService;
         this.eventService = eventService;
-        this.generateApiKey = (user, expiresAt) => {
-            const nowInSeconds = Math.floor(Date.now() / 1000);
-            return this.jwtService.sign({ sub: user.id, iss: API_KEY_ISSUER, aud: API_KEY_AUDIENCE }, { ...(expiresAt && { expiresIn: expiresAt - nowInSeconds }) });
-        };
         this.getApiKeyExpiration = (apiKey) => {
             const decoded = this.jwtService.decode(apiKey);
             return decoded?.exp ?? null;
         };
     }
-    async createPublicApiKeyForUser(user, { label, expiresAt }) {
+    async createPublicApiKeyForUser(user, { label, expiresAt, scopes }) {
         const apiKey = this.generateApiKey(user, expiresAt);
         await this.apiKeyRepository.insert(this.apiKeyRepository.create({
             userId: user.id,
             apiKey,
             label,
+            scopes,
         }));
         return await this.apiKeyRepository.findOneByOrFail({ apiKey });
     }
@@ -57,8 +55,8 @@ let PublicApiKeyService = class PublicApiKeyService {
     async deleteApiKeyForUser(user, apiKeyId) {
         await this.apiKeyRepository.delete({ userId: user.id, id: apiKeyId });
     }
-    async updateApiKeyForUser(user, apiKeyId, { label }) {
-        await this.apiKeyRepository.update({ id: apiKeyId, userId: user.id }, { label });
+    async updateApiKeyForUser(user, apiKeyId, { label, scopes }) {
+        await this.apiKeyRepository.update({ id: apiKeyId, userId: user.id }, { label, scopes });
     }
     async getUserForApiKey(apiKey) {
         return await this.userRepository
@@ -102,6 +100,49 @@ let PublicApiKeyService = class PublicApiKeyService {
             return true;
         };
     }
+    generateApiKey(user, expiresAt) {
+        const nowInSeconds = Math.floor(Date.now() / 1000);
+        return this.jwtService.sign({ sub: user.id, iss: API_KEY_ISSUER, aud: API_KEY_AUDIENCE }, { ...(expiresAt && { expiresIn: expiresAt - nowInSeconds }) });
+    }
+    apiKeyHasValidScopesForRole(role, apiKeyScopes) {
+        const scopesForRole = (0, permissions_ee_1.getApiKeyScopesForRole)(role);
+        return apiKeyScopes.every((scope) => scopesForRole.includes(scope));
+    }
+    async apiKeyHasValidScopes(apiKey, endpointScope) {
+        const apiKeyData = await this.apiKeyRepository.findOne({
+            where: { apiKey },
+            select: { scopes: true },
+        });
+        if (!apiKeyData)
+            return false;
+        return apiKeyData.scopes.includes(endpointScope);
+    }
+    getApiKeyScopeMiddleware(endpointScope) {
+        return async (req, res, next) => {
+            const apiKey = req.headers['x-n8n-api-key'];
+            if (apiKey === undefined || typeof apiKey !== 'string') {
+                res.status(401).json({ message: 'Unauthorized' });
+                return;
+            }
+            const valid = await this.apiKeyHasValidScopes(apiKey, endpointScope);
+            if (!valid) {
+                res.status(403).json({ message: 'Forbidden' });
+                return;
+            }
+            next();
+        };
+    }
+    async removeOwnerOnlyScopesFromApiKeys(user, tx) {
+        const manager = tx ?? this.apiKeyRepository.manager;
+        const ownerOnlyScopes = (0, permissions_ee_1.getOwnerOnlyApiKeyScopes)();
+        const userApiKeys = await manager.find(api_key_1.ApiKey, {
+            where: { userId: user.id },
+        });
+        const keysWithOwnerScopes = userApiKeys.filter((apiKey) => apiKey.scopes.some((scope) => ownerOnlyScopes.includes(scope)));
+        return await Promise.all(keysWithOwnerScopes.map(async (currentApiKey) => await manager.update(api_key_1.ApiKey, currentApiKey.id, {
+            scopes: currentApiKey.scopes.filter((scope) => !ownerOnlyScopes.includes(scope)),
+        })));
+    }
 };
 exports.PublicApiKeyService = PublicApiKeyService;
 exports.PublicApiKeyService = PublicApiKeyService = __decorate([

package/dist/services/public-api-key.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"public-api-key.service.js","sourceRoot":"","sources":["../../src/services/public-api-key.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,gCAAkC;~~AAClC~~,+CAAiD;AAGjD,0DAAsD;AAEtD,oFAA+E;AAC/E,8EAA0E;AAC1E,0DAAsD;~~AAGtD~~,+CAA2C;AAE3C,MAAM,gBAAgB,GAAG,YAAY,CAAC;AACtC,MAAM,cAAc,GAAG,KAAK,CAAC;AAC7B,MAAM,2BAA2B,GAAG,CAAC,CAAC;AACtC,MAAM,yBAAyB,GAAG,EAAE,CAAC;AACrC,MAAM,qBAAqB,GAAG,UAAU,CAAC;AAGlC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,YACkB,gBAAkC,EAClC,cAA8B,EAC9B,UAAsB,EACtB,YAA0B;QAH1B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;~~QA6GpC~~,mBAAc,GAAG,CAAC,IAAU,EAAE,SAAwB,EAAE,EAAE;YACjE,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YAEnD,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAC1B,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,gBAAgB,EAAE,EAC5D,EAAE,GAAG,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE,CAAC,EAAE,CAC7D,CAAC;QACH,CAAC,CAAC;QAEM,wBAAmB,GAAG,CAAC,MAAc,EAAE,EAAE;YAChD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC/C,OAAO,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC;QAC7B,CAAC,CAAC;~~IAxHC~~,CAAC;IAMJ,KAAK,CAAC,yBAAyB,~~CAAC~~,IAAU,~~EAAE~~,EAAE,KAAK,EAAE,SAAS,EAA0B;~~QACvF~~,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACpD,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CACjC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;YAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,MAAM;YACN,KAAK;~~SACL~~,CAAC,CACF,CAAC;QAEF,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAChE,CAAC;IAMD,KAAK,CAAC,yBAAyB,CAAC,IAAU;QACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QACxE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YACrC,GAAG,YAAY;YACf,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC;YAC9C,SAAS,EAAE,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC;SACxD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,IAAU,EAAE,QAAgB;QACrD,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,mBAAmB,~~CAAC~~,IAAU,~~EAAE~~,QAAgB,~~EAAE~~,EAAE,KAAK,EAA0B;~~QACxF~~,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;~~IAClF~~,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,MAAc;QAC5C,OAAO,MAAM,IAAI,CAAC,cAAc;aAC9B,kBAAkB,CAAC,MAAM,CAAC;aAC1B,SAAS,CAAC,gBAAM,EAAE,QAAQ,EAAE,yBAAyB,CAAC;aACtD,KAAK,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC5C,MAAM,CAAC,MAAM,CAAC;aACd,MAAM,EAAE,CAAC;IACZ,CAAC;~~IAcD~~,YAAY,CAAC,MAAc;QAC1B,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,2BAA2B,CAAC,CAAC;QAC/D,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAC9B,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,yBAAyB,GAAG,2BAA2B,CAAC,CACpE,CAAC;QAEF,OAAO,YAAY,GAAG,WAAW,CAAC;IACnC,CAAC;IAED,iBAAiB,CAAC,OAAe;QAChC,OAAO,KAAK,EACX,GAAyB,EACzB,OAAgB,EAChB,MAAsC,EACnB,EAAE;YACrB,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAW,CAAC;YAExE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAEzD,IAAI,CAAC,IAAI;gBAAE,OAAO,KAAK,CAAC;YAGxB,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,CAAC;gBACvD,IAAI,CAAC;oBACJ,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,EAAE;wBACtC,MAAM,EAAE,cAAc;wBACtB,QAAQ,EAAE,gBAAgB;qBAC1B,CAAC,CAAC;gBACJ,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACZ,IAAI,CAAC,YAAY,gCAAiB;wBAAE,OAAO,KAAK,CAAC;oBACjD,MAAM,CAAC,CAAC;gBACT,CAAC;YACF,CAAC;YAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,oBAAoB,EAAE;gBAC5C,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,UAAU,EAAE,OAAO;aACnB,CAAC,CAAC;YAEH,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;YAEhB,OAAO,IAAI,CAAC;QACb,CAAC,CAAC;IACH,CAAC;~~CAeD~~,~~CAAA~~;AA/HY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,YAAO,GAAE;qCAG2B,qCAAgB;QAClB,gCAAc;QAClB,wBAAU;QACR,4BAAY;GALhC,mBAAmB,~~CA+H~~/B"}
1	+ {"version":3,"file":"public-api-key.service.js","sourceRoot":"","sources":["../../src/services/public-api-key.service.ts"],"names":[],"mappings":"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"}

package/dist/services/role.service.d.ts CHANGED Viewed

@@ -1,10 +1,10 @@
 import type { ProjectRole } from '@n8n/api-types';
-import { type Resource, type Scope } from '@n8n/permissions';
+import type { GlobalRole, Resource, Scope } from '@n8n/permissions';
 import type { CredentialsEntity } from '../databases/entities/credentials-entity';
 import type { ProjectRelation } from '../databases/entities/project-relation';
 import type { CredentialSharingRole, SharedCredentials } from '../databases/entities/shared-credentials';
 import type { SharedWorkflow, WorkflowSharingRole } from '../databases/entities/shared-workflow';
-import type { GlobalRole, User } from '../databases/entities/user';
+import type { User } from '../databases/entities/user';
 import { License } from '../license';
 import type { ListQuery } from '../requests';
 export type RoleNamespace = 'global' | 'project' | 'credential' | 'workflow';

package/dist/services/role.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAAkC;AAClC,~~kDAA4E~~;~~AAC5E~~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"}
1	+ {"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":"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"}

package/dist/services/user.service.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
+import type { RoleChangeRequestDto } from '@n8n/api-types';
 import { Logger } from 'n8n-core';
 import type { IUserSettings } from 'n8n-workflow';
-import type { User } from '../databases/entities/user';
+import { User } from '../databases/entities/user';
 import { UserRepository } from '../databases/repositories/user.repository';
 import { EventService } from '../events/event.service';
 import type { Invitation, PublicUser } from '../interfaces';
@@ -8,13 +9,15 @@ import type { PostHogClient } from '../posthog';
 import type { UserRequest } from '../requests';
 import { UrlService } from '../services/url.service';
 import { UserManagementMailer } from '../user-management/email';
+import { PublicApiKeyService } from './public-api-key.service';
 export declare class UserService {
     private readonly logger;
     private readonly userRepository;
     private readonly mailer;
     private readonly urlService;
     private readonly eventService;
-    constructor(logger: Logger, userRepository: UserRepository, mailer: UserManagementMailer, urlService: UrlService, eventService: EventService);
+    private readonly publicApiKeyService;
+    constructor(logger: Logger, userRepository: UserRepository, mailer: UserManagementMailer, urlService: UrlService, eventService: EventService, publicApiKeyService: PublicApiKeyService);
     update(userId: string, data: Partial<User>): Promise<void>;
     getManager(): import("@n8n/typeorm").EntityManager;
     updateSettings(userId: string, newSettings: Partial<IUserSettings>): Promise<void>;
@@ -31,4 +34,5 @@ export declare class UserService {
         usersInvited: UserRequest.InviteResponse[];
         usersCreated: string[];
     }>;
+    changeUserRole(user: User, targetUser: User, newRole: RoleChangeRequestDto): Promise<void>;
 }

package/dist/services/user.service.js CHANGED Viewed

@@ -13,18 +13,21 @@ exports.UserService = void 0;
 const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
+const user_1 = require("../databases/entities/user");
 const user_repository_1 = require("../databases/repositories/user.repository");
 const internal_server_error_1 = require("../errors/response-errors/internal-server.error");
 const event_service_1 = require("../events/event.service");
 const url_service_1 = require("../services/url.service");
 const email_1 = require("../user-management/email");
+const public_api_key_service_1 = require("./public-api-key.service");
 let UserService = class UserService {
-    constructor(logger, userRepository, mailer, urlService, eventService) {
+    constructor(logger, userRepository, mailer, urlService, eventService, publicApiKeyService) {
         this.logger = logger;
         this.userRepository = userRepository;
         this.mailer = mailer;
         this.urlService = urlService;
         this.eventService = eventService;
+        this.publicApiKeyService = publicApiKeyService;
     }
     async update(userId, data) {
         const user = await this.userRepository.findOneBy({ id: userId });
@@ -166,6 +169,17 @@ let UserService = class UserService {
         const usersInvited = await this.sendEmails(owner, Object.fromEntries(createdUsers), invitations[0].role);
         return { usersInvited, usersCreated: toCreateUsers.map(({ email }) => email) };
     }
+    async changeUserRole(user, targetUser, newRole) {
+        return await this.userRepository.manager.transaction(async (trx) => {
+            await trx.update(user_1.User, { id: targetUser.id }, { role: newRole.newRoleName });
+            const adminDowngradedToMember = user.role === 'global:owner' &&
+                targetUser.role === 'global:admin' &&
+                newRole.newRoleName === 'global:member';
+            if (adminDowngradedToMember) {
+                await this.publicApiKeyService.removeOwnerOnlyScopesFromApiKeys(targetUser, trx);
+            }
+        });
+    }
 };
 exports.UserService = UserService;
 exports.UserService = UserService = __decorate([
@@ -174,6 +188,7 @@ exports.UserService = UserService = __decorate([
         user_repository_1.UserRepository,
         email_1.UserManagementMailer,
         url_service_1.UrlService,
-        event_service_1.EventService])
+        event_service_1.EventService,
+        public_api_key_service_1.PublicApiKeyService])
 ], UserService);
 //# sourceMappingURL=user.service.js.map