n8n 2.46.4 → 2.47.0

package/dist/controllers/mfa.controller.js

@@ -19,11 +19,11 @@ const errors_1 = require("@n8n/errors");
 const external_hooks_1 = require("../external-hooks");
 const mfa_service_1 = require("../mfa/mfa.service");
 let MFAController = class MFAController {
-    constructor(mfaService, externalHooks, authService, userRepository, eventService, instanceSettingsLoaderConfig) {
+    constructor(mfaService, externalHooks, authService, personRepository, eventService, instanceSettingsLoaderConfig) {
         this.mfaService = mfaService;
         this.externalHooks = externalHooks;
         this.authService = authService;
-        this.userRepository = userRepository;
+        this.personRepository = personRepository;
         this.eventService = eventService;
         this.instanceSettingsLoaderConfig = instanceSettingsLoaderConfig;
     }
@@ -93,7 +93,7 @@ let MFAController = class MFAController {
         const verified = this.mfaService.totp.verifySecret({ secret, mfaCode, window: 10 });
         if (!verified)
             throw new errors_1.BadRequestError('MFA code expired. Close the modal and enable MFA again', 997);
-        const updatedUser = await this.mfaService.enableMfa(id);
+        const updatedPerson = await this.mfaService.enableMfa(id);
         this.eventService.emit('user-mfa-enabled', {
             user: {
                 id: req.user.id,
@@ -103,7 +103,7 @@ let MFAController = class MFAController {
                 role: req.user.role,
             },
         });
-        this.authService.issueCookie(res, updatedUser, verified, req.browserId);
+        this.authService.issueCookie(res, updatedPerson, verified, req.browserId);
     }
     async disableMFA(req, res) {
         const { id: userId } = req.user;
@@ -129,11 +129,10 @@ let MFAController = class MFAController {
             },
             disableMethod: mfaCodeDefined ? 'mfaCode' : 'recoveryCode',
         });
-        const updatedUser = await this.userRepository.findOneOrFail({
-            where: { id: userId },
-            relations: ['role'],
-        });
-        this.authService.issueCookie(res, updatedUser, false, req.browserId);
+        const updatedPerson = await this.personRepository.findByIdWithRole(userId);
+        if (!updatedPerson)
+            throw new errors_1.NotFoundError('User not found');
+        this.authService.issueCookie(res, updatedPerson, false, req.browserId);
     }
     async verifyMFA(req) {
         const { id } = req.user;
@@ -201,6 +200,6 @@ __decorate([
 ], MFAController.prototype, "verifyMFA", null);
 exports.MFAController = MFAController = __decorate([
     (0, decorators_1.RestController)('/mfa'),
-    __metadata("design:paramtypes", [mfa_service_1.MfaService, external_hooks_1.ExternalHooks, auth_service_1.AuthService, db_1.UserRepository, backend_services_1.EventService, config_1.InstanceSettingsLoaderConfig])
+    __metadata("design:paramtypes", [mfa_service_1.MfaService, external_hooks_1.ExternalHooks, auth_service_1.AuthService, db_1.PersonRepository, backend_services_1.EventService, config_1.InstanceSettingsLoaderConfig])
 ], MFAController);
 //# sourceMappingURL=mfa.controller.js.map

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

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

package/dist/controllers/oauth/oauth2-credential.controller.d.ts

@@ -5,7 +5,7 @@ import { Response } from 'express';
 import { CredentialsOverwrites } from '../../credentials-overwrites';
 import { ExternalHooks } from '../../external-hooks';
 import { OauthService } from '../../oauth/oauth.service';
-import { OAuthRequest } from '../../requests';
+import { AuthlessRequest, OAuthRequest } from '../../requests';
 export declare class OAuth2CredentialController {
     private readonly oauthService;
     private readonly logger;
@@ -15,6 +15,7 @@ export declare class OAuth2CredentialController {
     private readonly credentialsOverwrites;
     constructor(oauthService: OauthService, logger: Logger, externalHooks: ExternalHooks, oauthJweServiceProxy: OAuthJweServiceProxy, eventService: EventService, credentialsOverwrites: CredentialsOverwrites);
     getAuthUri(req: OAuthRequest.OAuth2Credential.Auth, res: Response): Promise<string>;
+    getClientMetadata(_req: AuthlessRequest, res: Response): void;
     handleCallback(req: OAuthRequest.OAuth2Credential.Callback, res: Response): Promise<void>;
     private convertCredentialToOptions;
 }

package/dist/controllers/oauth/oauth2-credential.controller.js

@@ -41,6 +41,9 @@ let OAuth2CredentialController = class OAuth2CredentialController {
         const csrfData = await this.oauthService.buildCsrfStateData(credential, req);
         return await this.oauthService.generateAOauth2AuthUri(credential, csrfData, req, res);
     }
+    getClientMetadata(_req, res) {
+        res.json(this.oauthService.getClientMetadataDocument());
+    }
     async handleCallback(req, res) {
         let credentialType;
         try {
@@ -56,6 +59,20 @@ let OAuth2CredentialController = class OAuth2CredentialController {
                     }
                     return res.render('admin-consent-callback');
                 }
+                const { error, error_description: errorDescription, iss } = req.query;
+                if (typeof error === 'string' && error) {
+                    this.logger.warn('OAuth2 server returned an authorization error', {
+                        error,
+                        errorDescription,
+                        iss,
+                    });
+                    const reason = iss !== undefined
+                        ? undefined
+                        : typeof errorDescription === 'string' && errorDescription
+                            ? `${error}: ${errorDescription}`
+                            : error;
+                    return this.oauthService.renderCallbackError(res, 'The OAuth2 server returned an error.', reason);
+                }
                 return this.oauthService.renderCallbackError(res, 'Insufficient parameters for OAuth2 callback.', `Received following query parameters: ${JSON.stringify(req.query)}`);
             }
             const [credential, decryptedDataOriginal, oauthCredentials, state, flowState] = await this.oauthService.resolveCredential(req);
@@ -174,6 +191,12 @@ __decorate([
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], OAuth2CredentialController.prototype, "getAuthUri", null);
+__decorate([
+    (0, decorators_1.Get)('/client-metadata.json', { skipAuth: true, ipRateLimit: true }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", void 0)
+], OAuth2CredentialController.prototype, "getClientMetadata", null);
 __decorate([
     (0, decorators_1.Get)('/callback', { usesTemplates: true, allowUnauthenticated: true }),
     __metadata("design:type", Function),

package/dist/controllers/oauth/oauth2-credential.controller.js.map

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

package/dist/controllers/oauth/oauth2-dynamic-client-registration.schema.d.ts

@@ -2,12 +2,14 @@ import { z } from 'zod/v4';
 export declare const oAuthAuthorizationServerMetadataSchema: z.ZodObject<{
     authorization_endpoint: z.ZodURL;
     token_endpoint: z.ZodURL;
-    registration_endpoint: z.ZodURL;
+    registration_endpoint: z.ZodOptional<z.ZodURL>;
+    client_id_metadata_document_supported: z.ZodOptional<z.ZodBoolean>;
     grant_types_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
     token_endpoint_auth_methods_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
     code_challenge_methods_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
     scopes_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
 }, z.core.$strip>;
+export type OAuthAuthorizationServerMetadata = z.infer<typeof oAuthAuthorizationServerMetadataSchema>;
 export declare const dynamicClientRegistrationResponseSchema: z.ZodObject<{
     client_id: z.ZodString;
     client_secret: z.ZodOptional<z.ZodString>;

package/dist/controllers/oauth/oauth2-dynamic-client-registration.schema.js

@@ -5,7 +5,8 @@ const v4_1 = require("zod/v4");
 exports.oAuthAuthorizationServerMetadataSchema = v4_1.z.object({
     authorization_endpoint: v4_1.z.url({ protocol: /^https?$/ }),
     token_endpoint: v4_1.z.url({ protocol: /^https?$/ }),
-    registration_endpoint: v4_1.z.url({ protocol: /^https?$/ }),
+    registration_endpoint: v4_1.z.url({ protocol: /^https?$/ }).optional(),
+    client_id_metadata_document_supported: v4_1.z.boolean().optional(),
     grant_types_supported: v4_1.z.array(v4_1.z.string()).optional(),
     token_endpoint_auth_methods_supported: v4_1.z.array(v4_1.z.string()).optional(),
     code_challenge_methods_supported: v4_1.z.array(v4_1.z.string()).optional(),

package/dist/controllers/oauth/oauth2-dynamic-client-registration.schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth2-dynamic-client-registration.schema.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-dynamic-client-registration.schema.ts"],"names":[],"mappings":";;;AAAA,+BAA2B;AAEd,QAAA,sCAAsC,GAAG,MAAC,CAAC,MAAM,CAAC;IAC9D,sBAAsB,EAAE,MAAC,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvD,cAAc,EAAE,MAAC,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IAC/C,qBAAqB,EAAE,MAAC,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IACtD,qBAAqB,EAAE,MAAC,CAAC,KAAK,CAAC,MAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACrD,qCAAqC,EAAE,MAAC,CAAC,KAAK,CAAC,MAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACrE,gCAAgC,EAAE,MAAC,CAAC,KAAK,CAAC,MAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAChE,gBAAgB,EAAE,MAAC,CAAC,KAAK,CAAC,MAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CAChD,CAAC,CAAC;AAEU,QAAA,uCAAuC,GAAG,MAAC,CAAC,MAAM,CAAC;IAC/D,SAAS,EAAE,MAAC,CAAC,MAAM,EAAE;IACrB,aAAa,EAAE,MAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACpC,CAAC,CAAC"}
+{"version":3,"file":"oauth2-dynamic-client-registration.schema.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-dynamic-client-registration.schema.ts"],"names":[],"mappings":";;;AAAA,+BAA2B;AAEd,QAAA,sCAAsC,GAAG,MAAC,CAAC,MAAM,CAAC;IAC9D,sBAAsB,EAAE,MAAC,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvD,cAAc,EAAE,MAAC,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IAC/C,qBAAqB,EAAE,MAAC,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,QAAQ,EAAE;IACjE,qCAAqC,EAAE,MAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC7D,qBAAqB,EAAE,MAAC,CAAC,KAAK,CAAC,MAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACrD,qCAAqC,EAAE,MAAC,CAAC,KAAK,CAAC,MAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACrE,gCAAgC,EAAE,MAAC,CAAC,KAAK,CAAC,MAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAChE,gBAAgB,EAAE,MAAC,CAAC,KAAK,CAAC,MAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CAChD,CAAC,CAAC;AAMU,QAAA,uCAAuC,GAAG,MAAC,CAAC,MAAM,CAAC;IAC/D,SAAS,EAAE,MAAC,CAAC,MAAM,EAAE;IACrB,aAAa,EAAE,MAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACpC,CAAC,CAAC"}

package/dist/controllers/password-reset.controller.d.ts

@@ -1,7 +1,7 @@
 import { ChangePasswordRequestDto, ForgotPasswordRequestDto, ResolvePasswordTokenQueryDto } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
 import { EventService } from '@n8n/backend-services';
-import { UserRepository } from '@n8n/db';
+import { PersonRepository } from '@n8n/db';
 import { Response } from 'express';
 import { ErrorReporter } from 'n8n-core';
 import { AuthService } from '../auth/auth.service';
@@ -21,10 +21,10 @@ export declare class PasswordResetController {
     private readonly mfaService;
     private readonly license;
     private readonly passwordUtility;
-    private readonly userRepository;
+    private readonly personRepository;
     private readonly eventService;
     private readonly errorReporter;
-    constructor(logger: Logger, externalHooks: ExternalHooks, mailer: UserManagementMailer, authService: AuthService, userService: UserService, mfaService: MfaService, license: License, passwordUtility: PasswordUtility, userRepository: UserRepository, eventService: EventService, errorReporter: ErrorReporter);
+    constructor(logger: Logger, externalHooks: ExternalHooks, mailer: UserManagementMailer, authService: AuthService, userService: UserService, mfaService: MfaService, license: License, passwordUtility: PasswordUtility, personRepository: PersonRepository, eventService: EventService, errorReporter: ErrorReporter);
     forgotPassword(_req: AuthlessRequest, _res: Response, payload: ForgotPasswordRequestDto): Promise<void>;
     resolvePasswordToken(_req: AuthlessRequest, _res: Response, payload: ResolvePasswordTokenQueryDto): Promise<void>;
     changePassword(req: AuthlessRequest, res: Response, payload: ChangePasswordRequestDto): Promise<void>;

package/dist/controllers/password-reset.controller.js

@@ -33,7 +33,7 @@ const user_service_1 = require("../services/user.service");
 const sso_helpers_1 = require("../sso.ee/sso-helpers");
 const email_1 = require("../user-management/email");
 let PasswordResetController = class PasswordResetController {
-    constructor(logger, externalHooks, mailer, authService, userService, mfaService, license, passwordUtility, userRepository, eventService, errorReporter) {
+    constructor(logger, externalHooks, mailer, authService, userService, mfaService, license, passwordUtility, personRepository, eventService, errorReporter) {
         this.logger = logger;
         this.externalHooks = externalHooks;
         this.mailer = mailer;
@@ -42,7 +42,7 @@ let PasswordResetController = class PasswordResetController {
         this.mfaService = mfaService;
         this.license = license;
         this.passwordUtility = passwordUtility;
-        this.userRepository = userRepository;
+        this.personRepository = personRepository;
         this.eventService = eventService;
         this.errorReporter = errorReporter;
     }
@@ -53,31 +53,32 @@ let PasswordResetController = class PasswordResetController {
         }
         try {
             const { email } = payload;
-            const user = await this.userRepository.findNonShellUser(email);
-            if (!user) {
+            const person = await this.personRepository.findSetUpByEmail(email);
+            if (!person) {
                 this.logger.debug('No user found in the system');
                 return;
             }
-            if (user.role.slug !== db_1.GLOBAL_OWNER_ROLE.slug && !this.license.isWithinUsersLimit()) {
+            if (person.role.slug !== db_1.GLOBAL_OWNER_ROLE.slug && !this.license.isWithinUsersLimit()) {
                 this.logger.debug('Request to send password reset email failed because the user limit was reached');
                 throw new errors_1.ForbiddenError(constants_2.RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
             }
             if (((0, sso_helpers_1.isSamlCurrentAuthenticationMethod)() || (0, sso_helpers_1.isOidcCurrentAuthenticationMethod)()) &&
-                !((0, permissions_1.hasGlobalScope)(user, 'user:resetPassword') || user.settings?.allowSSOManualLogin === true)) {
+                !((0, permissions_1.hasGlobalScope)(person, 'user:resetPassword') ||
+                    person.settings?.allowSSOManualLogin === true)) {
                 const currentAuthenticationMethod = (0, sso_helpers_1.isSamlCurrentAuthenticationMethod)() ? 'SAML' : 'OIDC';
                 this.logger.debug(`Request to send password reset email failed because login is handled by ${currentAuthenticationMethod}`);
                 throw new errors_1.ForbiddenError(`Login is handled by ${currentAuthenticationMethod}. Please contact your Identity Provider to reset your password.`);
             }
-            const ldapIdentity = user.authIdentities?.find((i) => i.providerType === 'ldap');
-            if (!user.password || (ldapIdentity && user.disabled)) {
+            const ldapIdentity = person.authIdentities?.find((i) => i.providerType === 'ldap');
+            if (!person.password || (ldapIdentity && person.disabled)) {
                 this.logger.debug('Request to send password reset email failed because no user was found for the provided email', { invalidEmail: email });
                 return;
             }
             if (this.license.isLdapEnabled() && ldapIdentity) {
                 throw new errors_1.UnprocessableRequestError('forgotPassword.ldapUserPasswordResetUnavailable');
             }
-            const url = this.authService.generatePasswordResetUrl(user);
-            const { id, firstName } = user;
+            const url = this.authService.generatePasswordResetUrl(person);
+            const { id, firstName } = person;
             try {
                 await this.mailer.passwordReset({
                     email,
@@ -87,7 +88,7 @@ let PasswordResetController = class PasswordResetController {
             }
             catch (error) {
                 this.eventService.emit('email-failed', {
-                    user,
+                    user: person,
                     messageType: 'Reset password',
                     publicApi: false,
                 });
@@ -95,13 +96,13 @@ let PasswordResetController = class PasswordResetController {
                     throw new errors_1.InternalServerError(`Please contact your administrator: ${error.message}`, error);
                 }
             }
-            this.logger.info('Sent password reset email successfully', { userId: user.id, email });
+            this.logger.info('Sent password reset email successfully', { userId: person.id, email });
             this.eventService.emit('user-transactional-email-sent', {
                 userId: id,
                 messageType: 'Reset password',
                 publicApi: false,
             });
-            this.eventService.emit('user-password-reset-request-click', { user });
+            this.eventService.emit('user-password-reset-request-click', { user: person });
         }
         catch (error) {
             this.errorReporter.error(new Error('Unexpected error in forgot password endpoint', { cause: error }));
@@ -109,43 +110,43 @@ let PasswordResetController = class PasswordResetController {
     }
     async resolvePasswordToken(_req, _res, payload) {
         const { token } = payload;
-        const user = await this.authService.resolvePasswordResetToken(token);
-        if (!user)
+        const person = await this.authService.resolvePasswordResetToken(token);
+        if (!person)
             throw new errors_1.NotFoundError('');
-        if (user.role.slug !== db_1.GLOBAL_OWNER_ROLE.slug && !this.license.isWithinUsersLimit()) {
-            this.logger.debug('Request to resolve password token failed because the user limit was reached', { userId: user.id });
+        if (person.role.slug !== db_1.GLOBAL_OWNER_ROLE.slug && !this.license.isWithinUsersLimit()) {
+            this.logger.debug('Request to resolve password token failed because the user limit was reached', { userId: person.id });
             throw new errors_1.ForbiddenError(constants_2.RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
         }
-        this.logger.info('Reset-password token resolved successfully', { userId: user.id });
-        this.eventService.emit('user-password-reset-email-click', { user });
+        this.logger.info('Reset-password token resolved successfully', { userId: person.id });
+        this.eventService.emit('user-password-reset-email-click', { user: person });
     }
     async changePassword(req, res, payload) {
         const { token, password, mfaCode } = payload;
-        const user = await this.authService.resolvePasswordResetToken(token);
-        if (!user)
+        const person = await this.authService.resolvePasswordResetToken(token);
+        if (!person)
             throw new errors_1.NotFoundError('');
-        if (user.mfaEnabled) {
+        if (person.mfaEnabled) {
             if (!mfaCode)
                 throw new errors_1.BadRequestError('If MFA enabled, mfaCode is required.');
-            const { decryptedSecret: secret } = await this.mfaService.getSecretAndRecoveryCodes(user.id);
+            const { decryptedSecret: secret } = await this.mfaService.getSecretAndRecoveryCodes(person.id);
             const validToken = this.mfaService.totp.verifySecret({ secret, mfaCode });
             if (!validToken)
                 throw new errors_1.BadRequestError('Invalid MFA token.');
         }
         const passwordHash = await this.passwordUtility.hash(password);
-        await this.userService.update(user.id, { password: passwordHash });
-        this.logger.info('User password updated successfully', { userId: user.id });
-        this.authService.issueCookie(res, user, user.mfaEnabled, req.browserId);
-        this.eventService.emit('user-updated', { user, fieldsChanged: ['password'] });
-        const ldapIdentity = user?.authIdentities?.find((i) => i.providerType === 'ldap');
+        await this.userService.update(person.id, { password: passwordHash });
+        this.logger.info('User password updated successfully', { userId: person.id });
+        this.authService.issueCookie(res, person, person.mfaEnabled, req.browserId);
+        this.eventService.emit('user-updated', { user: person, fieldsChanged: ['password'] });
+        const ldapIdentity = person?.authIdentities?.find((i) => i.providerType === 'ldap');
         if (ldapIdentity) {
             this.eventService.emit('user-signed-up', {
-                user,
+                user: person,
                 userType: 'email',
                 wasDisabledLdapUser: true,
             });
         }
-        await this.externalHooks.run('user.password.update', [user.email, passwordHash]);
+        await this.externalHooks.run('user.password.update', [person.email, passwordHash]);
     }
 };
 exports.PasswordResetController = PasswordResetController;
@@ -183,6 +184,6 @@ __decorate([
 ], PasswordResetController.prototype, "changePassword", null);
 exports.PasswordResetController = PasswordResetController = __decorate([
     (0, decorators_1.RestController)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, external_hooks_1.ExternalHooks, email_1.UserManagementMailer, auth_service_1.AuthService, user_service_1.UserService, mfa_service_1.MfaService, license_1.License, password_utility_1.PasswordUtility, db_1.UserRepository, backend_services_1.EventService, n8n_core_1.ErrorReporter])
+    __metadata("design:paramtypes", [backend_common_1.Logger, external_hooks_1.ExternalHooks, email_1.UserManagementMailer, auth_service_1.AuthService, user_service_1.UserService, mfa_service_1.MfaService, license_1.License, password_utility_1.PasswordUtility, db_1.PersonRepository, backend_services_1.EventService, n8n_core_1.ErrorReporter])
 ], PasswordResetController);
 //# sourceMappingURL=password-reset.controller.js.map

package/dist/controllers/password-reset.controller.js.map

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

package/dist/controllers/users.controller.d.ts

@@ -1,5 +1,5 @@
 import { RoleChangeRequestDto, SettingsUpdateRequestDto, UsersListFilterDto } from '@n8n/api-types';
-import { UserRepository, AuthenticatedRequest } from '@n8n/db';
+import { UserRepository, PersonRepository, AuthenticatedRequest } from '@n8n/db';
 import { Response } from 'express';
 import { AuthService } from '../auth/auth.service';
 import { UserRequest } from '../requests';
@@ -7,12 +7,13 @@ import { JwtService, RoleService, UrlService } from '@n8n/backend-services';
 import { UserService } from '../services/user.service';
 export declare class UsersController {
     private readonly userRepository;
+    private readonly personRepository;
     private readonly authService;
     private readonly userService;
     private readonly jwtService;
     private readonly urlService;
     private readonly roleService;
-    constructor(userRepository: UserRepository, authService: AuthService, userService: UserService, jwtService: JwtService, urlService: UrlService, roleService: RoleService);
+    constructor(userRepository: UserRepository, personRepository: PersonRepository, authService: AuthService, userService: UserService, jwtService: JwtService, urlService: UrlService, roleService: RoleService);
     private removeSupplementaryFields;
     listUsers(req: AuthenticatedRequest, _res: Response, listQueryOptions: UsersListFilterDto): Promise<{
         count: number;
@@ -58,7 +59,13 @@ export declare class UsersController {
             lastActiveAt?: string | null | undefined;
             inviteAcceptUrl?: string | undefined;
             isManagedByEnv?: boolean | undefined;
+            disabled?: boolean | undefined;
         }[];
+        statusCounts?: {
+            all: number;
+            active: number;
+            deactivated: number;
+        } | undefined;
     }>;
     getUserPasswordResetLink(req: UserRequest.PasswordResetLink): Promise<{
         link: string;

package/dist/controllers/users.controller.js

@@ -21,9 +21,11 @@ const auth_service_1 = require("../auth/auth.service");
 const errors_1 = require("@n8n/errors");
 const backend_services_1 = require("@n8n/backend-services");
 const user_service_1 = require("../services/user.service");
+const ownUserDetailSchema = api_types_1.userDetailSchema.omit({ disabled: true });
 let UsersController = class UsersController {
-    constructor(userRepository, authService, userService, jwtService, urlService, roleService) {
+    constructor(userRepository, personRepository, authService, userService, jwtService, urlService, roleService) {
         this.userRepository = userRepository;
+        this.personRepository = personRepository;
         this.authService = authService;
         this.userService = userService;
         this.jwtService = jwtService;
@@ -45,18 +47,29 @@ let UsersController = class UsersController {
         }
         const usersSeesAllDetails = (0, permissions_1.hasGlobalScope)(currentUser, 'user:create');
         return publicUsers.map((user) => {
-            return usersSeesAllDetails || user.id === currentUser.id
-                ? api_types_1.userDetailSchema.parse(user)
+            if (usersSeesAllDetails)
+                return api_types_1.userDetailSchema.parse(user);
+            return user.id === currentUser.id
+                ? ownUserDetailSchema.parse(user)
                 : api_types_1.userBaseSchema.parse(user);
         });
     }
     async listUsers(req, _res, listQueryOptions) {
         await this.userService.assertGetUsersAccess(req.user, listQueryOptions.filter?.projectId);
+        const { filter, includeStatusCounts } = listQueryOptions;
+        const usesAccountStatus = filter?.status !== undefined || includeStatusCounts === true;
+        if (usesAccountStatus && !(0, permissions_1.hasGlobalScope)(req.user, 'user:create')) {
+            throw new errors_1.ForbiddenError('You cannot filter or count users by status');
+        }
         const scope = listQueryOptions.filter?.scope;
         const roleSlugs = scope ? await this.roleService.rolesWithScope('global', scope) : undefined;
         const userQuery = this.userRepository.buildUserQuery(listQueryOptions, roleSlugs);
-        const response = await userQuery.getManyAndCount();
-        const [users, count] = response;
+        const [[users, count], statusCounts] = await Promise.all([
+            userQuery.getManyAndCount(),
+            includeStatusCounts
+                ? this.userRepository.countUsersListStatuses(filter, roleSlugs)
+                : undefined,
+        ]);
         const publicUsers = await Promise.all(users.map(async (u) => {
             const user = await this.userService.toPublic(u);
             if (listQueryOptions.select && !listQueryOptions.select?.includes('role')) {
@@ -75,28 +88,26 @@ let UsersController = class UsersController {
         return api_types_1.usersListSchema.parse({
             count,
             items: this.removeSupplementaryFields(publicUsers, listQueryOptions, req.user),
+            statusCounts,
         });
     }
     async getUserPasswordResetLink(req) {
-        const user = await this.userRepository.findOneOrFail({
-            where: { id: req.params.id },
-            relations: ['role'],
-        });
-        if (!user) {
+        const person = await this.personRepository.findByIdWithRole(req.params.id);
+        if (!person) {
             throw new errors_1.NotFoundError('User not found');
         }
         if (req.user.role.slug === db_1.GLOBAL_ADMIN_ROLE.slug &&
-            user.role.slug === db_1.GLOBAL_OWNER_ROLE.slug) {
+            person.role.slug === db_1.GLOBAL_OWNER_ROLE.slug) {
             throw new errors_1.ForbiddenError('Admin cannot reset password of global owner');
         }
-        const link = this.authService.generatePasswordResetUrl(user);
+        const link = this.authService.generatePasswordResetUrl(person);
         return { link };
     }
     async generateInviteLink(req, _res) {
         const inviterId = req.user.id;
         const inviteeId = req.params.id;
-        const targetUser = await this.userRepository.findOne({ where: { id: inviteeId } });
-        if (!targetUser) {
+        const targetPerson = await this.personRepository.findById(inviteeId);
+        if (!targetPerson) {
             throw new errors_1.NotFoundError('User to generate invite link for not found');
         }
         const token = this.jwtService.sign('invite', {
@@ -112,7 +123,7 @@ let UsersController = class UsersController {
     async updateUserSettings(_req, _res, payload, id) {
         await this.userService.updateSettings(id, payload);
         const user = await this.userRepository.findOneOrFail({
-            select: ['settings'],
+            select: ['id', 'settings'],
             where: { id },
         });
         return user.settings;
@@ -175,6 +186,6 @@ __decorate([
 ], UsersController.prototype, "changeGlobalRole", null);
 exports.UsersController = UsersController = __decorate([
     (0, decorators_1.RestController)('/users'),
-    __metadata("design:paramtypes", [db_1.UserRepository, auth_service_1.AuthService, user_service_1.UserService, backend_services_1.JwtService, backend_services_1.UrlService, backend_services_1.RoleService])
+    __metadata("design:paramtypes", [db_1.UserRepository, db_1.PersonRepository, auth_service_1.AuthService, user_service_1.UserService, backend_services_1.JwtService, backend_services_1.UrlService, backend_services_1.RoleService])
 ], UsersController);
 //# sourceMappingURL=users.controller.js.map

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

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

package/dist/credentials/credential-descriptions.service.d.ts

@@ -6,4 +6,7 @@ export declare class CredentialDescriptionsService {
     stripIfDisabled<T extends {
         description?: unknown;
     }>(credentials: T | T[]): Promise<void>;
+    strip<T extends {
+        description?: unknown;
+    }>(credentials: T | T[]): void;
 }