n8n 1.101.0 → 1.102.0

package/bin/n8n

@@ -13,11 +13,6 @@ if (versionFlags.includes(process.argv.slice(-1)[0])) {
 	process.exit(0);
 }
 
-if (process.argv.length === 2) {
-	// When no command is given choose by default start
-	process.argv.push('start');
-}
-
 const satisfies = require('semver/functions/satisfies');
 const nodeVersion = process.versions.node;
 const {
@@ -63,10 +58,7 @@ if (process.env.NODEJS_PREFER_IPV4 === 'true') {
 require('net').setDefaultAutoSelectFamily?.(false);
 
 (async () => {
-	// Collect DB entities from modules _before_ `DbConnectionOptions` is instantiated.
-	const { BaseCommand } = await import('../dist/commands/base-command.js');
-	await new BaseCommand([], { root: __dirname }).loadModules();
-
-	const oclif = await import('@oclif/core');
-	await oclif.execute({ dir: __dirname });
+	const { Container } = await import('@n8n/di');
+	const { CommandRegistry } = await import('../dist/command-registry.js');
+	await Container.get(CommandRegistry).execute();
 })();

package/dist/auth/auth.service.d.ts

@@ -5,6 +5,7 @@ import { InvalidAuthTokenRepository, UserRepository } from '@n8n/db';
 import type { NextFunction, Response } from 'express';
 import type { StringValue as TimeUnitValue } from 'ms';
 import { License } from '../license';
+import { MfaService } from '../mfa/mfa.service';
 import { JwtService } from '../services/jwt.service';
 import { UrlService } from '../services/url.service';
 export declare class AuthService {
@@ -15,14 +16,17 @@ export declare class AuthService {
     private readonly urlService;
     private readonly userRepository;
     private readonly invalidAuthTokenRepository;
+    private readonly mfaService;
     private skipBrowserIdCheckEndpoints;
-    constructor(globalConfig: GlobalConfig, logger: Logger, license: License, jwtService: JwtService, urlService: UrlService, userRepository: UserRepository, invalidAuthTokenRepository: InvalidAuthTokenRepository);
-    authMiddleware(req: AuthenticatedRequest, res: Response, next: NextFunction): Promise<void>;
+    constructor(globalConfig: GlobalConfig, logger: Logger, license: License, jwtService: JwtService, urlService: UrlService, userRepository: UserRepository, invalidAuthTokenRepository: InvalidAuthTokenRepository, mfaService: MfaService);
+    createAuthMiddleware(allowSkipMFA: boolean): (req: AuthenticatedRequest, res: Response, next: NextFunction) => Promise<void>;
     clearCookie(res: Response): void;
     invalidateToken(req: AuthenticatedRequest): Promise<void>;
-    issueCookie(res: Response, user: User, browserId?: string): void;
-    issueJWT(user: User, browserId?: string): string;
-    resolveJwt(token: string, req: AuthenticatedRequest, res: Response): Promise<User>;
+    issueCookie(res: Response, user: User, usedMfa: boolean, browserId?: string): void;
+    issueJWT(user: User, usedMfa?: boolean, browserId?: string): string;
+    resolveJwt(token: string, req: AuthenticatedRequest, res: Response): Promise<[User, {
+        usedMfa: boolean;
+    }]>;
     generatePasswordResetToken(user: User, expiresIn?: TimeUnitValue): string;
     generatePasswordResetUrl(user: User): string;
     resolvePasswordResetToken(token: string): Promise<User | undefined>;

package/dist/auth/auth.service.js

@@ -25,10 +25,11 @@ const constants_2 = require("../constants");
 const auth_error_1 = require("../errors/response-errors/auth.error");
 const forbidden_error_1 = require("../errors/response-errors/forbidden.error");
 const license_1 = require("../license");
+const mfa_service_1 = require("../mfa/mfa.service");
 const jwt_service_1 = require("../services/jwt.service");
 const url_service_1 = require("../services/url.service");
 let AuthService = class AuthService {
-    constructor(globalConfig, logger, license, jwtService, urlService, userRepository, invalidAuthTokenRepository) {
+    constructor(globalConfig, logger, license, jwtService, urlService, userRepository, invalidAuthTokenRepository, mfaService) {
         this.globalConfig = globalConfig;
         this.logger = logger;
         this.license = license;
@@ -36,7 +37,7 @@ let AuthService = class AuthService {
         this.urlService = urlService;
         this.userRepository = userRepository;
         this.invalidAuthTokenRepository = invalidAuthTokenRepository;
-        this.authMiddleware = this.authMiddleware.bind(this);
+        this.mfaService = mfaService;
         const restEndpoint = globalConfig.endpoints.rest;
         this.skipBrowserIdCheckEndpoints = [
             `/${restEndpoint}/push`,
@@ -45,28 +46,44 @@ let AuthService = class AuthService {
             `/${restEndpoint}/oauth2-credential/callback`,
         ];
     }
-    async authMiddleware(req, res, next) {
-        const token = req.cookies[constants_2.AUTH_COOKIE_NAME];
-        if (token) {
-            try {
-                const isInvalid = await this.invalidAuthTokenRepository.existsBy({ token });
-                if (isInvalid)
-                    throw new auth_error_1.AuthError('Unauthorized');
-                req.user = await this.resolveJwt(token, req, res);
-            }
-            catch (error) {
-                if (error instanceof jsonwebtoken_1.JsonWebTokenError || error instanceof auth_error_1.AuthError) {
-                    this.clearCookie(res);
+    createAuthMiddleware(allowSkipMFA) {
+        return async (req, res, next) => {
+            const token = req.cookies[constants_2.AUTH_COOKIE_NAME];
+            if (token) {
+                try {
+                    const isInvalid = await this.invalidAuthTokenRepository.existsBy({ token });
+                    if (isInvalid)
+                        throw new auth_error_1.AuthError('Unauthorized');
+                    const [user, { usedMfa }] = await this.resolveJwt(token, req, res);
+                    const mfaEnforced = this.mfaService.isMFAEnforced();
+                    if (mfaEnforced && !usedMfa && !allowSkipMFA) {
+                        if (user.mfaEnabled) {
+                            throw new auth_error_1.AuthError('MFA not used during authentication');
+                        }
+                        else {
+                            res.status(401).json({ status: 'error', message: 'Unauthorized', mfaRequired: true });
+                            return;
+                        }
+                    }
+                    req.user = user;
+                    req.authInfo = {
+                        usedMfa,
+                    };
                 }
-                else {
-                    throw error;
+                catch (error) {
+                    if (error instanceof jsonwebtoken_1.JsonWebTokenError || error instanceof auth_error_1.AuthError) {
+                        this.clearCookie(res);
+                    }
+                    else {
+                        throw error;
+                    }
                 }
             }
-        }
-        if (req.user)
-            next();
-        else
-            res.status(401).json({ status: 'error', message: 'Unauthorized' });
+            if (req.user)
+                next();
+            else
+                res.status(401).json({ status: 'error', message: 'Unauthorized' });
+        };
     }
     clearCookie(res) {
         res.clearCookie(constants_2.AUTH_COOKIE_NAME);
@@ -88,14 +105,14 @@ let AuthService = class AuthService {
             this.logger.warn('failed to invalidate auth token', { error: e.message });
         }
     }
-    issueCookie(res, user, browserId) {
+    issueCookie(res, user, usedMfa, browserId) {
         const isWithinUsersLimit = this.license.isWithinUsersLimit();
         if (config_2.default.getEnv('userManagement.isInstanceOwnerSetUp') &&
             user.role !== 'global:owner' &&
             !isWithinUsersLimit) {
             throw new forbidden_error_1.ForbiddenError(constants_2.RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
         }
-        const token = this.issueJWT(user, browserId);
+        const token = this.issueJWT(user, usedMfa, browserId);
         const { samesite, secure } = this.globalConfig.auth.cookie;
         res.cookie(constants_2.AUTH_COOKIE_NAME, token, {
             maxAge: this.jwtExpiration * constants_1.Time.seconds.toMilliseconds,
@@ -104,11 +121,12 @@ let AuthService = class AuthService {
             secure,
         });
     }
-    issueJWT(user, browserId) {
+    issueJWT(user, usedMfa = false, browserId) {
         const payload = {
             id: user.id,
             hash: this.createJWTHash(user),
             browserId: browserId && this.hash(browserId),
+            usedMfa,
         };
         return this.jwtService.sign(payload, {
             expiresIn: this.jwtExpiration,
@@ -137,9 +155,9 @@ let AuthService = class AuthService {
         }
         if (jwtPayload.exp * 1000 - Date.now() < this.jwtRefreshTimeout) {
             this.logger.debug('JWT about to expire. Will be refreshed');
-            this.issueCookie(res, user, req.browserId);
+            this.issueCookie(res, user, jwtPayload.usedMfa ?? false, req.browserId);
         }
-        return user;
+        return [user, { usedMfa: jwtPayload.usedMfa ?? false }];
     }
     generatePasswordResetToken(user, expiresIn = '20m') {
         const payload = { sub: user.id, hash: this.createJWTHash(user) };
@@ -212,6 +230,7 @@ exports.AuthService = AuthService = __decorate([
         jwt_service_1.JwtService,
         url_service_1.UrlService,
         db_1.UserRepository,
-        db_1.InvalidAuthTokenRepository])
+        db_1.InvalidAuthTokenRepository,
+        mfa_service_1.MfaService])
 ], AuthService);
 //# sourceMappingURL=auth.service.js.map

package/dist/auth/auth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA2C;AAC3C,8CAAsC;AAEtC,gCAAqE;AACrE,gCAAkC;AAClC,mCAAoC;AAEpC,+CAAoE;AAGpE,sDAA8B;AAC9B,2CAAwE;AACxE,oEAAgE;AAChE,8EAA0E;AAC1E,uCAAoC;AACpC,mDAA+C;AAC/C,wDAAoD;AACpD,wDAAoD;AAuB7C,IAAM,WAAW,GAAjB,MAAM,WAAW;IAIvB,YACkB,YAA0B,EAC1B,MAAc,EACd,OAAgB,EAChB,UAAsB,EACtB,UAAsB,EACtB,cAA8B,EAC9B,0BAAsD,EACtD,UAAsB;QAPtB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,WAAM,GAAN,MAAM,CAAQ;QACd,YAAO,GAAP,OAAO,CAAS;QAChB,eAAU,GAAV,UAAU,CAAY;QACtB,eAAU,GAAV,UAAU,CAAY;QACtB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,+BAA0B,GAA1B,0BAA0B,CAA4B;QACtD,eAAU,GAAV,UAAU,CAAY;QAEvC,MAAM,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC;QACjD,IAAI,CAAC,2BAA2B,GAAG;YAGlC,IAAI,YAAY,OAAO;YAGvB,IAAI,YAAY,eAAe;YAG/B,IAAI,YAAY,6BAA6B;YAC7C,IAAI,YAAY,6BAA6B;SAC7C,CAAC;IACH,CAAC;IAED,oBAAoB,CAAC,YAAqB;QACzC,OAAO,KAAK,EAAE,GAAyB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YAC7E,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,4BAAgB,CAAC,CAAC;YAC5C,IAAI,KAAK,EAAE,CAAC;gBACX,IAAI,CAAC;oBACJ,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;oBAC5E,IAAI,SAAS;wBAAE,MAAM,IAAI,sBAAS,CAAC,cAAc,CAAC,CAAC;oBACnD,MAAM,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;oBACnE,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;oBAEpD,IAAI,WAAW,IAAI,CAAC,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;wBAE9C,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;4BAErB,MAAM,IAAI,sBAAS,CAAC,oCAAoC,CAAC,CAAC;wBAC3D,CAAC;6BAAM,CAAC;4BAEP,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;4BACtF,OAAO;wBACR,CAAC;oBACF,CAAC;oBAED,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;oBAChB,GAAG,CAAC,QAAQ,GAAG;wBACd,OAAO;qBACP,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,IAAI,KAAK,YAAY,gCAAiB,IAAI,KAAK,YAAY,sBAAS,EAAE,CAAC;wBACtE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;oBACvB,CAAC;yBAAM,CAAC;wBACP,MAAM,KAAK,CAAC;oBACb,CAAC;gBACF,CAAC;YACF,CAAC;YAED,IAAI,GAAG,CAAC,IAAI;gBAAE,IAAI,EAAE,CAAC;;gBAChB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;QACzE,CAAC,CAAC;IACH,CAAC;IAED,WAAW,CAAC,GAAa;QACxB,GAAG,CAAC,WAAW,CAAC,4BAAgB,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,GAAyB;QAC9C,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,4BAAgB,CAAC,CAAC;QAC5C,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,IAAI,CAAC;YACJ,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC9C,IAAI,GAAG,EAAE,CAAC;gBACT,MAAM,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC;oBAC5C,KAAK;oBACL,SAAS,EAAE,IAAI,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;iBAC/B,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,EAAE,KAAK,EAAG,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QACtF,CAAC;IACF,CAAC;IAED,WAAW,CAAC,GAAa,EAAE,IAAU,EAAE,OAAgB,EAAE,SAAkB;QAG1E,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAC7D,IACC,gBAAM,CAAC,MAAM,CAAC,qCAAqC,CAAC;YACpD,IAAI,CAAC,IAAI,KAAK,cAAc;YAC5B,CAAC,kBAAkB,EAClB,CAAC;YACF,MAAM,IAAI,gCAAc,CAAC,mCAAuB,CAAC,mBAAmB,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACtD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC;QAC3D,GAAG,CAAC,MAAM,CAAC,4BAAgB,EAAE,KAAK,EAAE;YACnC,MAAM,EAAE,IAAI,CAAC,aAAa,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc;YACxD,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,QAAQ;YAClB,MAAM;SACN,CAAC,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,IAAU,EAAE,UAAmB,KAAK,EAAE,SAAkB;QAChE,MAAM,OAAO,GAAmB;YAC/B,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YAC9B,SAAS,EAAE,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;YAC5C,OAAO;SACP,CAAC;QACF,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE;YACpC,SAAS,EAAE,IAAI,CAAC,aAAa;SAC7B,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CACf,KAAa,EACb,GAAyB,EACzB,GAAa;QAEb,MAAM,UAAU,GAAc,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE;YAC3D,UAAU,EAAE,CAAC,OAAO,CAAC;SACrB,CAAC,CAAC;QAGH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YAC9C,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE;SAC5B,CAAC,CAAC;QAEH,IAEC,CAAC,IAAI;YAEL,IAAI,CAAC,QAAQ;YAEb,UAAU,CAAC,IAAI,KAAK,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAC3C,CAAC;YACF,MAAM,IAAI,sBAAS,CAAC,cAAc,CAAC,CAAC;QACrC,CAAC;QAGD,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC;QAC7E,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,QAAQ,EAAE,CAAC,CAAC;QAC7D,CAAC;aAAM,IACN,UAAU,CAAC,SAAS;YACpB,CAAC,CAAC,GAAG,CAAC,SAAS,IAAI,UAAU,CAAC,SAAS,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EACpE,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,QAAQ,EAAE,CAAC,CAAC;YAC1D,MAAM,IAAI,sBAAS,CAAC,cAAc,CAAC,CAAC;QACrC,CAAC;QAED,IAAI,UAAU,CAAC,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACjE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC5D,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,IAAI,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QACzE,CAAC;QAED,OAAO,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,0BAA0B,CAAC,IAAU,EAAE,YAA2B,KAAK;QACtE,MAAM,OAAO,GAAuB,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;QACrF,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,wBAAwB,CAAC,IAAU;QAClC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;QAC7D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,eAAe,kBAAkB,CAAC,CAAC;QAE1D,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC;QACxE,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QAElE,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,KAAa;QAC5C,IAAI,YAAgC,CAAC;QACrC,IAAI,CAAC;YACJ,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,gCAAiB,EAAE,CAAC;gBACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAC9D,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YACvD,CAAC;YACD,OAAO;QACR,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YAC9C,KAAK,EAAE,EAAE,EAAE,EAAE,YAAY,CAAC,GAAG,EAAE;YAC/B,SAAS,EAAE,CAAC,gBAAgB,CAAC;SAC7B,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,6FAA6F,EAC7F,EAAE,MAAM,EAAE,YAAY,CAAC,GAAG,EAAE,KAAK,EAAE,CACnC,CAAC;YACF,OAAO;QACR,CAAC;QAED,IAAI,YAAY,CAAC,IAAI,KAAK,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;YACrE,OAAO;QACR,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAED,aAAa,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAQ;QAC7D,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAClC,IAAI,UAAU,IAAI,SAAS,EAAE,CAAC;YAC7B,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC;IAEO,IAAI,CAAC,KAAa;QACzB,OAAO,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAGD,IAAI,iBAAiB;QACpB,MAAM,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,GAAG,gBAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACzF,IAAI,sBAAsB,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,KAAK,CAAC,uBAAuB,GAAG,IAAI,GAAG,gBAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACP,OAAO,IAAI,CAAC,KAAK,CAAC,sBAAsB,GAAG,gBAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACvE,CAAC;IACF,CAAC;IAGD,IAAI,aAAa;QAChB,OAAO,gBAAM,CAAC,GAAG,CAAC,wCAAwC,CAAC,GAAG,gBAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IACpF,CAAC;CACD,CAAA;AAnPY,kCAAW;sBAAX,WAAW;IADvB,IAAA,YAAO,GAAE;qCAMuB,qBAAY;QAClB,uBAAM;QACL,iBAAO;QACJ,wBAAU;QACV,wBAAU;QACN,mBAAc;QACF,+BAA0B;QAC1C,wBAAU;GAZ5B,WAAW,CAmPvB"}

package/dist/auth/jwt.js

@@ -4,6 +4,6 @@ exports.issueCookie = issueCookie;
 const di_1 = require("@n8n/di");
 const auth_service_1 = require("./auth.service");
 function issueCookie(res, user) {
-    return di_1.Container.get(auth_service_1.AuthService).issueCookie(res, user);
+    return di_1.Container.get(auth_service_1.AuthService).issueCookie(res, user, user.mfaEnabled);
 }
 //# sourceMappingURL=jwt.js.map

package/dist/auth/jwt.js.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../src/auth/jwt.ts"],"names":[],"mappings":";;AASA,kCAEC;AAVD,gCAAoC;AAGpC,iDAA6C;AAK7C,SAAgB,WAAW,CAAC,GAAa,EAAE,IAAU;IACpD,OAAO,cAAS,CAAC,GAAG,CAAC,0BAAW,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAC1D,CAAC"}
+{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../src/auth/jwt.ts"],"names":[],"mappings":";;AASA,kCAEC;AAVD,gCAAoC;AAGpC,iDAA6C;AAK7C,SAAgB,WAAW,CAAC,GAAa,EAAE,IAAU;IACpD,OAAO,cAAS,CAAC,GAAG,CAAC,0BAAW,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;AAC3E,CAAC"}