n8n 2.35.2 → 2.36.0

package/dist/controllers/role.controller.js

@@ -62,13 +62,11 @@ let RoleController = class RoleController {
     async updateRole(req, _res, slug, updateRole) {
         const role = await this.roleService.getRole(slug);
         (0, role_authorization_1.assertCanManageRoleType)(req.user, role.roleType);
-        const result = await this.roleService.updateCustomRole(slug, updateRole);
-        this.eventService.emit('custom-role-updated', {
+        return await this.roleService.updateCustomRole({
+            slug,
+            newRole: updateRole,
             userId: req.user.id,
-            roleSlug: result.slug,
-            scopes: result.scopes,
         });
-        return result;
     }
     async deleteRole(req, _res, slug, query) {
         const role = await this.roleService.getRole(slug);

package/dist/controllers/role.controller.js.map

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

package/dist/credentials/credential-connection-status-provider.interface.d.ts

@@ -1,6 +1,9 @@
 import type { EntityManager } from '@n8n/typeorm';
+export type UserConnection = {
+    accountIdentifier?: string;
+};
 export interface ICredentialConnectionStatusProvider {
-    findConnectedCredentialIds(userId: string, credentialIds: string[]): Promise<Set<string>>;
+    findMyConnections(userId: string, credentialIds: string[]): Promise<Map<string, UserConnection>>;
     countConnectedUsers(credentialId: string): Promise<number>;
     deleteAllUserEntries(credentialId: string, em?: EntityManager): Promise<void>;
     cleanupOrphanedEntriesForUsers(userIds: string[], em?: EntityManager, credentialId?: string): Promise<void>;

package/dist/credentials/credential-connection-status-proxy.d.ts

@@ -1,9 +1,9 @@
 import type { EntityManager } from '@n8n/typeorm';
-import type { ICredentialConnectionStatusProvider } from './credential-connection-status-provider.interface';
+import type { ICredentialConnectionStatusProvider, UserConnection } from './credential-connection-status-provider.interface';
 export declare class CredentialConnectionStatusProxy implements ICredentialConnectionStatusProvider {
     private provider?;
     setProvider(provider: ICredentialConnectionStatusProvider): void;
-    findConnectedCredentialIds(userId: string, credentialIds: string[]): Promise<Set<string>>;
+    findMyConnections(userId: string, credentialIds: string[]): Promise<Map<string, UserConnection>>;
     countConnectedUsers(credentialId: string): Promise<number>;
     deleteAllUserEntries(credentialId: string, em?: EntityManager): Promise<void>;
     cleanupOrphanedEntriesForUsers(userIds: string[], em?: EntityManager, credentialId?: string): Promise<void>;

package/dist/credentials/credential-connection-status-proxy.js

@@ -12,10 +12,10 @@ let CredentialConnectionStatusProxy = class CredentialConnectionStatusProxy {
     setProvider(provider) {
         this.provider = provider;
     }
-    async findConnectedCredentialIds(userId, credentialIds) {
+    async findMyConnections(userId, credentialIds) {
         if (!this.provider || credentialIds.length === 0)
-            return new Set();
-        return await this.provider.findConnectedCredentialIds(userId, credentialIds);
+            return new Map();
+        return await this.provider.findMyConnections(userId, credentialIds);
     }
     async countConnectedUsers(credentialId) {
         if (!this.provider)

package/dist/credentials/credential-connection-status-proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"credential-connection-status-proxy.js","sourceRoot":"","sources":["../../src/credentials/credential-connection-status-proxy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,gCAAkC;AAY3B,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAG3C,WAAW,CAAC,QAA6C;QACxD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,MAAc,EAAE,aAAuB;QACvE,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,GAAG,EAAE,CAAC;QACnE,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,0BAA0B,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,YAAoB;QAC7C,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO,CAAC,CAAC;QAC7B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,YAAoB,EAAE,EAAkB;QAClE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC3B,MAAM,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,8BAA8B,CACnC,OAAiB,EACjB,EAAkB,EAClB,YAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACnD,MAAM,IAAI,CAAC,QAAQ,CAAC,8BAA8B,CAAC,OAAO,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK,CAAC,iCAAiC,CACtC,YAAoB,EACpB,UAAoB,EACpB,EAAkB;QAElB,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACtD,MAAM,IAAI,CAAC,QAAQ,CAAC,iCAAiC,CAAC,YAAY,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;IACrF,CAAC;CACD,CAAA;;0CAvCY,+BAA+B;IAD3C,IAAA,YAAO,GAAE;GACG,+BAA+B,CAuC3C"}
+{"version":3,"file":"credential-connection-status-proxy.js","sourceRoot":"","sources":["../../src/credentials/credential-connection-status-proxy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,gCAAkC;AAe3B,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAG3C,WAAW,CAAC,QAA6C;QACxD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,iBAAiB,CACtB,MAAc,EACd,aAAuB;QAEvB,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,GAAG,EAAE,CAAC;QACnE,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,YAAoB;QAC7C,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO,CAAC,CAAC;QAC7B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,YAAoB,EAAE,EAAkB;QAClE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC3B,MAAM,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,8BAA8B,CACnC,OAAiB,EACjB,EAAkB,EAClB,YAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACnD,MAAM,IAAI,CAAC,QAAQ,CAAC,8BAA8B,CAAC,OAAO,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK,CAAC,iCAAiC,CACtC,YAAoB,EACpB,UAAoB,EACpB,EAAkB;QAElB,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACtD,MAAM,IAAI,CAAC,QAAQ,CAAC,iCAAiC,CAAC,YAAY,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;IACrF,CAAC;CACD,CAAA;;0CA1CY,+BAA+B;IAD3C,IAAA,YAAO,GAAE;GACG,+BAA+B,CA0C3C"}

package/dist/credentials/credentials-finder.service.d.ts

@@ -15,8 +15,9 @@ export declare class CredentialsFinderService {
             project: boolean;
         };
     }): Promise<CredentialsEntity | null>;
-    findCredentialById(credentialId: string, options?: {
+    findById(credentialId: string, options?: {
         includeInstanceCredentials?: boolean;
+        includeSharedProject?: boolean;
     }): Promise<CredentialsEntity | null>;
     private mergeAndDeduplicateCredentials;
     findCredentialsForUser(user: User, scopes: Scope[]): Promise<CredentialsEntity[]>;

package/dist/credentials/credentials-finder.service.js

@@ -41,12 +41,13 @@ let CredentialsFinderService = class CredentialsFinderService {
             relations,
         });
     }
-    async findCredentialById(credentialId, options = {}) {
+    async findById(credentialId, options = {}) {
         return await this.credentialsRepository.findOne({
             where: {
                 id: credentialId,
                 usageScope: options.includeInstanceCredentials ? (0, typeorm_1.In)(['project', 'instance']) : 'project',
             },
+            relations: options.includeSharedProject ? { shared: { project: true } } : undefined,
         });
     }
     mergeAndDeduplicateCredentials(credentials, globalCredentials, mapGlobalCredential) {

package/dist/credentials/credentials-finder.service.js.map

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

package/dist/credentials/credentials.controller.d.ts

@@ -27,7 +27,7 @@ export declare class CredentialsController {
     private readonly credentialsOverwrites;
     constructor(globalConfig: GlobalConfig, credentialsService: CredentialsService, enterpriseCredentialsService: EnterpriseCredentialsService, namingService: NamingService, licenseState: LicenseState, logger: Logger, userManagementMailer: UserManagementMailer, sharedCredentialsRepository: SharedCredentialsRepository, projectRelationRepository: ProjectRelationRepository, eventService: EventService, credentialsFinderService: CredentialsFinderService, connectionStatusProxy: CredentialConnectionStatusProxy, credentialsOverwrites: CredentialsOverwrites);
     getMany(req: CredentialRequest.GetMany, _res: unknown, query: CredentialsGetManyRequestQuery): Promise<import("@n8n/db").CredentialsEntity[]>;
-    getProjectCredentials(req: CredentialRequest.ForWorkflow): Promise<{
+    getProjectCredentials(req: CredentialRequest.ForWorkflow): Promise<({
         id: string;
         name: string;
         type: string;
@@ -40,12 +40,14 @@ export declare class CredentialsController {
         homeProject: import("@n8n/db").SlimProject | null;
         sharedWithProjects: import("@n8n/db").SlimProject[];
         currentUserHasAccess: boolean;
-        connectedByMe?: boolean;
-    }[]>;
+    } & import("@n8n/api-types").CredentialConnectionStatus)[]>;
     generateUniqueName(_req: unknown, _res: unknown, query: GenerateCredentialNameRequestQuery): Promise<{
         name: string;
     }>;
     getOne(req: CredentialRequest.Get, _res: unknown, credentialId: string, query: CredentialsGetOneRequestQuery): Promise<{
+        connectedByMe?: boolean;
+        connectedAccountIdentifier?: string;
+        connectedUserCount?: number;
         id: string;
         generateId(): void;
         createdAt: Date;
@@ -59,8 +61,6 @@ export declare class CredentialsController {
         resolvableAllowFallback: boolean;
         resolverId: string | null;
         usageScope: import("@n8n/db").CredentialUsageScope;
-        connectedByMe?: boolean;
-        connectedUserCount?: number;
         scopes: import("@n8n/permissions").Scope[];
     }>;
     testCredentials(req: CredentialRequest.Test): Promise<import("n8n-workflow").INodeCredentialTestResult>;
@@ -83,6 +83,9 @@ export declare class CredentialsController {
         scopes: import("@n8n/permissions").Scope[];
     }>;
     updateCredentials(req: CredentialRequest.Update): Promise<{
+        connectedByMe?: boolean;
+        connectedAccountIdentifier?: string;
+        connectedUserCount?: number;
         id: string;
         generateId(): void;
         createdAt: Date;
@@ -96,7 +99,6 @@ export declare class CredentialsController {
         resolvableAllowFallback: boolean;
         resolverId: string | null;
         usageScope: import("@n8n/db").CredentialUsageScope;
-        connectedByMe?: boolean;
         scopes: import("@n8n/permissions").Scope[];
     }>;
     disconnectOauthToken(req: AuthenticatedRequest, _res: unknown, credentialId: string): Promise<{

package/dist/credentials/credentials.controller.js

@@ -205,6 +205,9 @@ let CredentialsController = class CredentialsController {
         const isTogglingToStatic = body.isResolvable === false && credential.isResolvable === true;
         if (isTogglingToPrivate || isTogglingToStatic) {
             const owningProject = await this.sharedCredentialsRepository.findCredentialOwningProject(credentialId);
+            if (isTogglingToPrivate) {
+                this.credentialsService.ensureEndUserCredentialAllowedInProject(owningProject);
+            }
             await this.credentialsService.ensureCanManageEndUserCredential(req.user, owningProject?.id);
         }
         const preparedCredentialData = await this.credentialsService.prepareUpdateData(req.user, req.body, credential, { clearOauthTokenData: isTogglingToPrivate || isChangingAuthType });
@@ -308,18 +311,6 @@ let CredentialsController = class CredentialsController {
         await this.credentialsService.delete(req.user, credential.id, {
             includeInstanceCredentials: true,
         });
-        this.eventService.emit('credentials-deleted', {
-            user: req.user,
-            credentialType: credential.type,
-            credentialId: credential.id,
-        });
-        if (credential.isResolvable) {
-            this.eventService.emit('private-credential-deleted', {
-                user: req.user,
-                credentialType: credential.type,
-                credentialId: credential.id,
-            });
-        }
         return true;
     }
     async shareCredentials(req) {

package/dist/credentials/credentials.controller.js.map

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

package/dist/credentials/credentials.service.d.ts

@@ -1,6 +1,6 @@
-import type { CreateCredentialDto } from '@n8n/api-types';
+import type { CreateCredentialDto, CredentialConnectionStatus } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
-import { CredentialsEntity, DbLockService, SharedCredentials, CredentialsRepository, InstanceCredentialAssignmentRepository, ProjectRepository, SharedCredentialsRepository, UserRepository } from '@n8n/db';
+import { Project, CredentialsEntity, DbLockService, SharedCredentials, CredentialsRepository, InstanceCredentialAssignmentRepository, ProjectRepository, SharedCredentialsRepository, UserRepository } from '@n8n/db';
 import type { SlimProject, User, ICredentialsDb, OperationContext } from '@n8n/db';
 import { type Scope } from '@n8n/permissions';
 import { type EntityManager, type FindOptionsRelations } from '@n8n/typeorm';
@@ -8,6 +8,7 @@ import { ErrorReporter } from 'n8n-core';
 import type { ICredentialDataDecryptedObject, ICredentialsDecrypted, INodeProperties } from 'n8n-workflow';
 import { CredentialTypes } from '../credential-types';
 import { CredentialsHelper } from '../credentials-helper';
+import { EventService } from '../events/event.service';
 import { ExternalHooks } from '../external-hooks';
 import { ExternalSecretsConfig } from '../modules/external-secrets.ee/external-secrets.config';
 import { SecretsProviderAccessCheckService } from '../modules/external-secrets.ee/secret-provider-access-check.service.ee';
@@ -29,6 +30,17 @@ export type CredentialsGetSharedOptions = {
 type PrepareUpdateDataOptions = {
     clearOauthTokenData?: boolean;
     operationContext?: OperationContext;
+    dataMerge?: 'unredact' | 'replace' | 'partial';
+};
+type GetManyOptions = {
+    listQueryOptions?: ListQuery.Options;
+    includeScopes?: boolean;
+    includeData?: boolean;
+    onlySharedWithMe?: boolean;
+    includeGlobal?: boolean;
+    filters?: {
+        externalSecretsStore?: string;
+    };
 };
 type UpdateOptions = {
     deleteUserEntries?: boolean;
@@ -39,6 +51,10 @@ type InstanceCredentialWriteOptions = {
     skipExternalHooks?: boolean;
     encryptedData?: ICredentialsDb;
 };
+type CredentialsWithCount<T = CredentialsEntity> = {
+    credentials: T[];
+    count: number;
+};
 type WorkflowCredentialResult = {
     id: string;
     name: string;
@@ -52,8 +68,7 @@ type WorkflowCredentialResult = {
     homeProject: SlimProject | null;
     sharedWithProjects: SlimProject[];
     currentUserHasAccess: boolean;
-    connectedByMe?: boolean;
-};
+} & CredentialConnectionStatus;
 export declare class CredentialsService {
     private readonly credentialsRepository;
     private readonly credentialDependencyService;
@@ -76,7 +91,8 @@ export declare class CredentialsService {
     private readonly instanceCredentialAssignmentRepository;
     private readonly instanceCredentialUseRegistry;
     private readonly dbLockService;
-    constructor(credentialsRepository: CredentialsRepository, credentialDependencyService: CredentialDependencyService, sharedCredentialsRepository: SharedCredentialsRepository, ownershipService: OwnershipService, logger: Logger, errorReporter: ErrorReporter, credentialsTester: CredentialsTester, externalHooks: ExternalHooks, credentialTypes: CredentialTypes, projectRepository: ProjectRepository, projectService: ProjectService, roleService: RoleService, userRepository: UserRepository, credentialsFinderService: CredentialsFinderService, credentialsHelper: CredentialsHelper, externalSecretsConfig: ExternalSecretsConfig, externalSecretsProviderAccessCheckService: SecretsProviderAccessCheckService, connectionStatusProxy: CredentialConnectionStatusProxy, instanceCredentialAssignmentRepository: InstanceCredentialAssignmentRepository, instanceCredentialUseRegistry: InstanceCredentialUseRegistry, dbLockService: DbLockService);
+    private readonly eventService;
+    constructor(credentialsRepository: CredentialsRepository, credentialDependencyService: CredentialDependencyService, sharedCredentialsRepository: SharedCredentialsRepository, ownershipService: OwnershipService, logger: Logger, errorReporter: ErrorReporter, credentialsTester: CredentialsTester, externalHooks: ExternalHooks, credentialTypes: CredentialTypes, projectRepository: ProjectRepository, projectService: ProjectService, roleService: RoleService, userRepository: UserRepository, credentialsFinderService: CredentialsFinderService, credentialsHelper: CredentialsHelper, externalSecretsConfig: ExternalSecretsConfig, externalSecretsProviderAccessCheckService: SecretsProviderAccessCheckService, connectionStatusProxy: CredentialConnectionStatusProxy, instanceCredentialAssignmentRepository: InstanceCredentialAssignmentRepository, instanceCredentialUseRegistry: InstanceCredentialUseRegistry, dbLockService: DbLockService, eventService: EventService);
     countConnectedUsers(credentialId: string): Promise<number>;
     populateConnectedByMe<T extends {
         id: string;
@@ -84,26 +100,14 @@ export declare class CredentialsService {
     }>(credentials: T[], user: User): Promise<void>;
     private addGlobalCredentials;
     private extractTypeFilter;
-    getMany(user: User, options: {
-        listQueryOptions?: ListQuery.Options;
-        includeScopes?: boolean;
+    getMany(user: User, options: GetManyOptions & {
         includeData: true;
-        onlySharedWithMe?: boolean;
-        includeGlobal?: boolean;
-        filters?: {
-            externalSecretsStore?: string;
-        };
     }): Promise<Array<ICredentialsDecrypted<ICredentialDataDecryptedObject>>>;
-    getMany(user: User, options?: {
-        listQueryOptions?: ListQuery.Options;
-        includeScopes?: boolean;
-        includeData?: boolean;
-        onlySharedWithMe?: boolean;
-        includeGlobal?: boolean;
-        filters?: {
-            externalSecretsStore?: string;
-        };
-    }): Promise<CredentialsEntity[]>;
+    getMany(user: User, options?: GetManyOptions): Promise<CredentialsEntity[]>;
+    getManyAndCount(user: User, options: GetManyOptions & {
+        includeData: true;
+    }): Promise<CredentialsWithCount<ICredentialsDecrypted<ICredentialDataDecryptedObject>>>;
+    getManyAndCount(user: User, options?: GetManyOptions): Promise<CredentialsWithCount>;
     private getManyForAdminUser;
     private getManyForMemberUser;
     private applyPersonalProjectFilter;
@@ -120,6 +124,7 @@ export declare class CredentialsService {
     findAllCredentialIdsForWorkflow(workflowId: string): Promise<CredentialsEntity[]>;
     findAllCredentialIdsForProject(projectId: string): Promise<CredentialsEntity[]>;
     getSharing(user: User, credentialId: string, globalScopes: Scope[], relations?: FindOptionsRelations<SharedCredentials>): Promise<SharedCredentials | null>;
+    private applyDataMerge;
     prepareUpdateData(user: User, data: CredentialRequest.CredentialProperties, existingCredential: CredentialsEntity, options?: PrepareUpdateDataOptions): Promise<CredentialsEntity>;
     private restoreHiddenDcrFields;
     createEncryptedData(credential: {
@@ -130,9 +135,7 @@ export declare class CredentialsService {
     }): Promise<ICredentialsDb>;
     clearOauthTokenData(credential: CredentialsEntity): Promise<void>;
     decrypt(credential: CredentialsEntity, includeRawData?: boolean): Promise<ICredentialDataDecryptedObject>;
-    update(credentialId: string, newCredentialData: ICredentialsDb, decryptedCredentialData?: ICredentialDataDecryptedObject, options?: UpdateOptions): Promise<(CredentialsEntity & {
-        connectedByMe?: boolean;
-    }) | null>;
+    update(credentialId: string, newCredentialData: ICredentialsDb, decryptedCredentialData?: ICredentialDataDecryptedObject, options?: UpdateOptions): Promise<(CredentialsEntity & CredentialConnectionStatus) | null>;
     runInstanceCredentialHooks(event: 'create' | 'update', credential: {
         id: string | null;
         name: string;
@@ -142,9 +145,11 @@ export declare class CredentialsService {
     updateInstanceCredential(user: User, credentialId: string, data: CredentialRequest.CredentialProperties, ctx: OperationContext, options?: InstanceCredentialWriteOptions): Promise<CredentialsEntity>;
     private resolveOwningProjectIdForNewCredential;
     save(credential: CredentialsEntity, encryptedData: ICredentialsDb, user: User, projectId: string, decryptedCredentialData?: ICredentialDataDecryptedObject): Promise<CredentialsEntity>;
+    findCredentialOwningProject(credentialId: string): Promise<Project | undefined>;
     delete(user: User, credentialId: string, options?: {
         includeInstanceCredentials?: boolean;
     }): Promise<void>;
+    private emitCredentialDeleted;
     test(userId: User['id'], credentials: ICredentialsDecrypted): Promise<import("n8n-workflow").INodeCredentialTestResult>;
     testById(userId: User['id'], credentialId: string): Promise<import("n8n-workflow").INodeCredentialTestResult>;
     testWithCredentials(user: User, credentials: ICredentialsDecrypted): Promise<import("n8n-workflow").INodeCredentialTestResult>;
@@ -161,6 +166,9 @@ export declare class CredentialsService {
     getOne(user: User, credentialId: string, includeDecryptedData: boolean, options?: {
         includeInstanceCredentials?: boolean;
     }): Promise<{
+        connectedByMe?: boolean;
+        connectedAccountIdentifier?: string;
+        connectedUserCount?: number;
         id: string;
         generateId(): void;
         createdAt: Date;
@@ -175,10 +183,11 @@ export declare class CredentialsService {
         resolvableAllowFallback: boolean;
         resolverId: string | null;
         usageScope: import("@n8n/db").CredentialUsageScope;
-        connectedByMe?: boolean;
-        connectedUserCount?: number;
         data: ICredentialDataDecryptedObject;
     } | {
+        connectedByMe?: boolean;
+        connectedAccountIdentifier?: string;
+        connectedUserCount?: number;
         id: string;
         generateId(): void;
         createdAt: Date;
@@ -193,8 +202,6 @@ export declare class CredentialsService {
         resolvableAllowFallback: boolean;
         resolverId: string | null;
         usageScope: import("@n8n/db").CredentialUsageScope;
-        connectedByMe?: boolean;
-        connectedUserCount?: number;
     }>;
     getCredentialScopes(user: User, credentialId: string): Promise<Scope[]>;
     transferAll(fromProjectId: string, toProjectId: string, trx?: EntityManager): Promise<void>;
@@ -243,6 +250,7 @@ export declare class CredentialsService {
         usageScope: import("@n8n/db").CredentialUsageScope;
         scopes: Scope[];
     }>;
+    ensureEndUserCredentialAllowedInProject(project?: Pick<Project, 'type'> | null): void;
     ensureCanManageEndUserCredential(user: User, projectId?: string): Promise<void>;
     private createCredential;
     private persistInstanceCredential;

package/dist/credentials/credentials.service.ee.d.ts

@@ -26,6 +26,9 @@ export declare class EnterpriseCredentialsService {
     shareWithProjects(user: User, credentialId: string, shareWithIds: string[], entityManager?: EntityManager): Promise<SharedCredentials[]>;
     getOne(credentialId: string): Promise<CredentialsEntity | null>;
     getOneForUser(user: User, credentialId: string, includeDecryptedData: boolean): Promise<{
+        connectedByMe?: boolean;
+        connectedAccountIdentifier?: string;
+        connectedUserCount?: number;
         id: string;
         generateId(): void;
         createdAt: Date;
@@ -40,10 +43,11 @@ export declare class EnterpriseCredentialsService {
         resolvableAllowFallback: boolean;
         resolverId: string | null;
         usageScope: import("@n8n/db").CredentialUsageScope;
-        connectedByMe?: boolean;
-        connectedUserCount?: number;
         data: ICredentialDataDecryptedObject;
     } | {
+        connectedByMe?: boolean;
+        connectedAccountIdentifier?: string;
+        connectedUserCount?: number;
         id: string;
         generateId(): void;
         createdAt: Date;
@@ -58,8 +62,6 @@ export declare class EnterpriseCredentialsService {
         resolvableAllowFallback: boolean;
         resolverId: string | null;
         usageScope: import("@n8n/db").CredentialUsageScope;
-        connectedByMe?: boolean;
-        connectedUserCount?: number;
     }>;
     transferOne(user: User, credentialId: string, destinationProjectId: string): Promise<void>;
 }

package/dist/credentials/credentials.service.ee.js

@@ -77,7 +77,7 @@ let EnterpriseCredentialsService = class EnterpriseCredentialsService {
         return await em.save(newSharedCredentials);
     }
     async getOne(credentialId) {
-        return await this.credentialsFinderService.findCredentialById(credentialId);
+        return await this.credentialsFinderService.findById(credentialId);
     }
     async getOneForUser(user, credentialId, includeDecryptedData) {
         let credential = null;
@@ -135,6 +135,7 @@ let EnterpriseCredentialsService = class EnterpriseCredentialsService {
             throw new transfer_credential_error_1.TransferCredentialError("You can't transfer a credential into the project that's already owning it.");
         }
         if (credential.isResolvable) {
+            this.credentialsService.ensureEndUserCredentialAllowedInProject(destinationProject);
             await this.credentialsService.ensureCanManageEndUserCredential(user, destinationProject.id);
         }
         if (this.licenseState.isExternalSecretsLicensed() &&

package/dist/credentials/credentials.service.ee.js.map

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