n8n 2.35.4 → 2.36.2

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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"}

package/dist/credentials/credentials.service.js

@@ -23,14 +23,15 @@ const credential_not_found_error_1 = require("../errors/credential-not-found.err
 const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
 const forbidden_error_1 = require("../errors/response-errors/forbidden.error");
 const not_found_error_1 = require("../errors/response-errors/not-found.error");
+const event_service_1 = require("../events/event.service");
 const external_hooks_1 = require("../external-hooks");
 const generic_helpers_1 = require("../generic-helpers");
+const shared_fields_1 = require("../modules/dynamic-credentials.ee/services/shared-fields");
 const external_secrets_config_1 = require("../modules/external-secrets.ee/external-secrets.config");
 const secret_provider_access_check_service_ee_1 = require("../modules/external-secrets.ee/secret-provider-access-check.service.ee");
 const dcr_managed_fields_1 = require("../oauth/dcr-managed-fields");
 const validate_oauth_url_1 = require("../oauth/validate-oauth-url");
 const check_access_1 = require("../permissions.ee/check-access");
-const shared_fields_1 = require("../modules/dynamic-credentials.ee/services/shared-fields");
 const credentials_tester_service_1 = require("../services/credentials-tester.service");
 const ownership_service_1 = require("../services/ownership.service");
 const project_service_ee_1 = require("../services/project.service.ee");
@@ -52,7 +53,7 @@ function parseAcceptedStatusCodes(raw) {
     return codes.length > 0 ? codes : undefined;
 }
 let CredentialsService = class CredentialsService {
-    constructor(credentialsRepository, credentialDependencyService, sharedCredentialsRepository, ownershipService, logger, errorReporter, credentialsTester, externalHooks, credentialTypes, projectRepository, projectService, roleService, userRepository, credentialsFinderService, credentialsHelper, externalSecretsConfig, externalSecretsProviderAccessCheckService, connectionStatusProxy, instanceCredentialAssignmentRepository, instanceCredentialUseRegistry, dbLockService) {
+    constructor(credentialsRepository, credentialDependencyService, sharedCredentialsRepository, ownershipService, logger, errorReporter, credentialsTester, externalHooks, credentialTypes, projectRepository, projectService, roleService, userRepository, credentialsFinderService, credentialsHelper, externalSecretsConfig, externalSecretsProviderAccessCheckService, connectionStatusProxy, instanceCredentialAssignmentRepository, instanceCredentialUseRegistry, dbLockService, eventService) {
         this.credentialsRepository = credentialsRepository;
         this.credentialDependencyService = credentialDependencyService;
         this.sharedCredentialsRepository = sharedCredentialsRepository;
@@ -74,6 +75,7 @@ let CredentialsService = class CredentialsService {
         this.instanceCredentialAssignmentRepository = instanceCredentialAssignmentRepository;
         this.instanceCredentialUseRegistry = instanceCredentialUseRegistry;
         this.dbLockService = dbLockService;
+        this.eventService = eventService;
     }
     async countConnectedUsers(credentialId) {
         return await this.connectionStatusProxy.countConnectedUsers(credentialId);
@@ -82,9 +84,12 @@ let CredentialsService = class CredentialsService {
         const resolvable = credentials.filter((c) => c.isResolvable === true);
         if (resolvable.length === 0)
             return;
-        const connected = await this.connectionStatusProxy.findConnectedCredentialIds(user.id, resolvable.map((c) => c.id));
+        const connections = await this.connectionStatusProxy.findMyConnections(user.id, resolvable.map((c) => c.id));
         for (const c of resolvable) {
-            c.connectedByMe = connected.has(c.id);
+            const connection = connections.get(c.id);
+            const enriched = c;
+            enriched.connectedByMe = connection !== undefined;
+            enriched.connectedAccountIdentifier = connection?.accountIdentifier;
         }
     }
     async addGlobalCredentials(credentials, includeData, dependencyFilter, type) {
@@ -101,7 +106,11 @@ let CredentialsService = class CredentialsService {
         const filterType = listQueryOptions.filter?.type;
         return typeof filterType === 'string' && filterType !== '' ? filterType : undefined;
     }
-    async getMany(user, { listQueryOptions = {}, includeScopes = false, includeData = false, onlySharedWithMe = false, includeGlobal = false, filters = {}, } = {}) {
+    async getMany(user, options = {}) {
+        const { credentials } = await this.getManyAndCount(user, options);
+        return credentials;
+    }
+    async getManyAndCount(user, { listQueryOptions = {}, includeScopes = false, includeData = false, onlySharedWithMe = false, includeGlobal = false, filters = {}, } = {}) {
         const { externalSecretsStore } = filters;
         const returnAll = (0, permissions_1.hasGlobalScope)(user, 'credential:list');
         const isDefaultSelect = !listQueryOptions.select;
@@ -109,31 +118,23 @@ let CredentialsService = class CredentialsService {
             ? await this.credentialDependencyService.resolveExternalSecretsStoreDependencyFilter(externalSecretsStore)
             : undefined;
         if (externalSecretsStore && !dependencyFilter) {
-            return [];
+            return { credentials: [], count: 0 };
         }
         if (includeData) {
             includeScopes = true;
         }
-        let credentials;
-        if (returnAll) {
-            credentials = await this.getManyForAdminUser(user, {
-                listQueryOptions,
-                includeGlobal,
-                includeData,
-                onlySharedWithMe,
-                filters: { dependency: dependencyFilter },
-            });
-        }
-        else {
-            credentials = await this.getManyForMemberUser(user, {
-                listQueryOptions,
-                includeGlobal,
-                includeData,
-                onlySharedWithMe,
-                filters: { dependency: dependencyFilter },
-            });
-        }
-        return await this.enrichCredentials(credentials, user, isDefaultSelect, includeScopes, includeData, listQueryOptions, onlySharedWithMe);
+        const fetchOptions = {
+            listQueryOptions,
+            includeGlobal,
+            includeData,
+            onlySharedWithMe,
+            filters: { dependency: dependencyFilter },
+        };
+        const { credentials, count } = returnAll
+            ? await this.getManyForAdminUser(user, fetchOptions)
+            : await this.getManyForMemberUser(user, fetchOptions);
+        const enriched = await this.enrichCredentials(credentials, user, isDefaultSelect, includeScopes, includeData, listQueryOptions, onlySharedWithMe);
+        return { credentials: enriched, count };
     }
     async getManyForAdminUser(user, { listQueryOptions, includeGlobal, includeData, onlySharedWithMe, filters, }) {
         const { dependency: dependencyFilter } = filters ?? {};
@@ -142,7 +143,7 @@ let CredentialsService = class CredentialsService {
             const sharingOptions = {
                 ...(onlySharedWithMe ? { onlySharedWithMe: true } : {}),
             };
-            const { credentials } = await this.credentialsRepository.getManyAndCountWithSharingSubquery(user, sharingOptions, {
+            const { credentials, count } = await this.credentialsRepository.getManyAndCountWithSharingSubquery(user, sharingOptions, {
                 ...listQueryOptions,
                 ...(includeData ? { includeData: true } : {}),
                 filters: {
@@ -150,19 +151,25 @@ let CredentialsService = class CredentialsService {
                 },
             });
             if (includeGlobal) {
-                return await this.addGlobalCredentials(credentials, includeData, dependencyFilter, typeFilter);
+                return {
+                    credentials: await this.addGlobalCredentials(credentials, includeData, dependencyFilter, typeFilter),
+                    count,
+                };
             }
-            return credentials;
+            return { credentials, count };
         }
         await this.applyPersonalProjectFilter(listQueryOptions);
-        let credentials = await this.credentialsRepository.findMany({
+        const [credentials, count] = await this.credentialsRepository.findManyAndCount({
             ...listQueryOptions,
             ...(includeData ? { includeData: true } : {}),
         });
         if (includeGlobal) {
-            credentials = await this.addGlobalCredentials(credentials, includeData, dependencyFilter, typeFilter);
+            return {
+                credentials: await this.addGlobalCredentials(credentials, includeData, dependencyFilter, typeFilter),
+                count,
+            };
         }
-        return credentials;
+        return { credentials, count };
     }
     async getManyForMemberUser(user, { listQueryOptions, includeGlobal, includeData, onlySharedWithMe, filters, }) {
         const { dependency: dependencyFilter } = filters ?? {};
@@ -174,7 +181,7 @@ let CredentialsService = class CredentialsService {
                 id: listQueryOptions.filter.projectId,
             });
             if (!project) {
-                return [];
+                return { credentials: [], count: 0 };
             }
             isPersonalProject = project.type === 'personal';
             personalProjectOwnerId = project.creatorId;
@@ -182,7 +189,7 @@ let CredentialsService = class CredentialsService {
         const sharingOptions = {};
         if (isPersonalProject && personalProjectOwnerId) {
             if (personalProjectOwnerId !== user.id && !(0, permissions_1.hasGlobalScope)(user, 'credential:read')) {
-                return [];
+                return { credentials: [], count: 0 };
             }
             sharingOptions.isPersonalProject = true;
             sharingOptions.personalProjectOwnerId = personalProjectOwnerId;
@@ -199,7 +206,7 @@ let CredentialsService = class CredentialsService {
             sharingOptions.projectRoles = projectRoles;
             sharingOptions.credentialRoles = credentialRoles;
         }
-        const { credentials } = await this.credentialsRepository.getManyAndCountWithSharingSubquery(user, sharingOptions, {
+        const { credentials, count } = await this.credentialsRepository.getManyAndCountWithSharingSubquery(user, sharingOptions, {
             ...listQueryOptions,
             ...(includeData ? { includeData: true } : {}),
             filters: {
@@ -207,9 +214,12 @@ let CredentialsService = class CredentialsService {
             },
         });
         if (includeGlobal) {
-            return await this.addGlobalCredentials(credentials, includeData, dependencyFilter, typeFilter);
+            return {
+                credentials: await this.addGlobalCredentials(credentials, includeData, dependencyFilter, typeFilter),
+                count,
+            };
         }
-        return credentials;
+        return { credentials, count };
     }
     async applyPersonalProjectFilter(listQueryOptions) {
         const projectId = typeof listQueryOptions.filter?.projectId === 'string'
@@ -352,11 +362,19 @@ let CredentialsService = class CredentialsService {
             relations,
         });
     }
+    applyDataMerge(incomingData, decryptedData, credentialType, dataMerge) {
+        if (dataMerge === 'replace') {
+            return incomingData;
+        }
+        const dataToUnredact = dataMerge === 'partial' ? { ...decryptedData, ...incomingData } : incomingData;
+        return this.unredact(dataToUnredact, decryptedData, this.getCredentialTypeProperties(credentialType));
+    }
     async prepareUpdateData(user, data, existingCredential, options) {
         const decryptedData = await this.decrypt(existingCredential, true);
+        const dataMerge = options?.dataMerge ?? 'unredact';
         const mergedData = (0, n8n_workflow_1.deepCopy)(data);
         if (mergedData.data) {
-            mergedData.data = this.unredact(mergedData.data, decryptedData, this.getCredentialTypeProperties(existingCredential.type));
+            mergedData.data = this.applyDataMerge(mergedData.data, decryptedData, existingCredential.type, dataMerge);
         }
         if (existingCredential.usageScope === 'instance') {
             await this.validateInstanceCredentialUpdate(existingCredential, mergedData.data ?? decryptedData, undefined, options?.operationContext);
@@ -378,13 +396,15 @@ let CredentialsService = class CredentialsService {
         }
         const updateData = this.credentialsRepository.create(mergedData);
         await (0, generic_helpers_1.validateEntity)(updateData);
-        if (decryptedData.oauthTokenData && !options?.clearOauthTokenData) {
-            updateData.data.oauthTokenData = decryptedData.oauthTokenData;
-        }
-        if (!options?.clearOauthTokenData) {
+        if (dataMerge !== 'replace' && !options?.clearOauthTokenData) {
+            if (decryptedData.oauthTokenData) {
+                updateData.data.oauthTokenData = decryptedData.oauthTokenData;
+            }
             this.restoreHiddenDcrFields(existingCredential.type, updateData.data, decryptedData);
         }
-        this.validateOAuthCredentialUrls(updateData.type, updateData.data);
+        if (updateData.data) {
+            this.validateOAuthCredentialUrls(updateData.type, updateData.data);
+        }
         return updateData;
     }
     restoreHiddenDcrFields(credentialType, dataToSave, storedData) {
@@ -562,6 +582,9 @@ let CredentialsService = class CredentialsService {
         });
         return result;
     }
+    async findCredentialOwningProject(credentialId) {
+        return await this.sharedCredentialsRepository.findCredentialOwningProject(credentialId);
+    }
     async delete(user, credentialId, options = {}) {
         const credential = await this.credentialsFinderService.findCredentialForUser(credentialId, user, ['credential:delete'], options);
         if (!credential) {
@@ -577,15 +600,33 @@ let CredentialsService = class CredentialsService {
             if (result.status === 'assigned') {
                 throw new bad_request_error_1.BadRequestError(`This credential is assigned to credential use "${result.credentialUseIds.join(', ')}" and cannot be deleted`);
             }
+            if (result.status === 'deleted') {
+                this.emitCredentialDeleted(user, credential);
+            }
             return;
         }
         await this.credentialsRepository.remove(credential);
+        this.emitCredentialDeleted(user, credential);
+    }
+    emitCredentialDeleted(user, credential) {
+        this.eventService.emit('credentials-deleted', {
+            user,
+            credentialType: credential.type,
+            credentialId: credential.id,
+        });
+        if (credential.isResolvable) {
+            this.eventService.emit('private-credential-deleted', {
+                user,
+                credentialType: credential.type,
+                credentialId: credential.id,
+            });
+        }
     }
     async test(userId, credentials) {
         return await this.credentialsTester.testCredentials(userId, credentials.type, credentials);
     }
     async testById(userId, credentialId) {
-        const storedCredential = await this.credentialsFinderService.findCredentialById(credentialId);
+        const storedCredential = await this.credentialsFinderService.findById(credentialId);
         if (!storedCredential || storedCredential.usageScope !== 'project') {
             throw new credential_not_found_error_1.CredentialNotFoundError(credentialId);
         }
@@ -967,6 +1008,11 @@ let CredentialsService = class CredentialsService {
     async createManagedCredential(dto, user) {
         return await this.createCredential({ ...dto, isManaged: true }, user);
     }
+    ensureEndUserCredentialAllowedInProject(project) {
+        if (project?.type === 'personal') {
+            throw new forbidden_error_1.ForbiddenError('End-user credentials are not available in personal projects');
+        }
+    }
     async ensureCanManageEndUserCredential(user, projectId) {
         const allowed = projectId !== undefined &&
             (await (0, check_access_1.userHasScopes)(user, ['credential:createEndUser'], false, { projectId }));
@@ -983,6 +1029,8 @@ let CredentialsService = class CredentialsService {
         }
         const targetProjectId = await this.resolveOwningProjectIdForNewCredential(user, opts.projectId);
         if (opts.isResolvable === true) {
+            const targetProject = await this.projectRepository.findOneBy({ id: targetProjectId });
+            this.ensureEndUserCredentialAllowedInProject(targetProject);
             await this.ensureCanManageEndUserCredential(user, targetProjectId);
         }
         await this.checkCredentialData(opts.type, opts.data, user, targetProjectId);
@@ -1115,6 +1163,6 @@ let CredentialsService = class CredentialsService {
 exports.CredentialsService = CredentialsService;
 exports.CredentialsService = CredentialsService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [db_1.CredentialsRepository, credential_dependency_service_1.CredentialDependencyService, db_1.SharedCredentialsRepository, ownership_service_1.OwnershipService, backend_common_1.Logger, n8n_core_1.ErrorReporter, credentials_tester_service_1.CredentialsTester, external_hooks_1.ExternalHooks, credential_types_1.CredentialTypes, db_1.ProjectRepository, project_service_ee_1.ProjectService, role_service_1.RoleService, db_1.UserRepository, credentials_finder_service_1.CredentialsFinderService, credentials_helper_1.CredentialsHelper, external_secrets_config_1.ExternalSecretsConfig, secret_provider_access_check_service_ee_1.SecretsProviderAccessCheckService, credential_connection_status_proxy_1.CredentialConnectionStatusProxy, db_1.InstanceCredentialAssignmentRepository, instance_credential_use_registry_1.InstanceCredentialUseRegistry, db_1.DbLockService])
+    __metadata("design:paramtypes", [db_1.CredentialsRepository, credential_dependency_service_1.CredentialDependencyService, db_1.SharedCredentialsRepository, ownership_service_1.OwnershipService, backend_common_1.Logger, n8n_core_1.ErrorReporter, credentials_tester_service_1.CredentialsTester, external_hooks_1.ExternalHooks, credential_types_1.CredentialTypes, db_1.ProjectRepository, project_service_ee_1.ProjectService, role_service_1.RoleService, db_1.UserRepository, credentials_finder_service_1.CredentialsFinderService, credentials_helper_1.CredentialsHelper, external_secrets_config_1.ExternalSecretsConfig, secret_provider_access_check_service_ee_1.SecretsProviderAccessCheckService, credential_connection_status_proxy_1.CredentialConnectionStatusProxy, db_1.InstanceCredentialAssignmentRepository, instance_credential_use_registry_1.InstanceCredentialUseRegistry, db_1.DbLockService, event_service_1.EventService])
 ], CredentialsService);
 //# sourceMappingURL=credentials.service.js.map