admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 01:56:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(core): Move UserRepository and subscribers to @n8n/db (#15352)

Browse Source
This commit is contained in:
Iván Ovejero
2025-05-13 15:24:26 +02:00
committed by GitHub
parent c42df1c268
commit e122b3f0f9
60 changed files with 75 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/cli/src/__tests__/external-hooks.test.ts
View File

@@ -1,12 +1,12 @@
import type { GlobalConfig } from '@n8n/config';
import type { WorkflowRepository } from '@n8n/db';
import type { CredentialsRepository, SettingsRepository } from '@n8n/db';
import type { UserRepository } from '@n8n/db';
import { mock } from 'jest-mock-extended';
import type { ErrorReporter, Logger } from 'n8n-core';
import type { IWorkflowBase } from 'n8n-workflow';
import { UnexpectedError } from 'n8n-workflow';
import type { UserRepository } from '@/databases/repositories/user.repository';
import { ExternalHooks } from '@/external-hooks';
describe('ExternalHooks', () => {

2
packages/cli/src/auth/__tests__/auth.service.test.ts
View File

@@ -1,6 +1,7 @@
import type { GlobalConfig } from '@n8n/config';
import type { User } from '@n8n/db';
import type { InvalidAuthTokenRepository } from '@n8n/db';
import type { UserRepository } from '@n8n/db';
import type { NextFunction, Response } from 'express';
import { mock } from 'jest-mock-extended';
import jwt from 'jsonwebtoken';
@@ -8,7 +9,6 @@ import jwt from 'jsonwebtoken';
import { AuthService } from '@/auth/auth.service';
import config from '@/config';
import { AUTH_COOKIE_NAME, Time } from '@/constants';
import type { UserRepository } from '@/databases/repositories/user.repository';
import type { AuthenticatedRequest } from '@/requests';
import { JwtService } from '@/services/jwt.service';
import type { UrlService } from '@/services/url.service';

3
packages/cli/src/auth/auth.service.ts
View File

@@ -1,6 +1,6 @@
import { GlobalConfig } from '@n8n/config';
import type { User } from '@n8n/db';
import { InvalidAuthTokenRepository } from '@n8n/db';
import { InvalidAuthTokenRepository, UserRepository } from '@n8n/db';
import { Service } from '@n8n/di';
import { createHash } from 'crypto';
import type { NextFunction, Response } from 'express';
@@ -9,7 +9,6 @@ import { Logger } from 'n8n-core';
import config from '@/config';
import { AUTH_COOKIE_NAME, RESPONSE_ERROR_MESSAGES, Time } from '@/constants';
import { UserRepository } from '@/databases/repositories/user.repository';
import { AuthError } from '@/errors/response-errors/auth.error';
import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
import { License } from '@/license';

2
packages/cli/src/auth/methods/email.ts
View File

@@ -1,7 +1,7 @@
import type { User } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import { UserRepository } from '@/databases/repositories/user.repository';
import { AuthError } from '@/errors/response-errors/auth.error';
import { EventService } from '@/events/event.service';
import { isLdapLoginEnabled } from '@/ldap.ee/helpers.ee';

2
packages/cli/src/collaboration/collaboration.service.ts
View File

@@ -1,12 +1,12 @@
import type { PushPayload } from '@n8n/api-types';
import type { User } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Service } from '@n8n/di';
import { ErrorReporter } from 'n8n-core';
import type { Workflow } from 'n8n-workflow';
import { UnexpectedError } from 'n8n-workflow';
import { CollaborationState } from '@/collaboration/collaboration.state';
import { UserRepository } from '@/databases/repositories/user.repository';
import { Push } from '@/push';
import type { OnPushMessage } from '@/push/types';
import { AccessService } from '@/services/access.service';

3
packages/cli/src/commands/community-node.ts
View File

@@ -1,10 +1,9 @@
import { type InstalledNodes, type InstalledPackages, type User } from '@n8n/db';
import { CredentialsRepository, InstalledNodesRepository } from '@n8n/db';
import { CredentialsRepository, InstalledNodesRepository, UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import { Flags } from '@oclif/core';
import { CredentialsService } from '@/credentials/credentials.service';
import { UserRepository } from '@/databases/repositories/user.repository';
import { CommunityPackagesService } from '@/services/community-packages.service';
import { BaseCommand } from './base-command';

2
packages/cli/src/commands/import/workflow.ts
View File

@@ -4,6 +4,7 @@ import {
ProjectRepository,
SharedWorkflowRepository,
WorkflowRepository,
UserRepository,
} from '@n8n/db';
import { Container } from '@n8n/di';
import { Flags } from '@oclif/core';
@@ -13,7 +14,6 @@ import type { IWorkflowBase, WorkflowId } from 'n8n-workflow';
import { jsonParse, UserError } from 'n8n-workflow';
import { UM_FIX_INSTRUCTION } from '@/constants';
import { UserRepository } from '@/databases/repositories/user.repository';
import type { IWorkflowToImport } from '@/interfaces';
import { ImportService } from '@/services/import.service';

2
packages/cli/src/commands/ldap/reset.ts
View File

@@ -6,6 +6,7 @@ import {
SettingsRepository,
SharedCredentialsRepository,
SharedWorkflowRepository,
UserRepository,
} from '@n8n/db';
import { Container } from '@n8n/di';
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
@@ -15,7 +16,6 @@ import { UserError } from 'n8n-workflow';
import { UM_FIX_INSTRUCTION } from '@/constants';
import { CredentialsService } from '@/credentials/credentials.service';
import { UserRepository } from '@/databases/repositories/user.repository';
import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap.ee/constants';
import { WorkflowService } from '@/workflows/workflow.service';

3
packages/cli/src/commands/user-management/reset.ts
View File

@@ -6,11 +6,10 @@ import {
SettingsRepository,
SharedCredentialsRepository,
SharedWorkflowRepository,
UserRepository,
} from '@n8n/db';
import { Container } from '@n8n/di';
import { UserRepository } from '@/databases/repositories/user.repository';
import { BaseCommand } from '../base-command';
const defaultUserProps = {

2
packages/cli/src/controllers/__tests__/auth.controller.test.ts
View File

@@ -1,5 +1,6 @@
import type { LoginRequestDto } from '@n8n/api-types';
import type { User } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import type { Response } from 'express';
import { mock } from 'jest-mock-extended';
@@ -8,7 +9,6 @@ import { Logger } from 'n8n-core';
import * as auth from '@/auth';
import { AuthService } from '@/auth/auth.service';
import config from '@/config';
import { UserRepository } from '@/databases/repositories/user.repository';
import { EventService } from '@/events/event.service';
import { License } from '@/license';
import { MfaService } from '@/mfa/mfa.service';

2
packages/cli/src/controllers/__tests__/me.controller.test.ts
View File

@@ -3,6 +3,7 @@ import type { User } from '@n8n/db';
import type { PublicUser } from '@n8n/db';
import { AuthUserRepository } from '@n8n/db';
import { InvalidAuthTokenRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import type { Response } from 'express';
import { mock, anyObject } from 'jest-mock-extended';
@@ -10,7 +11,6 @@ import jwt from 'jsonwebtoken';
import { AUTH_COOKIE_NAME } from '@/constants';
import { MeController } from '@/controllers/me.controller';
import { UserRepository } from '@/databases/repositories/user.repository';
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
import { InvalidMfaCodeError } from '@/errors/response-errors/invalid-mfa-code.error';
import { EventService } from '@/events/event.service';

2
packages/cli/src/controllers/__tests__/owner.controller.test.ts
View File

@@ -1,6 +1,7 @@
import type { DismissBannerRequestDto, OwnerSetupRequestDto } from '@n8n/api-types';
import type { User } from '@n8n/db';
import type { PublicUser, SettingsRepository } from '@n8n/db';
import type { UserRepository } from '@n8n/db';
import type { Response } from 'express';
import { mock } from 'jest-mock-extended';
import type { Logger } from 'n8n-core';
@@ -8,7 +9,6 @@ import type { Logger } from 'n8n-core';
import type { AuthService } from '@/auth/auth.service';
import config from '@/config';
import { OwnerController } from '@/controllers/owner.controller';
import type { UserRepository } from '@/databases/repositories/user.repository';
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
import type { EventService } from '@/events/event.service';
import type { AuthenticatedRequest } from '@/requests';

2
packages/cli/src/controllers/__tests__/users.controller.test.ts
View File

@@ -1,7 +1,7 @@
import type { User } from '@n8n/db';
import type { UserRepository } from '@n8n/db';
import { mock } from 'jest-mock-extended';
import type { UserRepository } from '@/databases/repositories/user.repository';
import type { EventService } from '@/events/event.service';
import type { AuthenticatedRequest } from '@/requests';
import type { ProjectService } from '@/services/project.service.ee';

2
packages/cli/src/controllers/auth.controller.ts
View File

@@ -1,5 +1,6 @@
import { LoginRequestDto, ResolveSignupTokenQueryDto } from '@n8n/api-types';
import type { User, PublicUser } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Body, Get, Post, Query, RestController } from '@n8n/decorators';
import { isEmail } from 'class-validator';
import { Response } from 'express';
@@ -8,7 +9,6 @@ import { Logger } from 'n8n-core';
import { handleEmailLogin, handleLdapLogin } from '@/auth';
import { AuthService } from '@/auth/auth.service';
import { RESPONSE_ERROR_MESSAGES } from '@/constants';
import { UserRepository } from '@/databases/repositories/user.repository';
import { AuthError } from '@/errors/response-errors/auth.error';
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
import { ForbiddenError } from '@/errors/response-errors/forbidden.error';

3
packages/cli/src/controllers/e2e.controller.ts
View File

@@ -1,7 +1,7 @@
import type { PushMessage } from '@n8n/api-types';
import type { BooleanLicenseFeature, NumericLicenseFeature } from '@n8n/constants';
import { LICENSE_FEATURES, LICENSE_QUOTAS, UNLIMITED_LICENSE_QUOTA } from '@n8n/constants';
import { AuthUserRepository, SettingsRepository } from '@n8n/db';
import { AuthUserRepository, SettingsRepository, UserRepository } from '@n8n/db';
import { Patch, Post, RestController } from '@n8n/decorators';
import { Container } from '@n8n/di';
import { Request } from 'express';
@@ -11,7 +11,6 @@ import { v4 as uuid } from 'uuid';
import { ActiveWorkflowManager } from '@/active-workflow-manager';
import config from '@/config';
import { inE2ETests } from '@/constants';
import { UserRepository } from '@/databases/repositories/user.repository';
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
import type { FeatureReturnType } from '@/license';
import { License } from '@/license';

2
packages/cli/src/controllers/invitation.controller.ts
View File

@@ -1,5 +1,6 @@
import { AcceptInvitationRequestDto, InviteUsersRequestDto } from '@n8n/api-types';
import type { User } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Post, GlobalScope, RestController, Body, Param } from '@n8n/decorators';
import { Response } from 'express';
import { Logger } from 'n8n-core';
@@ -7,7 +8,6 @@ import { Logger } from 'n8n-core';
import { AuthService } from '@/auth/auth.service';
import config from '@/config';
import { RESPONSE_ERROR_MESSAGES } from '@/constants';
import { UserRepository } from '@/databases/repositories/user.repository';
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
import { EventService } from '@/events/event.service';

2
packages/cli/src/controllers/me.controller.ts
View File

@@ -5,13 +5,13 @@ import {
UserUpdateRequestDto,
} from '@n8n/api-types';
import type { User, PublicUser } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Body, Patch, Post, RestController } from '@n8n/decorators';
import { plainToInstance } from 'class-transformer';
import { Response } from 'express';
import { Logger } from 'n8n-core';
import { AuthService } from '@/auth/auth.service';
import { UserRepository } from '@/databases/repositories/user.repository';
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
import { InvalidMfaCodeError } from '@/errors/response-errors/invalid-mfa-code.error';
import { EventService } from '@/events/event.service';

3
packages/cli/src/controllers/owner.controller.ts
View File

@@ -1,12 +1,11 @@
import { DismissBannerRequestDto, OwnerSetupRequestDto } from '@n8n/api-types';
import { SettingsRepository } from '@n8n/db';
import { SettingsRepository, UserRepository } from '@n8n/db';
import { Body, GlobalScope, Post, RestController } from '@n8n/decorators';
import { Response } from 'express';
import { Logger } from 'n8n-core';
import { AuthService } from '@/auth/auth.service';
import config from '@/config';
import { UserRepository } from '@/databases/repositories/user.repository';
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
import { EventService } from '@/events/event.service';
import { validateEntity } from '@/generic-helpers';

2
packages/cli/src/controllers/password-reset.controller.ts
View File

@@ -3,6 +3,7 @@ import {
ForgotPasswordRequestDto,
ResolvePasswordTokenQueryDto,
} from '@n8n/api-types';
import { UserRepository } from '@n8n/db';
import { Body, Get, Post, Query, RestController } from '@n8n/decorators';
import { hasGlobalScope } from '@n8n/permissions';
import { Response } from 'express';
@@ -10,7 +11,6 @@ import { Logger } from 'n8n-core';
import { AuthService } from '@/auth/auth.service';
import { RESPONSE_ERROR_MESSAGES } from '@/constants';
import { UserRepository } from '@/databases/repositories/user.repository';
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
import { InternalServerError } from '@/errors/response-errors/internal-server.error';

2
packages/cli/src/controllers/users.controller.ts
View File

@@ -7,6 +7,7 @@ import {
ProjectRepository,
SharedCredentialsRepository,
SharedWorkflowRepository,
UserRepository,
} from '@n8n/db';
import {
GlobalScope,
@@ -23,7 +24,6 @@ import { Logger } from 'n8n-core';
import { AuthService } from '@/auth/auth.service';
import { CredentialsService } from '@/credentials/credentials.service';
import { UserRepository } from '@/databases/repositories/user.repository';
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
import { NotFoundError } from '@/errors/response-errors/not-found.error';

2
packages/cli/src/credentials/credentials.service.ts
View File

@@ -6,6 +6,7 @@ import {
CredentialsRepository,
ProjectRepository,
SharedCredentialsRepository,
UserRepository,
} from '@n8n/db';
import { Service } from '@n8n/di';
import { hasGlobalScope, type Scope } from '@n8n/permissions';
@@ -28,7 +29,6 @@ import { CREDENTIAL_EMPTY_VALUE, deepCopy, NodeHelpers, UnexpectedError } from '
import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
import { CredentialTypes } from '@/credential-types';
import { createCredentialsFromCredentialsEntity } from '@/credentials-helper';
import { UserRepository } from '@/databases/repositories/user.repository';
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
import { NotFoundError } from '@/errors/response-errors/not-found.error';
import { ExternalHooks } from '@/external-hooks';

3
packages/cli/src/databases/db-connection-options.ts
View File

@@ -1,5 +1,5 @@
import { DatabaseConfig, InstanceSettingsConfig } from '@n8n/config';
import { entities } from '@n8n/db';
import { entities, subscribers } from '@n8n/db';
import { Service } from '@n8n/di';
import type { DataSourceOptions, LoggerOptions } from '@n8n/typeorm';
import type { MysqlConnectionOptions } from '@n8n/typeorm/driver/mysql/MysqlConnectionOptions';
@@ -17,7 +17,6 @@ import { InsightsRaw } from '@/modules/insights/database/entities/insights-raw';
import { mysqlMigrations } from './migrations/mysqldb';
import { postgresMigrations } from './migrations/postgresdb';
import { sqliteMigrations } from './migrations/sqlite';
import { subscribers } from './subscribers';
@Service()
export class DbConnectionOptions {

184
packages/cli/src/databases/repositories/user.repository.ts
View File

@@ -1,184 +0,0 @@
import { Project, ProjectRelation, User } from '@n8n/db';
import { Service } from '@n8n/di';
import type { GlobalRole } from '@n8n/permissions';
import type { DeepPartial, EntityManager, FindManyOptions } from '@n8n/typeorm';
import { DataSource, In, IsNull, Not, Repository } from '@n8n/typeorm';
import type { ListQuery } from '@/requests';
@Service()
export class UserRepository extends Repository<User> {
constructor(dataSource: DataSource) {
super(User, dataSource.manager);
}
async findManyByIds(userIds: string[]) {
return await this.find({
where: { id: In(userIds) },
});
}
/**
* @deprecated Use `UserRepository.save` instead if you can.
*
* We need to use `save` so that that the subscriber in
* packages/cli/src/databases/entities/Project.ts receives the full user.
* With `update` it would only receive the updated fields, e.g. the `id`
* would be missing. test('does not use `Repository.update`, but
* `Repository.save` instead'.
*/
async update(...args: Parameters<Repository<User>['update']>) {
return await super.update(...args);
}
async deleteAllExcept(user: User) {
await this.delete({ id: Not(user.id) });
}
async getByIds(transaction: EntityManager, ids: string[]) {
return await transaction.find(User, { where: { id: In(ids) } });
}
async findManyByEmail(emails: string[]) {
return await this.find({
where: { email: In(emails) },
select: ['email', 'password', 'id'],
});
}
async deleteMany(userIds: string[]) {
return await this.delete({ id: In(userIds) });
}
async findNonShellUser(email: string) {
return await this.findOne({
where: {
email,
password: Not(IsNull()),
},
relations: ['authIdentities'],
});
}
/** Counts the number of users in each role, e.g. `{ admin: 2, member: 6, owner: 1 }` */
async countUsersByRole() {
const rows = (await this.createQueryBuilder()
.select(['role', 'COUNT(role) as count'])
.groupBy('role')
.execute()) as Array<{ role: GlobalRole; count: string }>;
return rows.reduce(
(acc, row) => {
acc[row.role] = parseInt(row.count, 10);
return acc;
},
{} as Record<GlobalRole, number>,
);
}
async toFindManyOptions(listQueryOptions?: ListQuery.Options) {
const findManyOptions: FindManyOptions<User> = {};
if (!listQueryOptions) {
findManyOptions.relations = ['authIdentities'];
return findManyOptions;
}
const { filter, select, take, skip } = listQueryOptions;
if (select) findManyOptions.select = select;
if (take) findManyOptions.take = take;
if (skip) findManyOptions.skip = skip;
if (take && !select) {
findManyOptions.relations = ['authIdentities'];
}
if (take && select && !select?.id) {
findManyOptions.select = { ...findManyOptions.select, id: true }; // pagination requires id
}
if (filter) {
const { isOwner, ...otherFilters } = filter;
findManyOptions.where = otherFilters;
if (isOwner !== undefined) {
findManyOptions.where.role = isOwner ? 'global:owner' : Not('global:owner');
}
}
return findManyOptions;
}
/**
* Get emails of users who have completed setup, by user IDs.
*/
async getEmailsByIds(userIds: string[]) {
return await this.find({
select: ['email'],
where: { id: In(userIds), password: Not(IsNull()) },
});
}
async createUserWithProject(
user: DeepPartial<User>,
transactionManager?: EntityManager,
): Promise<{ user: User; project: Project }> {
const createInner = async (entityManager: EntityManager) => {
const newUser = entityManager.create(User, user);
const savedUser = await entityManager.save<User>(newUser);
const savedProject = await entityManager.save<Project>(
entityManager.create(Project, {
type: 'personal',
name: savedUser.createPersonalProjectName(),
}),
);
await entityManager.save<ProjectRelation>(
entityManager.create(ProjectRelation, {
projectId: savedProject.id,
userId: savedUser.id,
role: 'project:personalOwner',
}),
);
return { user: savedUser, project: savedProject };
};
if (transactionManager) {
return await createInner(transactionManager);
}
// TODO: use a transactions
// This is blocked by TypeORM having concurrency issues with transactions
return await createInner(this.manager);
}
/**
* Find the user that owns the personal project that owns the workflow.
*
* Returns null if the workflow does not exist or is owned by a team project.
*/
async findPersonalOwnerForWorkflow(workflowId: string): Promise<User | null> {
return await this.findOne({
where: {
projectRelations: {
role: 'project:personalOwner',
project: { sharedWorkflows: { workflowId, role: 'workflow:owner' } },
},
},
});
}
/**
* Find the user that owns the personal project.
*
* Returns null if the project does not exist or is not a personal project.
*/
async findPersonalOwnerForProject(projectId: string): Promise<User | null> {
return await this.findOne({
where: {
projectRelations: {
role: 'project:personalOwner',
projectId,
},
},
});
}
}

5
packages/cli/src/databases/subscribers/index.ts
View File

@@ -1,5 +0,0 @@
import { UserSubscriber } from './user-subscriber';
export const subscribers = {
UserSubscriber,
};

77
packages/cli/src/databases/subscribers/user-subscriber.ts
View File

@@ -1,77 +0,0 @@
import { Project, User } from '@n8n/db';
import { Container } from '@n8n/di';
import type { EntitySubscriberInterface, UpdateEvent } from '@n8n/typeorm';
import { EventSubscriber } from '@n8n/typeorm';
import { ErrorReporter, Logger } from 'n8n-core';
import { UnexpectedError } from 'n8n-workflow';
import { UserRepository } from '../repositories/user.repository';
@EventSubscriber()
export class UserSubscriber implements EntitySubscriberInterface<User> {
private readonly eventReporter = Container.get(ErrorReporter);
listenTo() {
return User;
}
async afterUpdate(event: UpdateEvent<User>): Promise<void> {
if (event.entity) {
const newUserData = event.entity;
if (event.databaseEntity) {
const fields = event.updatedColumns.map((c) => c.propertyName);
if (
fields.includes('firstName') ||
fields.includes('lastName') ||
fields.includes('email')
) {
const oldUser = event.databaseEntity;
const userEntity =
newUserData instanceof User
? newUserData
: Container.get(UserRepository).create(newUserData);
const projectName = userEntity.createPersonalProjectName();
const project = await event.manager.findOneBy(Project, {
type: 'personal',
projectRelations: { userId: oldUser.id },
});
if (!project) {
// Since this is benign we're not throwing the exception. We don't
// know if we're running inside a transaction and thus there is a risk
// that this could cause further data inconsistencies.
const message = "Could not update the personal project's name";
Container.get(Logger).warn(message, event.entity);
const exception = new UnexpectedError(message);
this.eventReporter.warn(exception, event.entity);
return;
}
project.name = projectName;
await event.manager.save(Project, project);
}
} else {
// This means the user was updated using `Repository.update`. In this
// case we're missing the user's id and cannot update their project.
//
// When updating the user's firstName, lastName or email we must use
// `Repository.save`, so this is a bug and we should report it to sentry.
//
if (event.entity.firstName || event.entity.lastName || event.entity.email) {
// Since this is benign we're not throwing the exception. We don't
// know if we're running inside a transaction and thus there is a risk
// that this could cause further data inconsistencies.
const message = "Could not update the personal project's name";
Container.get(Logger).warn(message, event.entity);
const exception = new UnexpectedError(message);
this.eventReporter.warn(exception, event.entity);
}
}
}
}
}

2
packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
View File

@@ -11,6 +11,7 @@ import {
SharedCredentialsRepository,
SharedWorkflowRepository,
WorkflowRepository,
UserRepository,
} from '@n8n/db';
import { Service } from '@n8n/di';
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
@@ -23,7 +24,6 @@ import path from 'path';
import { ActiveWorkflowManager } from '@/active-workflow-manager';
import { CredentialsService } from '@/credentials/credentials.service';
import { UserRepository } from '@/databases/repositories/user.repository';
import type { IWorkflowToImport } from '@/interfaces';
import { isUniqueConstraintError } from '@/response-helper';
import { TagService } from '@/services/tag.service';

8
packages/cli/src/external-hooks.ts
View File

@@ -2,7 +2,12 @@ import type { FrontendSettings, UserUpdateRequestDto } from '@n8n/api-types';
import type { ClientOAuth2Options } from '@n8n/client-oauth2';
import { GlobalConfig } from '@n8n/config';
import type { TagEntity, User, ICredentialsDb, PublicUser } from '@n8n/db';
import { CredentialsRepository, WorkflowRepository, SettingsRepository } from '@n8n/db';
import {
CredentialsRepository,
WorkflowRepository,
SettingsRepository,
UserRepository,
} from '@n8n/db';
import { Service } from '@n8n/di';
import { ErrorReporter, Logger } from 'n8n-core';
import type { IRun, IWorkflowBase, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
@@ -11,7 +16,6 @@ import type clientOAuth1 from 'oauth-1.0a';
import type { AbstractServer } from '@/abstract-server';
import type { Config } from '@/config';
import { UserRepository } from '@/databases/repositories/user.repository';
type Repositories = {
User: UserRepository;

2
packages/cli/src/ldap.ee/__tests__/helpers.test.ts
View File

@@ -1,8 +1,8 @@
import { generateNanoId } from '@n8n/db';
import { AuthIdentity } from '@n8n/db';
import { User } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { UserRepository } from '@/databases/repositories/user.repository';
import * as helpers from '@/ldap.ee/helpers.ee';
import { mockInstance } from '@test/mocking';

2
packages/cli/src/ldap.ee/helpers.ee.ts
View File

@@ -4,6 +4,7 @@ import {
User,
AuthIdentityRepository,
AuthProviderSyncHistoryRepository,
UserRepository,
} from '@n8n/db';
import { Container } from '@n8n/di';
import { validate } from 'jsonschema';
@@ -12,7 +13,6 @@ import { Filter } from 'ldapts/filters/Filter';
import { randomString } from 'n8n-workflow';
import config from '@/config';
import { UserRepository } from '@/databases/repositories/user.repository';
import { License } from '@/license';
import {

2
packages/cli/src/mfa/helpers.ts
View File

@@ -1,7 +1,7 @@
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import config from '@/config';
import { UserRepository } from '@/databases/repositories/user.repository';
import { MFA_FEATURE_ENABLED } from './constants';

3
packages/cli/src/public-api/v1/handlers/users/users.service.ee.ts
View File

@@ -1,12 +1,11 @@
import type { User } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
import { In } from '@n8n/typeorm';
import pick from 'lodash/pick';
import { validate as uuidValidate } from 'uuid';
import { UserRepository } from '@/databases/repositories/user.repository';
export async function getUser(data: {
withIdentifier: string;
includeRole?: boolean;

2
packages/cli/src/services/__tests__/hooks.service.test.ts
View File

@@ -2,12 +2,12 @@ import type { AuthUser, SettingsRepository } from '@n8n/db';
import type { AuthUserRepository } from '@n8n/db';
import type { CredentialsRepository } from '@n8n/db';
import type { WorkflowRepository } from '@n8n/db';
import type { UserRepository } from '@n8n/db';
import RudderStack from '@rudderstack/rudder-sdk-node';
import type { Response } from 'express';
import { mock } from 'jest-mock-extended';
import type { AuthService } from '@/auth/auth.service';
import type { UserRepository } from '@/databases/repositories/user.repository';
import type { Invitation } from '@/interfaces';
import type { AuthenticatedRequest } from '@/requests';
import { HooksService } from '@/services/hooks.service';

2
packages/cli/src/services/__tests__/ownership.service.test.ts
View File

@@ -2,10 +2,10 @@ import type { SharedCredentials } from '@n8n/db';
import { Project, SharedWorkflow, User, WorkflowEntity, ProjectRelation } from '@n8n/db';
import { ProjectRelationRepository } from '@n8n/db';
import { SharedWorkflowRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { mock } from 'jest-mock-extended';
import { v4 as uuid } from 'uuid';
import { UserRepository } from '@/databases/repositories/user.repository';
import { OwnershipService } from '@/services/ownership.service';
import { mockCredential, mockProject } from '@test/mock-objects';
import { mockInstance } from '@test/mocking';

2
packages/cli/src/services/__tests__/public-api-key.service.test.ts
View File

@@ -1,4 +1,5 @@
import { ApiKeyRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import type { ApiKeyScope } from '@n8n/permissions';
import type { Response, NextFunction } from 'express';
@@ -8,7 +9,6 @@ import type { InstanceSettings } from 'n8n-core';
import { randomString } from 'n8n-workflow';
import type { OpenAPIV3 } from 'openapi-types';
import { UserRepository } from '@/databases/repositories/user.repository';
import type { EventService } from '@/events/event.service';
import { getOwnerOnlyApiKeyScopes } from '@/public-api/permissions.ee';
import type { AuthenticatedRequest } from '@/requests';

2
packages/cli/src/services/__tests__/user.service.test.ts
View File

@@ -1,9 +1,9 @@
import { GlobalConfig } from '@n8n/config';
import { User } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { mock } from 'jest-mock-extended';
import { v4 as uuid } from 'uuid';
import { UserRepository } from '@/databases/repositories/user.repository';
import { UrlService } from '@/services/url.service';
import { UserService } from '@/services/user.service';
import { mockInstance } from '@test/mocking';

2
packages/cli/src/services/access.service.ts
View File

@@ -1,8 +1,8 @@
import type { User } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Service } from '@n8n/di';
import type { Workflow } from 'n8n-workflow';
import { UserRepository } from '@/databases/repositories/user.repository';
import { WorkflowFinderService } from '@/workflows/workflow-finder.service';
/**

2
packages/cli/src/services/hooks.service.ts
View File

@@ -4,6 +4,7 @@ import {
CredentialsRepository,
WorkflowRepository,
SettingsRepository,
UserRepository,
} from '@n8n/db';
import { Service } from '@n8n/di';
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
@@ -13,7 +14,6 @@ import RudderStack, { type constructorOptions } from '@rudderstack/rudder-sdk-no
import type { NextFunction, Response } from 'express';
import { AuthService } from '@/auth/auth.service';
import { UserRepository } from '@/databases/repositories/user.repository';
import type { Invitation } from '@/interfaces';
import type { AuthenticatedRequest } from '@/requests';
import { UserService } from '@/services/user.service';

8
packages/cli/src/services/ownership.service.ts
View File

@@ -1,8 +1,12 @@
import type { Project, User, ListQueryDb } from '@n8n/db';
import { ProjectRelationRepository, ProjectRepository, SharedWorkflowRepository } from '@n8n/db';
import {
ProjectRelationRepository,
ProjectRepository,
SharedWorkflowRepository,
UserRepository,
} from '@n8n/db';
import { Service } from '@n8n/di';
import { UserRepository } from '@/databases/repositories/user.repository';
import { CacheService } from '@/services/cache/cache.service';
@Service()

3
packages/cli/src/services/public-api-key.service.ts
View File

@@ -1,7 +1,7 @@
import type { UnixTimestamp, UpdateApiKeyRequestDto } from '@n8n/api-types';
import type { CreateApiKeyRequestDto } from '@n8n/api-types/src/dto/api-keys/create-api-key-request.dto';
import type { User } from '@n8n/db';
import { ApiKey, ApiKeyRepository } from '@n8n/db';
import { ApiKey, ApiKeyRepository, UserRepository } from '@n8n/db';
import { Service } from '@n8n/di';
import type { GlobalRole, ApiKeyScope } from '@n8n/permissions';
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
@@ -10,7 +10,6 @@ import type { NextFunction, Request, Response } from 'express';
import { TokenExpiredError } from 'jsonwebtoken';
import type { OpenAPIV3 } from 'openapi-types';
import { UserRepository } from '@/databases/repositories/user.repository';
import { EventService } from '@/events/event.service';
import { getApiKeyScopesForRole, getOwnerOnlyApiKeyScopes } from '@/public-api/permissions.ee';
import type { AuthenticatedRequest } from '@/requests';

3
packages/cli/src/services/user.service.ts
View File

@@ -1,13 +1,12 @@
import type { RoleChangeRequestDto } from '@n8n/api-types';
import { User } from '@n8n/db';
import type { PublicUser } from '@n8n/db';
import { User, UserRepository } from '@n8n/db';
import { Service } from '@n8n/di';
import { getGlobalScopes, type AssignableGlobalRole } from '@n8n/permissions';
import { Logger } from 'n8n-core';
import type { IUserSettings } from 'n8n-workflow';
import { UnexpectedError } from 'n8n-workflow';
import { UserRepository } from '@/databases/repositories/user.repository';
import { InternalServerError } from '@/errors/response-errors/internal-server.error';
import { EventService } from '@/events/event.service';
import type { Invitation } from '@/interfaces';

2
packages/cli/src/sso.ee/saml/__tests__/saml-helpers.test.ts
View File

@@ -2,8 +2,8 @@ import type { AuthIdentity } from '@n8n/db';
import { generateNanoId } from '@n8n/db';
import { User } from '@n8n/db';
import { AuthIdentityRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { UserRepository } from '@/databases/repositories/user.repository';
import * as helpers from '@/sso.ee/saml/saml-helpers';
import type { SamlUserAttributes } from '@/sso.ee/saml/types';
import { mockInstance } from '@test/mocking';

3
packages/cli/src/sso.ee/saml/saml-helpers.ts
View File

@@ -1,12 +1,11 @@
import type { SamlAcsDto, SamlPreferences } from '@n8n/api-types';
import type { User } from '@n8n/db';
import { AuthIdentity, AuthIdentityRepository } from '@n8n/db';
import { AuthIdentity, AuthIdentityRepository, UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import { randomString } from 'n8n-workflow';
import type { FlowResult } from 'samlify/types/src/flow';
import config from '@/config';
import { UserRepository } from '@/databases/repositories/user.repository';
import { AuthError } from '@/errors/response-errors/auth.error';
import { InternalServerError } from '@/errors/response-errors/internal-server.error';
import { License } from '@/license';

3
packages/cli/src/sso.ee/saml/saml.service.ee.ts
View File

@@ -1,6 +1,6 @@
import type { SamlPreferences } from '@n8n/api-types';
import { SettingsRepository } from '@n8n/db';
import type { Settings, User } from '@n8n/db';
import { SettingsRepository, UserRepository } from '@n8n/db';
import { Service } from '@n8n/di';
import axios from 'axios';
import type express from 'express';
@@ -10,7 +10,6 @@ import { jsonParse, UnexpectedError } from 'n8n-workflow';
import type { IdentityProviderInstance, ServiceProviderInstance } from 'samlify';
import type { BindingContext, PostBindingContext } from 'samlify/types/src/entity';
import { UserRepository } from '@/databases/repositories/user.repository';
import { AuthError } from '@/errors/response-errors/auth.error';
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
import { UrlService } from '@/services/url.service';

8
packages/cli/src/telemetry/index.ts
View File

@@ -1,5 +1,10 @@
import { GlobalConfig } from '@n8n/config';
import { ProjectRelationRepository, ProjectRepository, WorkflowRepository } from '@n8n/db';
import {
ProjectRelationRepository,
ProjectRepository,
WorkflowRepository,
UserRepository,
} from '@n8n/db';
import { OnShutdown } from '@n8n/decorators';
import { Container, Service } from '@n8n/di';
import type RudderStack from '@rudderstack/rudder-sdk-node';
@@ -8,7 +13,6 @@ import { InstanceSettings, Logger } from 'n8n-core';
import type { ITelemetryTrackProperties } from 'n8n-workflow';
import { LOWEST_SHUTDOWN_PRIORITY, N8N_VERSION } from '@/constants';
import { UserRepository } from '@/databases/repositories/user.repository';
import type { IExecutionTrackProperties } from '@/interfaces';
import { License } from '@/license';
import { PostHogClient } from '@/posthog';

2
packages/cli/src/user-management/email/user-management-mailer.ts
View File

@@ -1,5 +1,6 @@
import { GlobalConfig } from '@n8n/config';
import type { User } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container, Service } from '@n8n/di';
import { existsSync } from 'fs';
import { readFile } from 'fs/promises';
@@ -9,7 +10,6 @@ import type { IWorkflowBase } from 'n8n-workflow';
import { join as pathJoin } from 'path';
import { inTest } from '@/constants';
import { UserRepository } from '@/databases/repositories/user.repository';
import { InternalServerError } from '@/errors/response-errors/internal-server.error';
import { EventService } from '@/events/event.service';
import { UrlService } from '@/services/url.service';

2
packages/cli/test/integration/ai/ai.api.test.ts
View File

@@ -3,13 +3,13 @@ import type { User } from '@n8n/db';
import { CredentialsRepository } from '@n8n/db';
import { ProjectRepository } from '@n8n/db';
import { SharedCredentialsRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import { randomUUID } from 'crypto';
import { mock } from 'jest-mock-extended';
import { OPEN_AI_API_CREDENTIAL_TYPE } from 'n8n-workflow';
import { FREE_AI_CREDITS_CREDENTIAL_NAME } from '@/constants';
import { UserRepository } from '@/databases/repositories/user.repository';
import { AiService } from '@/services/ai.service';
import { createOwner } from '../shared/db/users';

2
packages/cli/test/integration/auth.api.test.ts
View File

@@ -1,10 +1,10 @@
import type { User } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import validator from 'validator';
import config from '@/config';
import { AUTH_COOKIE_NAME } from '@/constants';
import { UserRepository } from '@/databases/repositories/user.repository';
import { MfaService } from '@/mfa/mfa.service';
import { LOGGED_OUT_RESPONSE_BODY } from './shared/constants';

2
packages/cli/test/integration/commands/reset.cmd.test.ts
View File

@@ -2,10 +2,10 @@ import { CredentialsEntity, SettingsRepository } from '@n8n/db';
import { CredentialsRepository } from '@n8n/db';
import { SharedCredentialsRepository } from '@n8n/db';
import { SharedWorkflowRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import { Reset } from '@/commands/user-management/reset';
import { UserRepository } from '@/databases/repositories/user.repository';
import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
import { NodeTypes } from '@/node-types';
import { setupTestCommand } from '@test-integration/utils/test-command';

2
packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts
View File

@@ -1,9 +1,9 @@
import type { User } from '@n8n/db';
import { ProjectRelationRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import { Not } from '@n8n/typeorm';
import { UserRepository } from '@/databases/repositories/user.repository';
import { EventService } from '@/events/event.service';
import { ExternalHooks } from '@/external-hooks';
import { PasswordUtility } from '@/services/password.utility';

3
packages/cli/test/integration/database/repositories/project.repository.test.ts
View File

@@ -1,10 +1,9 @@
import { AuthIdentity } from '@n8n/db';
import { ProjectRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import { EntityNotFoundError } from '@n8n/typeorm';
import { UserRepository } from '@/databases/repositories/user.repository';
import { createTeamProject } from '../../shared/db/projects';
import { createMember, createOwner } from '../../shared/db/users';
import * as testDb from '../../shared/test-db';

2
packages/cli/test/integration/environments/source-control-import.service.test.ts
View File

@@ -3,6 +3,7 @@ import { CredentialsRepository } from '@n8n/db';
import { FolderRepository } from '@n8n/db';
import { ProjectRepository } from '@n8n/db';
import { SharedCredentialsRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import { mock } from 'jest-mock-extended';
import { Cipher } from 'n8n-core';
@@ -11,7 +12,6 @@ import * as utils from 'n8n-workflow';
import { nanoid } from 'nanoid';
import fsp from 'node:fs/promises';
import { UserRepository } from '@/databases/repositories/user.repository';
import { SourceControlImportService } from '@/environments.ee/source-control/source-control-import.service.ee';
import type { ExportableCredential } from '@/environments.ee/source-control/types/exportable-credential';

2
packages/cli/test/integration/ldap/ldap.api.test.ts
View File

@@ -1,12 +1,12 @@
import type { User } from '@n8n/db';
import { AuthProviderSyncHistoryRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import { Not } from '@n8n/typeorm';
import type { Entry as LdapUser } from 'ldapts';
import { Cipher } from 'n8n-core';
import config from '@/config';
import { UserRepository } from '@/databases/repositories/user.repository';
import { LDAP_DEFAULT_CONFIGURATION } from '@/ldap.ee/constants';
import { saveLdapSynchronization } from '@/ldap.ee/helpers.ee';
import { LdapService } from '@/ldap.ee/ldap.service.ee';

2
packages/cli/test/integration/me.api.test.ts
View File

@@ -1,11 +1,11 @@
import { GlobalConfig } from '@n8n/config';
import type { User } from '@n8n/db';
import { ProjectRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import type { IPersonalizationSurveyAnswersV4 } from 'n8n-workflow';
import validator from 'validator';
import { UserRepository } from '@/databases/repositories/user.repository';
import { mockInstance } from '@test/mocking';
import { SUCCESS_RESPONSE_BODY } from './shared/constants';

2
packages/cli/test/integration/owner.api.test.ts
View File

@@ -1,9 +1,9 @@
import type { User } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import validator from 'validator';
import config from '@/config';
import { UserRepository } from '@/databases/repositories/user.repository';
import { createUserShell } from './shared/db/users';
import {

2
packages/cli/test/integration/password-reset.api.test.ts
View File

@@ -1,4 +1,5 @@
import type { User } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import { compare } from 'bcryptjs';
import { mock } from 'jest-mock-extended';
@@ -7,7 +8,6 @@ import { v4 as uuid } from 'uuid';
import { AuthService } from '@/auth/auth.service';
import config from '@/config';
import { UserRepository } from '@/databases/repositories/user.repository';
import { ExternalHooks } from '@/external-hooks';
import { License } from '@/license';
import { JwtService } from '@/services/jwt.service';

2
packages/cli/test/integration/shared/db/users.ts
View File

@@ -2,11 +2,11 @@ import { AuthIdentity } from '@n8n/db';
import { type User } from '@n8n/db';
import { AuthIdentityRepository } from '@n8n/db';
import { AuthUserRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import type { ApiKeyScope, GlobalRole } from '@n8n/permissions';
import { hash } from 'bcryptjs';
import { UserRepository } from '@/databases/repositories/user.repository';
import { MfaService } from '@/mfa/mfa.service';
import { TOTPService } from '@/mfa/totp.service';
import { getApiKeyScopesForRole } from '@/public-api/permissions.ee';

3
packages/cli/test/integration/user.repository.test.ts
View File

@@ -1,8 +1,7 @@
import { ProjectRelationRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import { UserRepository } from '@/databases/repositories/user.repository';
import { createAdmin, createMember, createOwner } from './shared/db/users';
import { randomEmail } from './shared/random';
import * as testDb from './shared/test-db';

2
packages/cli/test/integration/users.api.test.ts
View File

@@ -4,12 +4,12 @@ import { ProjectRelationRepository } from '@n8n/db';
import { ProjectRepository } from '@n8n/db';
import { SharedCredentialsRepository } from '@n8n/db';
import { SharedWorkflowRepository } from '@n8n/db';
import { UserRepository } from '@n8n/db';
import { Container } from '@n8n/di';
import { v4 as uuid } from 'uuid';
import { RESPONSE_ERROR_MESSAGES } from '@/constants';
import { UsersController } from '@/controllers/users.controller';
import { UserRepository } from '@/databases/repositories/user.repository';
import { ExecutionService } from '@/executions/execution.service';
import { CacheService } from '@/services/cache/cache.service';
import { Telemetry } from '@/telemetry';