n8n 1.53.2 → 1.54.1

package/dist/controllers/me.controller.js

@@ -25,11 +25,10 @@ const samlHelpers_1 = require("../sso/saml/samlHelpers");
 const user_service_1 = require("../services/user.service");
 const Logger_1 = require("../Logger");
 const ExternalHooks_1 = require("../ExternalHooks");
-const InternalHooks_1 = require("../InternalHooks");
 const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
 const user_repository_1 = require("../databases/repositories/user.repository");
 const PublicApi_1 = require("../PublicApi");
-const event_service_1 = require("../eventbus/event.service");
+const event_service_1 = require("../events/event.service");
 exports.API_KEY_PREFIX = 'n8n_api_';
 const isApiEnabledMiddleware = (_, res, next) => {
     if ((0, PublicApi_1.isApiEnabled)()) {
@@ -41,10 +40,9 @@ const isApiEnabledMiddleware = (_, res, next) => {
 };
 exports.isApiEnabledMiddleware = isApiEnabledMiddleware;
 let MeController = class MeController {
-    constructor(logger, externalHooks, internalHooks, authService, userService, passwordUtility, userRepository, eventService) {
+    constructor(logger, externalHooks, authService, userService, passwordUtility, userRepository, eventService) {
         this.logger = logger;
         this.externalHooks = externalHooks;
-        this.internalHooks = internalHooks;
         this.authService = authService;
         this.userService = userService;
         this.passwordUtility = passwordUtility;
@@ -80,14 +78,14 @@ let MeController = class MeController {
             }
         }
         await this.externalHooks.run('user.profile.beforeUpdate', [userId, currentEmail, payload]);
+        const preUpdateUser = await this.userRepository.findOneByOrFail({ id: userId });
         await this.userService.update(userId, payload);
         const user = await this.userRepository.findOneOrFail({
             where: { id: userId },
         });
         this.logger.info('User updated successfully', { userId });
         this.authService.issueCookie(res, user, req.browserId);
-        const fieldsChanged = Object.keys(payload);
-        this.internalHooks.onUserUpdate({ user, fields_changed: fieldsChanged });
+        const fieldsChanged = Object.keys(payload).filter((key) => payload[key] !== preUpdateUser[key]);
         this.eventService.emit('user-updated', { user, fieldsChanged });
         const publicUser = await this.userService.toPublic(user);
         await this.externalHooks.run('user.profile.update', [currentEmail, publicUser]);
@@ -117,7 +115,6 @@ let MeController = class MeController {
         const updatedUser = await this.userRepository.save(user, { transaction: false });
         this.logger.info('Password updated successfully', { userId: user.id });
         this.authService.issueCookie(res, updatedUser, req.browserId);
-        this.internalHooks.onUserUpdate({ user: updatedUser, fields_changed: ['password'] });
         this.eventService.emit('user-updated', { user: updatedUser, fieldsChanged: ['password'] });
         await this.externalHooks.run('user.password.update', [updatedUser.email, updatedUser.password]);
         return { success: true };
@@ -135,7 +132,10 @@ let MeController = class MeController {
             personalizationAnswers,
         }, { transaction: false });
         this.logger.info('User survey updated successfully', { userId: req.user.id });
-        this.internalHooks.onPersonalizationSurveySubmitted(req.user.id, personalizationAnswers);
+        this.eventService.emit('user-submitted-personalization-survey', {
+            userId: req.user.id,
+            answers: personalizationAnswers,
+        });
         return { success: true };
     }
     async createAPIKey(req) {
@@ -221,7 +221,6 @@ exports.MeController = MeController = __decorate([
     (0, decorators_1.RestController)('/me'),
     __metadata("design:paramtypes", [Logger_1.Logger,
         ExternalHooks_1.ExternalHooks,
-        InternalHooks_1.InternalHooks,
         auth_service_1.AuthService,
         user_service_1.UserService,
         password_utility_1.PasswordUtility,

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

@@ -1 +1 @@
-{"version":3,"file":"me.controller.js","sourceRoot":"","sources":["../../src/controllers/me.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAkC;AAClC,yDAAoD;AAEpD,mCAAqC;AAErC,sDAAkD;AAClD,6CAAwE;AACxE,kEAA8D;AAC9D,qDAAkD;AAElD,yCAKoB;AAEpB,wDAAkE;AAClE,0DAAsD;AACtD,qCAAkC;AAClC,mDAAgD;AAChD,mDAAgD;AAChD,kFAA6E;AAC7E,8EAA0E;AAC1E,2CAA2C;AAC3C,4DAAwD;AAE3C,QAAA,cAAc,GAAG,UAAU,CAAC;AAElC,MAAM,sBAAsB,GAAmB,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IACtE,IAAI,IAAA,wBAAY,GAAE,EAAE,CAAC;QACpB,IAAI,EAAE,CAAC;IACR,CAAC;SAAM,CAAC;QACP,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC;AACF,CAAC,CAAC;AANW,QAAA,sBAAsB,0BAMjC;AAGK,IAAM,YAAY,GAAlB,MAAM,YAAY;IACxB,YACkB,MAAc,EACd,aAA4B,EAC5B,aAA4B,EAC5B,WAAwB,EACxB,WAAwB,EACxB,eAAgC,EAChC,cAA8B,EAC9B,YAA0B;QAP1B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,oBAAe,GAAf,eAAe,CAAiB;QAChC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAME,AAAN,KAAK,CAAC,iBAAiB,CAAC,GAAyB,EAAE,GAAa;QAC/D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrD,MAAM,OAAO,GAAG,IAAA,mCAAe,EAAC,4BAAiB,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC,CAAC;QAEhG,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAC1B,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yEAAyE,EAAE;gBAC5F,MAAM;gBACN,OAAO;aACP,CAAC,CAAC;YACH,MAAM,IAAI,mCAAe,CAAC,oBAAoB,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,CAAC,mBAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yEAAyE,EAAE;gBAC5F,MAAM;gBACN,YAAY,EAAE,KAAK;aACnB,CAAC,CAAC;YACH,MAAM,IAAI,mCAAe,CAAC,uBAAuB,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;QAG9B,IAAI,IAAA,sCAAwB,GAAE,EAAE,CAAC;YAChC,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,4EAA4E,EAC5E;oBACC,MAAM;oBACN,OAAO;iBACP,CACD,CAAC;gBACF,MAAM,IAAI,mCAAe,CAAC,sCAAsC,CAAC,CAAC;YACnE,CAAC;QACF,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,2BAA2B,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;QAE3F,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YACpD,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAEvD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;QAEhE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC;QAEhF,OAAO,UAAU,CAAC;IACnB,CAAC;IAMK,AAAN,KAAK,CAAC,cAAc,CAAC,GAAuB,EAAE,GAAa;QAC1D,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QACrB,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAGlD,IAAI,IAAA,sCAAwB,GAAE,EAAE,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8DAA8D,EAAE;gBACjF,MAAM,EAAE,IAAI,CAAC,EAAE;aACf,CAAC,CAAC;YACH,MAAM,IAAI,mCAAe,CACxB,8EAA8E,CAC9E,CAAC;QACH,CAAC;QAED,IAAI,OAAO,eAAe,KAAK,QAAQ,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC5E,MAAM,IAAI,mCAAe,CAAC,kBAAkB,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,MAAM,IAAI,mCAAe,CAAC,6BAA6B,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9F,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACzB,MAAM,IAAI,mCAAe,CAAC,yCAAyC,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAEjE,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAE/D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QACjF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAEvE,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAE9D,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACrF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAE3F,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,sBAAsB,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEhG,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAMK,AAAN,KAAK,CAAC,kBAAkB,CAAC,GAA4B;QACpD,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE,GAAG,GAAG,CAAC;QAE7C,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,8EAA8E,EAC9E;gBACC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;aACnB,CACD,CAAC;YACF,MAAM,IAAI,mCAAe,CAAC,uCAAuC,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAC7B;YACC,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACf,sBAAsB;SACtB,EACD,EAAE,WAAW,EAAE,KAAK,EAAE,CACtB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAE9E,IAAI,CAAC,aAAa,CAAC,gCAAgC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,sBAAsB,CAAC,CAAC;QAEzF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAMK,AAAN,KAAK,CAAC,YAAY,CAAC,GAAyB;QAC3C,MAAM,MAAM,GAAG,WAAW,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAE5D,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAEvD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QAEvF,OAAO,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC;IAMK,AAAN,KAAK,CAAC,SAAS,CAAC,GAAyB;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClD,OAAO,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC;IAMK,AAAN,KAAK,CAAC,YAAY,CAAC,GAAyB;QAC3C,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAE7D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QAEvF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAMK,AAAN,KAAK,CAAC,yBAAyB,CAAC,GAAiC;QAChE,MAAM,OAAO,GAAG,IAAA,mCAAe,EAAC,oCAAyB,EAAE,GAAG,CAAC,IAAI,EAAE;YACpE,uBAAuB,EAAE,IAAI;SAC7B,CAAC,CAAC;QACH,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAExB,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YACpD,MAAM,EAAE,CAAC,UAAU,CAAC;YACpB,KAAK,EAAE,EAAE,EAAE,EAAE;SACb,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAEO,YAAY,CAAC,MAAqB;QACzC,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,UAAU,GAAG,CAAC,CAAC;QACrB,OAAO,CACN,sBAAc;YACd,MAAM,CAAC,KAAK,CAAC,sBAAc,CAAC,MAAM,EAAE,sBAAc,CAAC,MAAM,GAAG,UAAU,CAAC;YACvE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,sBAAc,CAAC,MAAM,GAAG,UAAU,CAAC,CAC9D,CAAC;IACH,CAAC;CACD,CAAA;AA3NY,oCAAY;AAgBlB;IADL,IAAA,kBAAK,EAAC,GAAG,CAAC;;;;qDA0DV;AAMK;IADL,IAAA,kBAAK,EAAC,WAAW,CAAC;;;;kDA2ClB;AAMK;IADL,IAAA,iBAAI,EAAC,SAAS,CAAC;;;;sDA2Bf;AAMK;IADL,IAAA,iBAAI,EAAC,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,8BAAsB,CAAC,EAAE,CAAC;;;;gDAS3D;AAMK;IADL,IAAA,gBAAG,EAAC,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,8BAAsB,CAAC,EAAE,CAAC;;;;6CAI1D;AAMK;IADL,IAAA,mBAAM,EAAC,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,8BAAsB,CAAC,EAAE,CAAC;;;;gDAO7D;AAMK;IADL,IAAA,kBAAK,EAAC,WAAW,CAAC;;;;6DAelB;uBAhNW,YAAY;IADxB,IAAA,2BAAc,EAAC,KAAK,CAAC;qCAGK,eAAM;QACC,6BAAa;QACb,6BAAa;QACf,0BAAW;QACX,0BAAW;QACP,kCAAe;QAChB,gCAAc;QAChB,4BAAY;GAThC,YAAY,CA2NxB"}
+{"version":3,"file":"me.controller.js","sourceRoot":"","sources":["../../src/controllers/me.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAkC;AAClC,yDAAoD;AAEpD,mCAAqC;AAErC,sDAAkD;AAClD,6CAAwE;AACxE,kEAA8D;AAC9D,qDAAkD;AAElD,yCAKoB;AAEpB,wDAAkE;AAClE,0DAAsD;AACtD,qCAAkC;AAClC,mDAAgD;AAChD,kFAA6E;AAC7E,8EAA0E;AAC1E,2CAA2C;AAC3C,0DAAsD;AAEzC,QAAA,cAAc,GAAG,UAAU,CAAC;AAElC,MAAM,sBAAsB,GAAmB,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IACtE,IAAI,IAAA,wBAAY,GAAE,EAAE,CAAC;QACpB,IAAI,EAAE,CAAC;IACR,CAAC;SAAM,CAAC;QACP,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC;AACF,CAAC,CAAC;AANW,QAAA,sBAAsB,0BAMjC;AAGK,IAAM,YAAY,GAAlB,MAAM,YAAY;IACxB,YACkB,MAAc,EACd,aAA4B,EAC5B,WAAwB,EACxB,WAAwB,EACxB,eAAgC,EAChC,cAA8B,EAC9B,YAA0B;QAN1B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,oBAAe,GAAf,eAAe,CAAiB;QAChC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAME,AAAN,KAAK,CAAC,iBAAiB,CAAC,GAAyB,EAAE,GAAa;QAC/D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrD,MAAM,OAAO,GAAG,IAAA,mCAAe,EAAC,4BAAiB,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC,CAAC;QAEhG,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAC1B,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yEAAyE,EAAE;gBAC5F,MAAM;gBACN,OAAO;aACP,CAAC,CAAC;YACH,MAAM,IAAI,mCAAe,CAAC,oBAAoB,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,CAAC,mBAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yEAAyE,EAAE;gBAC5F,MAAM;gBACN,YAAY,EAAE,KAAK;aACnB,CAAC,CAAC;YACH,MAAM,IAAI,mCAAe,CAAC,uBAAuB,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;QAG9B,IAAI,IAAA,sCAAwB,GAAE,EAAE,CAAC;YAChC,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,4EAA4E,EAC5E;oBACC,MAAM;oBACN,OAAO;iBACP,CACD,CAAC;gBACF,MAAM,IAAI,mCAAe,CAAC,sCAAsC,CAAC,CAAC;YACnE,CAAC;QACF,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,2BAA2B,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;QAE3F,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAChF,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YACpD,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAEvD,MAAM,aAAa,GAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAoC,CAAC,MAAM,CACpF,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,aAAa,CAAC,GAAG,CAAC,CAC5C,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;QAEhE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC;QAEhF,OAAO,UAAU,CAAC;IACnB,CAAC;IAMK,AAAN,KAAK,CAAC,cAAc,CAAC,GAAuB,EAAE,GAAa;QAC1D,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QACrB,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAGlD,IAAI,IAAA,sCAAwB,GAAE,EAAE,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8DAA8D,EAAE;gBACjF,MAAM,EAAE,IAAI,CAAC,EAAE;aACf,CAAC,CAAC;YACH,MAAM,IAAI,mCAAe,CACxB,8EAA8E,CAC9E,CAAC;QACH,CAAC;QAED,IAAI,OAAO,eAAe,KAAK,QAAQ,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC5E,MAAM,IAAI,mCAAe,CAAC,kBAAkB,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,MAAM,IAAI,mCAAe,CAAC,6BAA6B,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9F,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACzB,MAAM,IAAI,mCAAe,CAAC,yCAAyC,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAEjE,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAE/D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QACjF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAEvE,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAE9D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAE3F,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,sBAAsB,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEhG,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAMK,AAAN,KAAK,CAAC,kBAAkB,CAAC,GAA4B;QACpD,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE,GAAG,GAAG,CAAC;QAE7C,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,8EAA8E,EAC9E;gBACC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;aACnB,CACD,CAAC;YACF,MAAM,IAAI,mCAAe,CAAC,uCAAuC,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAC7B;YACC,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACf,sBAAsB;SACtB,EACD,EAAE,WAAW,EAAE,KAAK,EAAE,CACtB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAE9E,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,uCAAuC,EAAE;YAC/D,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,OAAO,EAAE,sBAAsB;SAC/B,CAAC,CAAC;QAEH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAMK,AAAN,KAAK,CAAC,YAAY,CAAC,GAAyB;QAC3C,MAAM,MAAM,GAAG,WAAW,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAE5D,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAEvD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QAEvF,OAAO,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC;IAMK,AAAN,KAAK,CAAC,SAAS,CAAC,GAAyB;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClD,OAAO,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC;IAMK,AAAN,KAAK,CAAC,YAAY,CAAC,GAAyB;QAC3C,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAE7D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QAEvF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAMK,AAAN,KAAK,CAAC,yBAAyB,CAAC,GAAiC;QAChE,MAAM,OAAO,GAAG,IAAA,mCAAe,EAAC,oCAAyB,EAAE,GAAG,CAAC,IAAI,EAAE;YACpE,uBAAuB,EAAE,IAAI;SAC7B,CAAC,CAAC;QACH,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAExB,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YACpD,MAAM,EAAE,CAAC,UAAU,CAAC;YACpB,KAAK,EAAE,EAAE,EAAE,EAAE;SACb,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAEO,YAAY,CAAC,MAAqB;QACzC,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,UAAU,GAAG,CAAC,CAAC;QACrB,OAAO,CACN,sBAAc;YACd,MAAM,CAAC,KAAK,CAAC,sBAAc,CAAC,MAAM,EAAE,sBAAc,CAAC,MAAM,GAAG,UAAU,CAAC;YACvE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,sBAAc,CAAC,MAAM,GAAG,UAAU,CAAC,CAC9D,CAAC;IACH,CAAC;CACD,CAAA;AA/NY,oCAAY;AAelB;IADL,IAAA,kBAAK,EAAC,GAAG,CAAC;;;;qDA6DV;AAMK;IADL,IAAA,kBAAK,EAAC,WAAW,CAAC;;;;kDA0ClB;AAMK;IADL,IAAA,iBAAI,EAAC,SAAS,CAAC;;;;sDA8Bf;AAMK;IADL,IAAA,iBAAI,EAAC,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,8BAAsB,CAAC,EAAE,CAAC;;;;gDAS3D;AAMK;IADL,IAAA,gBAAG,EAAC,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,8BAAsB,CAAC,EAAE,CAAC;;;;6CAI1D;AAMK;IADL,IAAA,mBAAM,EAAC,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,8BAAsB,CAAC,EAAE,CAAC;;;;gDAO7D;AAMK;IADL,IAAA,kBAAK,EAAC,WAAW,CAAC;;;;6DAelB;uBApNW,YAAY;IADxB,IAAA,2BAAc,EAAC,KAAK,CAAC;qCAGK,eAAM;QACC,6BAAa;QACf,0BAAW;QACX,0BAAW;QACP,kCAAe;QAChB,gCAAc;QAChB,4BAAY;GARhC,YAAY,CA+NxB"}

package/dist/controllers/oauth/abstractOAuth.controller.d.ts

@@ -1,7 +1,6 @@
 import type { Response } from 'express';
 import type { ICredentialDataDecryptedObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 import type { CredentialsEntity } from '../../databases/entities/CredentialsEntity';
-import type { User } from '../../databases/entities/User';
 import { CredentialsRepository } from '../../databases/repositories/credentials.repository';
 import { SharedCredentialsRepository } from '../../databases/repositories/sharedCredentials.repository';
 import type { ICredentialsDb } from '../../Interfaces';
@@ -10,6 +9,7 @@ import { CredentialsHelper } from '../../CredentialsHelper';
 import { Logger } from '../../Logger';
 import { ExternalHooks } from '../../ExternalHooks';
 import { UrlService } from '../../services/url.service';
+import { GlobalConfig } from '@n8n/config';
 export interface CsrfStateParam {
     cid: string;
     token: string;
@@ -21,16 +21,17 @@ export declare abstract class AbstractOAuthController {
     private readonly credentialsRepository;
     private readonly sharedCredentialsRepository;
     private readonly urlService;
+    private readonly globalConfig;
     abstract oauthVersion: number;
-    constructor(logger: Logger, externalHooks: ExternalHooks, credentialsHelper: CredentialsHelper, credentialsRepository: CredentialsRepository, sharedCredentialsRepository: SharedCredentialsRepository, urlService: UrlService);
+    constructor(logger: Logger, externalHooks: ExternalHooks, credentialsHelper: CredentialsHelper, credentialsRepository: CredentialsRepository, sharedCredentialsRepository: SharedCredentialsRepository, urlService: UrlService, globalConfig: GlobalConfig);
     get baseUrl(): string;
     protected getCredential(req: OAuthRequest.OAuth2Credential.Auth): Promise<CredentialsEntity>;
-    protected getAdditionalData(user: User): Promise<IWorkflowExecuteAdditionalData>;
+    protected getAdditionalData(): Promise<IWorkflowExecuteAdditionalData>;
     protected getDecryptedData(credential: ICredentialsDb, additionalData: IWorkflowExecuteAdditionalData): Promise<ICredentialDataDecryptedObject>;
     protected applyDefaultsAndOverwrites<T>(credential: ICredentialsDb, decryptedData: ICredentialDataDecryptedObject, additionalData: IWorkflowExecuteAdditionalData): T;
     protected encryptAndSaveData(credential: ICredentialsDb, decryptedData: ICredentialDataDecryptedObject): Promise<void>;
     protected getCredentialWithoutUser(credentialId: string): Promise<ICredentialsDb | null>;
-    protected createCsrfState(credentialsId: string): [string, string];
+    createCsrfState(credentialsId: string): [string, string];
     protected decodeCsrfState(encodedState: string): CsrfStateParam;
     protected verifyCsrfState(decrypted: ICredentialDataDecryptedObject, state: CsrfStateParam): boolean;
     protected renderCallbackError(res: Response, message: string, reason?: string): void;

package/dist/controllers/oauth/abstractOAuth.controller.js

@@ -40,7 +40,6 @@ const typedi_1 = require("typedi");
 const csrf_1 = __importDefault(require("csrf"));
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
-const config_1 = __importDefault(require("../../config"));
 const credentials_repository_1 = require("../../databases/repositories/credentials.repository");
 const sharedCredentials_repository_1 = require("../../databases/repositories/sharedCredentials.repository");
 const constants_1 = require("../../constants");
@@ -51,17 +50,19 @@ const ExternalHooks_1 = require("../../ExternalHooks");
 const url_service_1 = require("../../services/url.service");
 const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
 const not_found_error_1 = require("../../errors/response-errors/not-found.error");
+const config_1 = require("@n8n/config");
 let AbstractOAuthController = class AbstractOAuthController {
-    constructor(logger, externalHooks, credentialsHelper, credentialsRepository, sharedCredentialsRepository, urlService) {
+    constructor(logger, externalHooks, credentialsHelper, credentialsRepository, sharedCredentialsRepository, urlService, globalConfig) {
         this.logger = logger;
         this.externalHooks = externalHooks;
         this.credentialsHelper = credentialsHelper;
         this.credentialsRepository = credentialsRepository;
         this.sharedCredentialsRepository = sharedCredentialsRepository;
         this.urlService = urlService;
+        this.globalConfig = globalConfig;
     }
     get baseUrl() {
-        const restUrl = `${this.urlService.getInstanceBaseUrl()}/${config_1.default.getEnv('endpoints.rest')}`;
+        const restUrl = `${this.urlService.getInstanceBaseUrl()}/${this.globalConfig.endpoints.rest}`;
         return `${restUrl}/oauth${this.oauthVersion}-credential`;
     }
     async getCredential(req) {
@@ -76,8 +77,8 @@ let AbstractOAuthController = class AbstractOAuthController {
         }
         return credential;
     }
-    async getAdditionalData(user) {
-        return await WorkflowExecuteAdditionalData.getBase(user.id);
+    async getAdditionalData() {
+        return await WorkflowExecuteAdditionalData.getBase();
     }
     async getDecryptedData(credential, additionalData) {
         return await this.credentialsHelper.getDecrypted(additionalData, credential, credential.type, 'internal', undefined, true);
@@ -132,6 +133,7 @@ exports.AbstractOAuthController = AbstractOAuthController = __decorate([
         CredentialsHelper_1.CredentialsHelper,
         credentials_repository_1.CredentialsRepository,
         sharedCredentials_repository_1.SharedCredentialsRepository,
-        url_service_1.UrlService])
+        url_service_1.UrlService,
+        config_1.GlobalConfig])
 ], AbstractOAuthController);
 //# sourceMappingURL=abstractOAuth.controller.js.map

package/dist/controllers/oauth/abstractOAuth.controller.js.map

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

package/dist/controllers/oauth/oAuth1Credential.controller.js

@@ -32,7 +32,7 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
     }
     async getAuthUri(req) {
         const credential = await this.getCredential(req);
-        const additionalData = await this.getAdditionalData(req.user);
+        const additionalData = await this.getAdditionalData();
         const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
         const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
         const [csrfSecret, state] = this.createCsrfState(credential.id);
@@ -74,8 +74,6 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
         return returnUri;
     }
     async handleCallback(req, res) {
-        var _a;
-        const userId = (_a = req.user) === null || _a === void 0 ? void 0 : _a.id;
         try {
             const { oauth_verifier, oauth_token, state: encodedState } = req.query;
             if (!oauth_verifier || !oauth_token || !encodedState) {
@@ -92,15 +90,15 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
             const credential = await this.getCredentialWithoutUser(credentialId);
             if (!credential) {
                 const errorMessage = 'OAuth1 callback failed because of insufficient permissions';
-                this.logger.error(errorMessage, { userId, credentialId });
+                this.logger.error(errorMessage, { credentialId });
                 return this.renderCallbackError(res, errorMessage);
             }
-            const additionalData = await this.getAdditionalData(req.user);
+            const additionalData = await this.getAdditionalData();
             const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
             const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
             if (this.verifyCsrfState(decryptedDataOriginal, state)) {
                 const errorMessage = 'The OAuth1 callback state is invalid!';
-                this.logger.debug(errorMessage, { userId, credentialId });
+                this.logger.debug(errorMessage, { credentialId });
                 return this.renderCallbackError(res, errorMessage);
             }
             const options = {
@@ -116,7 +114,7 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
                 oauthToken = await axios_1.default.request(options);
             }
             catch (error) {
-                this.logger.error('Unable to fetch tokens for OAuth1 callback', { userId, credentialId });
+                this.logger.error('Unable to fetch tokens for OAuth1 callback', { credentialId });
                 const errorResponse = new not_found_error_1.NotFoundError('Unable to get access tokens!');
                 return (0, ResponseHelper_1.sendErrorResponse)(res, errorResponse);
             }
@@ -125,15 +123,12 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
             decryptedDataOriginal.oauthTokenData = oauthTokenJson;
             await this.encryptAndSaveData(credential, decryptedDataOriginal);
             this.logger.verbose('OAuth1 callback successful for new credential', {
-                userId,
                 credentialId,
             });
             return res.render('oauth-callback');
         }
         catch (error) {
-            this.logger.error('OAuth1 callback failed because of insufficient user permissions', {
-                userId,
-            });
+            this.logger.error('OAuth1 callback failed because of insufficient user permissions');
             return (0, ResponseHelper_1.sendErrorResponse)(res, error);
         }
     }
@@ -146,7 +141,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], OAuth1CredentialController.prototype, "getAuthUri", null);
 __decorate([
-    (0, decorators_1.Get)('/callback', { usesTemplates: true }),
+    (0, decorators_1.Get)('/callback', { usesTemplates: true, skipAuth: true }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)

package/dist/controllers/oauth/oAuth1Credential.controller.js.map

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

package/dist/controllers/oauth/oAuth2Credential.controller.js

@@ -53,7 +53,7 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
     }
     async getAuthUri(req) {
         const credential = await this.getCredential(req);
-        const additionalData = await this.getAdditionalData(req.user);
+        const additionalData = await this.getAdditionalData();
         const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
         if ((decryptedDataOriginal === null || decryptedDataOriginal === void 0 ? void 0 : decryptedDataOriginal.scope) &&
             credential.type.includes('OAuth2') &&
@@ -90,8 +90,6 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
         return returnUri.toString();
     }
     async handleCallback(req, res) {
-        var _a;
-        const userId = (_a = req.user) === null || _a === void 0 ? void 0 : _a.id;
         try {
             const { code, state: encodedState } = req.query;
             if (!code || !encodedState) {
@@ -108,15 +106,15 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
             const credential = await this.getCredentialWithoutUser(credentialId);
             if (!credential) {
                 const errorMessage = 'OAuth2 callback failed because of insufficient permissions';
-                this.logger.error(errorMessage, { userId, credentialId });
+                this.logger.error(errorMessage, { credentialId });
                 return this.renderCallbackError(res, errorMessage);
             }
-            const additionalData = await this.getAdditionalData(req.user);
+            const additionalData = await this.getAdditionalData();
             const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
             const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
             if (this.verifyCsrfState(decryptedDataOriginal, state)) {
                 const errorMessage = 'The OAuth2 callback state is invalid!';
-                this.logger.debug(errorMessage, { userId, credentialId });
+                this.logger.debug(errorMessage, { credentialId });
                 return this.renderCallbackError(res, errorMessage);
             }
             let options = {};
@@ -144,7 +142,7 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
             }
             if (oauthToken === undefined) {
                 const errorMessage = 'Unable to get OAuth2 access tokens!';
-                this.logger.error(errorMessage, { userId, credentialId });
+                this.logger.error(errorMessage, { credentialId });
                 return this.renderCallbackError(res, errorMessage);
             }
             if (decryptedDataOriginal.oauthTokenData) {
@@ -156,7 +154,6 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
             delete decryptedDataOriginal.csrfSecret;
             await this.encryptAndSaveData(credential, decryptedDataOriginal);
             this.logger.verbose('OAuth2 callback successful for credential', {
-                userId,
                 credentialId,
             });
             return res.render('oauth-callback');
@@ -188,7 +185,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], OAuth2CredentialController.prototype, "getAuthUri", null);
 __decorate([
-    (0, decorators_1.Get)('/callback', { usesTemplates: true }),
+    (0, decorators_1.Get)('/callback', { usesTemplates: true, skipAuth: true }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)

package/dist/controllers/oauth/oAuth2Credential.controller.js.map

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

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

@@ -11,7 +11,7 @@ import { ExternalHooks } from '../ExternalHooks';
 import { InternalHooks } from '../InternalHooks';
 import { UrlService } from '../services/url.service';
 import { UserRepository } from '../databases/repositories/user.repository';
-import { EventService } from '../eventbus/event.service';
+import { EventService } from '../events/event.service';
 export declare class PasswordResetController {
     private readonly logger;
     private readonly externalHooks;

package/dist/controllers/passwordReset.controller.js

@@ -33,7 +33,7 @@ const forbidden_error_1 = require("../errors/response-errors/forbidden.error");
 const not_found_error_1 = require("../errors/response-errors/not-found.error");
 const unprocessable_error_1 = require("../errors/response-errors/unprocessable.error");
 const user_repository_1 = require("../databases/repositories/user.repository");
-const event_service_1 = require("../eventbus/event.service");
+const event_service_1 = require("../events/event.service");
 let PasswordResetController = class PasswordResetController {
     constructor(logger, externalHooks, internalHooks, mailer, authService, userService, mfaService, urlService, license, passwordUtility, userRepository, eventService) {
         this.logger = logger;
@@ -158,15 +158,14 @@ let PasswordResetController = class PasswordResetController {
         await this.userService.update(user.id, { password: passwordHash });
         this.logger.info('User password updated successfully', { userId: user.id });
         this.authService.issueCookie(res, user, req.browserId);
-        this.internalHooks.onUserUpdate({ user, fields_changed: ['password'] });
         this.eventService.emit('user-updated', { user, fieldsChanged: ['password'] });
         const ldapIdentity = (_a = user === null || user === void 0 ? void 0 : user.authIdentities) === null || _a === void 0 ? void 0 : _a.find((i) => i.providerType === 'ldap');
         if (ldapIdentity) {
-            this.internalHooks.onUserSignup(user, {
-                user_type: 'email',
-                was_disabled_ldap_user: true,
+            this.eventService.emit('user-signed-up', {
+                user,
+                userType: 'email',
+                wasDisabledLdapUser: true,
             });
-            this.eventService.emit('user-signed-up', { user });
         }
         await this.externalHooks.run('user.password.update', [user.email, passwordHash]);
     }

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

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

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

@@ -4,7 +4,7 @@ import { ProjectService } from '../services/project.service';
 import type { Scope } from '@n8n/permissions';
 import { RoleService } from '../services/role.service';
 import { ProjectRepository } from '../databases/repositories/project.repository';
-import { EventService } from '../eventbus/event.service';
+import { EventService } from '../events/event.service';
 export declare class ProjectController {
     private readonly projectsService;
     private readonly roleService;

package/dist/controllers/project.controller.js

@@ -18,7 +18,7 @@ const role_service_1 = require("../services/role.service");
 const project_repository_1 = require("../databases/repositories/project.repository");
 const typeorm_1 = require("@n8n/typeorm");
 const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
-const event_service_1 = require("../eventbus/event.service");
+const event_service_1 = require("../events/event.service");
 let ProjectController = class ProjectController {
     constructor(projectsService, roleService, projectRepository, eventService) {
         this.projectsService = projectsService;

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

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

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

@@ -7,16 +7,14 @@ import { UserRepository } from '../databases/repositories/user.repository';
 import { UserService } from '../services/user.service';
 import { Logger } from '../Logger';
 import { ExternalHooks } from '../ExternalHooks';
-import { InternalHooks } from '../InternalHooks';
 import { ProjectRepository } from '../databases/repositories/project.repository';
 import { WorkflowService } from '../workflows/workflow.service';
 import { CredentialsService } from '../credentials/credentials.service';
 import { ProjectService } from '../services/project.service';
-import { EventService } from '../eventbus/event.service';
+import { EventService } from '../events/event.service';
 export declare class UsersController {
     private readonly logger;
     private readonly externalHooks;
-    private readonly internalHooks;
     private readonly sharedCredentialsRepository;
     private readonly sharedWorkflowRepository;
     private readonly userRepository;
@@ -27,7 +25,7 @@ export declare class UsersController {
     private readonly credentialsService;
     private readonly projectService;
     private readonly eventService;
-    constructor(logger: Logger, externalHooks: ExternalHooks, internalHooks: InternalHooks, sharedCredentialsRepository: SharedCredentialsRepository, sharedWorkflowRepository: SharedWorkflowRepository, userRepository: UserRepository, authService: AuthService, userService: UserService, projectRepository: ProjectRepository, workflowService: WorkflowService, credentialsService: CredentialsService, projectService: ProjectService, eventService: EventService);
+    constructor(logger: Logger, externalHooks: ExternalHooks, sharedCredentialsRepository: SharedCredentialsRepository, sharedWorkflowRepository: SharedWorkflowRepository, userRepository: UserRepository, authService: AuthService, userService: UserService, projectRepository: ProjectRepository, workflowService: WorkflowService, credentialsService: CredentialsService, projectService: ProjectService, eventService: EventService);
     static ERROR_MESSAGES: {
         readonly CHANGE_ROLE: {
             readonly NO_USER: "Target user not found";