n8n 1.3.0 → 1.4.0

package/dist/controllers/me.controller.js

@@ -23,13 +23,14 @@ const jwt_1 = require("../auth/jwt");
 const requests_1 = require("../requests");
 const crypto_1 = require("crypto");
 const samlHelpers_1 = require("../sso/saml/samlHelpers");
-const user_service_1 = require("../user/user.service");
+const user_service_1 = require("../services/user.service");
+const typedi_1 = __importDefault(require("typedi"));
 let MeController = exports.MeController = class MeController {
-    constructor({ logger, externalHooks, internalHooks, repositories, }) {
+    constructor({ logger, externalHooks, internalHooks, }) {
         this.logger = logger;
         this.externalHooks = externalHooks;
         this.internalHooks = internalHooks;
-        this.userRepository = repositories.User;
+        this.userService = typedi_1.default.get(user_service_1.UserService);
     }
     async updateCurrentUser(req, res) {
         const { id: userId, email: currentEmail } = req.user;
@@ -59,11 +60,8 @@ let MeController = exports.MeController = class MeController {
                 throw new ResponseHelper_1.BadRequestError('SAML user may not change their email');
             }
         }
-        await this.userRepository.update(userId, payload);
-        const user = await this.userRepository.findOneOrFail({
-            where: { id: userId },
-            relations: { globalRole: true },
-        });
+        await this.userService.update(userId, payload);
+        const user = await this.userService.findOneOrFail({ where: { id: userId } });
         this.logger.info('User updated successfully', { userId });
         await (0, jwt_1.issueCookie)(res, user);
         const updatedKeys = Object.keys(payload);
@@ -95,7 +93,7 @@ let MeController = exports.MeController = class MeController {
         }
         const validPassword = (0, UserManagementHelper_1.validatePassword)(newPassword);
         req.user.password = await (0, UserManagementHelper_1.hashPassword)(validPassword);
-        const user = await this.userRepository.save(req.user);
+        const user = await this.userService.save(req.user);
         this.logger.info('Password updated successfully', { userId: user.id });
         await (0, jwt_1.issueCookie)(res, user);
         void this.internalHooks.onUserUpdate({
@@ -113,7 +111,7 @@ let MeController = exports.MeController = class MeController {
             });
             throw new ResponseHelper_1.BadRequestError('Personalization answers are mandatory');
         }
-        await this.userRepository.save({
+        await this.userService.save({
             id: req.user.id,
             personalizationAnswers,
         });
@@ -123,9 +121,7 @@ let MeController = exports.MeController = class MeController {
     }
     async createAPIKey(req) {
         const apiKey = `n8n_api_${(0, crypto_1.randomBytes)(40).toString('hex')}`;
-        await this.userRepository.update(req.user.id, {
-            apiKey,
-        });
+        await this.userService.update(req.user.id, { apiKey });
         void this.internalHooks.onApiKeyCreated({
             user: req.user,
             public_api: false,
@@ -136,9 +132,7 @@ let MeController = exports.MeController = class MeController {
         return { apiKey: req.user.apiKey };
     }
     async deleteAPIKey(req) {
-        await this.userRepository.update(req.user.id, {
-            apiKey: null,
-        });
+        await this.userService.update(req.user.id, { apiKey: null });
         void this.internalHooks.onApiKeyDeleted({
             user: req.user,
             public_api: false,
@@ -148,8 +142,8 @@ let MeController = exports.MeController = class MeController {
     async updateCurrentUserSettings(req) {
         const payload = (0, class_transformer_1.plainToInstance)(requests_1.UserSettingsUpdatePayload, req.body);
         const { id } = req.user;
-        await user_service_1.UserService.updateUserSettings(id, payload);
-        const user = await this.userRepository.findOneOrFail({
+        await this.userService.updateSettings(id, payload);
+        const user = await this.userService.findOneOrFail({
             select: ['settings'],
             where: { id },
         });

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

@@ -1 +1 @@
-{"version":3,"file":"me.controller.js","sourceRoot":"","sources":["../../src/controllers/me.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"me.controller.js","sourceRoot":"","sources":["../../src/controllers/me.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAkC;AAClC,yDAAoD;AACpD,6CAAoF;AACpF,gFAK+C;AAC/C,qDAAmD;AACnD,qDAAkD;AAClD,oCAAyC;AAIzC,yCAKoB;AAEpB,mCAAqC;AACrC,yDAAmE;AACnE,0DAAsD;AACtD,oDAA+B;AAIxB,IAAM,YAAY,0BAAlB,MAAM,YAAY;IASxB,YAAY,EACX,MAAM,EACN,aAAa,EACb,aAAa,GAKb;QACA,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,WAAW,GAAG,gBAAS,CAAC,GAAG,CAAC,0BAAW,CAAC,CAAC;IAC/C,CAAC;IAMK,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,CAAC,CAAC;QAE7D,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAC1B,IAAI,CAAC,KAAK,EAAE;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yEAAyE,EAAE;gBAC5F,MAAM;gBACN,OAAO;aACP,CAAC,CAAC;YACH,MAAM,IAAI,gCAAe,CAAC,oBAAoB,CAAC,CAAC;SAChD;QAED,IAAI,CAAC,mBAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yEAAyE,EAAE;gBAC5F,MAAM;gBACN,YAAY,EAAE,KAAK;aACnB,CAAC,CAAC;YACH,MAAM,IAAI,gCAAe,CAAC,uBAAuB,CAAC,CAAC;SACnD;QAED,MAAM,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;QAG9B,IAAI,IAAA,sCAAwB,GAAE,EAAE;YAC/B,IAAI,KAAK,KAAK,YAAY,EAAE;gBAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,4EAA4E,EAC5E;oBACC,MAAM;oBACN,OAAO;iBACP,CACD,CAAC;gBACF,MAAM,IAAI,gCAAe,CAAC,sCAAsC,CAAC,CAAC;aAClE;SACD;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAE7E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAE1D,MAAM,IAAA,iBAAW,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAE7B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzC,KAAK,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;YACpC,IAAI;YACJ,cAAc,EAAE,WAAW;SAC3B,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,YAAY,EAAE,IAAA,mCAAY,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAExF,OAAO,IAAA,mCAAY,EAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAMK,AAAN,KAAK,CAAC,cAAc,CAAC,GAAuB,EAAE,GAAa;;QAC1D,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAGlD,IAAI,IAAA,sCAAwB,GAAE,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8DAA8D,EAAE;gBACjF,MAAM,EAAE,MAAA,GAAG,CAAC,IAAI,0CAAE,EAAE;aACpB,CAAC,CAAC;YACH,MAAM,IAAI,gCAAe,CACxB,8EAA8E,CAC9E,CAAC;SACF;QAED,IAAI,OAAO,eAAe,KAAK,QAAQ,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YAC3E,MAAM,IAAI,gCAAe,CAAC,kBAAkB,CAAC,CAAC;SAC9C;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE;YACvB,MAAM,IAAI,gCAAe,CAAC,6BAA6B,CAAC,CAAC;SACzD;QAED,MAAM,kBAAkB,GAAG,MAAM,IAAA,kCAAW,EAAC,eAAe,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjF,IAAI,CAAC,kBAAkB,EAAE;YACxB,MAAM,IAAI,gCAAe,CAAC,yCAAyC,CAAC,CAAC;SACrE;QAED,MAAM,aAAa,GAAG,IAAA,uCAAgB,EAAC,WAAW,CAAC,CAAC;QAEpD,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAA,mCAAY,EAAC,aAAa,CAAC,CAAC;QAEtD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAEvE,MAAM,IAAA,iBAAW,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAE7B,KAAK,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;YACpC,IAAI;YACJ,cAAc,EAAE,CAAC,UAAU,CAAC;SAC5B,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEtF,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;YAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,8EAA8E,EAC9E;gBACC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;aACnB,CACD,CAAC;YACF,MAAM,IAAI,gCAAe,CAAC,uCAAuC,CAAC,CAAC;SACnE;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YAC3B,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YAEf,sBAAsB;SACtB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAE9E,KAAK,IAAI,CAAC,aAAa,CAAC,gCAAgC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,sBAAsB,CAAC,CAAC;QAE9F,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,KAAK,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;YACvC,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,UAAU,EAAE,KAAK;SACjB,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC;IAMK,AAAN,KAAK,CAAC,SAAS,CAAC,GAAyB;QACxC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IACpC,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,KAAK,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;YACvC,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,UAAU,EAAE,KAAK;SACjB,CAAC,CAAC;QAEH,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,CAAC,CAAC;QACrE,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,WAAW,CAAC,aAAa,CAAC;YACjD,MAAM,EAAE,CAAC,UAAU,CAAC;YACpB,KAAK,EAAE,EAAE,EAAE,EAAE;SACb,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;CACD,CAAA;AA/LM;IADL,IAAA,kBAAK,EAAC,GAAG,CAAC;;;;qDAsDV;AAMK;IADL,IAAA,kBAAK,EAAC,WAAW,CAAC;;;;kDA4ClB;AAMK;IADL,IAAA,iBAAI,EAAC,SAAS,CAAC;;;;sDAyBf;AAMK;IADL,IAAA,iBAAI,EAAC,UAAU,CAAC;;;;gDAYhB;AAMK;IADL,IAAA,gBAAG,EAAC,UAAU,CAAC;;;;6CAGf;AAMK;IADL,IAAA,mBAAM,EAAC,UAAU,CAAC;;;;gDAUlB;AAMK;IADL,IAAA,kBAAK,EAAC,WAAW,CAAC;;;;6DAalB;uBA1NW,YAAY;IAFxB,IAAA,uBAAU,GAAE;IACZ,IAAA,2BAAc,EAAC,KAAK,CAAC;;GACT,YAAY,CA2NxB"}

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

@@ -3,19 +3,22 @@ import type { ILogger } from 'n8n-workflow';
 import type { Config } from '../config';
 import { OwnerRequest } from '../requests';
 import type { IDatabaseCollections, IInternalHooksClass } from '../Interfaces';
+import type { PostHogClient } from '../posthog';
 export declare class OwnerController {
     private readonly config;
     private readonly logger;
     private readonly internalHooks;
-    private readonly userRepository;
+    private readonly userService;
     private readonly settingsRepository;
-    constructor({ config, logger, internalHooks, repositories, }: {
+    private readonly postHog?;
+    constructor({ config, logger, internalHooks, repositories, postHog, }: {
         config: Config;
         logger: ILogger;
         internalHooks: IInternalHooksClass;
-        repositories: Pick<IDatabaseCollections, 'User' | 'Settings'>;
+        repositories: Pick<IDatabaseCollections, 'Settings'>;
+        postHog?: PostHogClient;
     });
-    setupOwner(req: OwnerRequest.Post, res: Response): Promise<import("../Interfaces").PublicUser>;
+    setupOwner(req: OwnerRequest.Post, res: Response): Promise<import("../Interfaces").CurrentUser>;
     dismissBanner(req: OwnerRequest.DismissBanner): Promise<{
         success: boolean;
     }>;

package/dist/controllers/owner.controller.js

@@ -19,13 +19,16 @@ const decorators_1 = require("../decorators");
 const ResponseHelper_1 = require("../ResponseHelper");
 const UserManagementHelper_1 = require("../UserManagement/UserManagementHelper");
 const jwt_1 = require("../auth/jwt");
+const user_service_1 = require("../services/user.service");
+const typedi_1 = __importDefault(require("typedi"));
 let OwnerController = exports.OwnerController = class OwnerController {
-    constructor({ config, logger, internalHooks, repositories, }) {
+    constructor({ config, logger, internalHooks, repositories, postHog, }) {
         this.config = config;
         this.logger = logger;
         this.internalHooks = internalHooks;
-        this.userRepository = repositories.User;
+        this.userService = typedi_1.default.get(user_service_1.UserService);
         this.settingsRepository = repositories.Settings;
+        this.postHog = postHog;
     }
     async setupOwner(req, res) {
         const { email, firstName, lastName, password } = req.body;
@@ -62,14 +65,14 @@ let OwnerController = exports.OwnerController = class OwnerController {
             password: await (0, UserManagementHelper_1.hashPassword)(validPassword),
         });
         await (0, GenericHelpers_1.validateEntity)(owner);
-        owner = await this.userRepository.save(owner);
+        owner = await this.userService.save(owner);
         this.logger.info('Owner was set up successfully', { userId });
         await this.settingsRepository.update({ key: 'userManagement.isInstanceOwnerSetUp' }, { value: JSON.stringify(true) });
         this.config.set('userManagement.isInstanceOwnerSetUp', true);
         this.logger.debug('Setting isInstanceOwnerSetUp updated successfully', { userId });
         await (0, jwt_1.issueCookie)(res, owner);
         void this.internalHooks.onInstanceOwnerSetup({ user_id: userId });
-        return (0, UserManagementHelper_1.sanitizeUser)(owner);
+        return (0, UserManagementHelper_1.withFeatureFlags)(this.postHog, (0, UserManagementHelper_1.sanitizeUser)(owner));
     }
     async dismissBanner(req) {
         const bannerName = 'banner' in req.body ? req.body.banner : '';

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

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

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

@@ -3,24 +3,21 @@ import { Response } from 'express';
 import type { ILogger } from 'n8n-workflow';
 import type { Config } from '../config';
 import { PasswordResetRequest } from '../requests';
-import type { IDatabaseCollections, IExternalHooksClass, IInternalHooksClass } from '../Interfaces';
-import type { JwtService } from '../services/jwt.service';
+import type { IExternalHooksClass, IInternalHooksClass } from '../Interfaces';
 export declare class PasswordResetController {
     private readonly config;
     private readonly logger;
     private readonly externalHooks;
     private readonly internalHooks;
     private readonly mailer;
-    private readonly userRepository;
     private readonly jwtService;
-    constructor({ config, logger, externalHooks, internalHooks, mailer, repositories, jwtService, }: {
+    private readonly userService;
+    constructor({ config, logger, externalHooks, internalHooks, mailer, }: {
         config: Config;
         logger: ILogger;
         externalHooks: IExternalHooksClass;
         internalHooks: IInternalHooksClass;
         mailer: UserManagementMailer;
-        repositories: Pick<IDatabaseCollections, 'User'>;
-        jwtService: JwtService;
     });
     forgotPassword(req: PasswordResetRequest.Email): Promise<void>;
     resolvePasswordToken(req: PasswordResetRequest.Credentials): Promise<void>;

package/dist/controllers/passwordReset.controller.js

@@ -21,20 +21,21 @@ const UserManagementHelper_1 = require("../UserManagement/UserManagementHelper")
 const jwt_1 = require("../auth/jwt");
 const helpers_1 = require("../Ldap/helpers");
 const ssoHelpers_1 = require("../sso/ssoHelpers");
-const user_service_1 = require("../user/user.service");
+const user_service_1 = require("../services/user.service");
 const License_1 = require("../License");
 const typedi_1 = require("typedi");
 const constants_1 = require("../constants");
 const jsonwebtoken_1 = require("jsonwebtoken");
+const jwt_service_1 = require("../services/jwt.service");
 let PasswordResetController = exports.PasswordResetController = class PasswordResetController {
-    constructor({ config, logger, externalHooks, internalHooks, mailer, repositories, jwtService, }) {
+    constructor({ config, logger, externalHooks, internalHooks, mailer, }) {
         this.config = config;
         this.logger = logger;
         this.externalHooks = externalHooks;
         this.internalHooks = internalHooks;
         this.mailer = mailer;
-        this.userRepository = repositories.User;
-        this.jwtService = jwtService;
+        this.jwtService = typedi_1.Container.get(jwt_service_1.JwtService);
+        this.userService = typedi_1.Container.get(user_service_1.UserService);
     }
     async forgotPassword(req) {
         var _a, _b;
@@ -51,7 +52,7 @@ let PasswordResetController = exports.PasswordResetController = class PasswordRe
             this.logger.debug('Request to send password reset email failed because of invalid email in payload', { invalidEmail: email });
             throw new ResponseHelper_1.BadRequestError('Invalid email address');
         }
-        const user = await this.userRepository.findOne({
+        const user = await this.userService.findOne({
             where: {
                 email,
                 password: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()),
@@ -80,7 +81,7 @@ let PasswordResetController = exports.PasswordResetController = class PasswordRe
         const resetPasswordToken = this.jwtService.signData({ sub: id }, {
             expiresIn: '1d',
         });
-        const url = await user_service_1.UserService.generatePasswordResetUrl(baseUrl, resetPasswordToken);
+        const url = this.userService.generatePasswordResetUrl(baseUrl, resetPasswordToken);
         try {
             await this.mailer.passwordReset({
                 email,
@@ -117,10 +118,8 @@ let PasswordResetController = exports.PasswordResetController = class PasswordRe
             throw new ResponseHelper_1.BadRequestError('');
         }
         const decodedToken = this.verifyResetPasswordToken(resetPasswordToken);
-        const user = await this.userRepository.findOne({
-            where: {
-                id: decodedToken.sub,
-            },
+        const user = await this.userService.findOne({
+            where: { id: decodedToken.sub },
             relations: ['globalRole'],
         });
         if (!(user === null || user === void 0 ? void 0 : user.isOwner) && !typedi_1.Container.get(License_1.License).isWithinUsersLimit()) {
@@ -148,7 +147,7 @@ let PasswordResetController = exports.PasswordResetController = class PasswordRe
         }
         const validPassword = (0, UserManagementHelper_1.validatePassword)(password);
         const decodedToken = this.verifyResetPasswordToken(resetPasswordToken);
-        const user = await this.userRepository.findOne({
+        const user = await this.userService.findOne({
             where: { id: decodedToken.sub },
             relations: ['authIdentities'],
         });
@@ -159,9 +158,7 @@ let PasswordResetController = exports.PasswordResetController = class PasswordRe
             throw new ResponseHelper_1.NotFoundError('');
         }
         const passwordHash = await (0, UserManagementHelper_1.hashPassword)(validPassword);
-        await this.userRepository.update(user.id, {
-            password: passwordHash,
-        });
+        await this.userService.update(user.id, { password: passwordHash });
         this.logger.info('User password updated successfully', { userId: user.id });
         await (0, jwt_1.issueCookie)(res, user);
         void this.internalHooks.onUserUpdate({

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/tags.controller.d.ts

@@ -1,17 +1,13 @@
 import { Request, Response, NextFunction } from 'express';
-import { type ITagWithCountDb } from '../Interfaces';
-import type { TagEntity } from '../databases/entities/TagEntity';
-import { TagRepository } from '../databases/repositories';
+import { TagService } from '../services/tag.service';
 import { TagsRequest } from '../requests';
-import { ExternalHooks } from '../ExternalHooks';
 export declare class TagsController {
-    private tagsRepository;
-    private externalHooks;
+    private tagService;
     private config;
-    constructor(tagsRepository: TagRepository, externalHooks: ExternalHooks);
+    constructor(tagService: TagService);
     workflowsEnabledMiddleware(req: Request, res: Response, next: NextFunction): void;
-    getAll(req: TagsRequest.GetAll): Promise<TagEntity[] | ITagWithCountDb[]>;
-    createTag(req: TagsRequest.Create): Promise<TagEntity>;
-    updateTag(req: TagsRequest.Update): Promise<TagEntity>;
+    getAll(req: TagsRequest.GetAll): Promise<import("../databases/entities/TagEntity").TagEntity[]>;
+    createTag(req: TagsRequest.Create): Promise<import("../databases/entities/TagEntity").TagEntity>;
+    updateTag(req: TagsRequest.Update): Promise<import("../databases/entities/TagEntity").TagEntity>;
     deleteTag(req: TagsRequest.Delete): Promise<boolean>;
 }

package/dist/controllers/tags.controller.js

@@ -15,15 +15,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TagsController = void 0;
 const config_1 = __importDefault(require("../config"));
 const decorators_1 = require("../decorators");
-const repositories_1 = require("../databases/repositories");
-const GenericHelpers_1 = require("../GenericHelpers");
+const tag_service_1 = require("../services/tag.service");
 const ResponseHelper_1 = require("../ResponseHelper");
 const typedi_1 = require("typedi");
-const ExternalHooks_1 = require("../ExternalHooks");
 let TagsController = exports.TagsController = class TagsController {
-    constructor(tagsRepository, externalHooks) {
-        this.tagsRepository = tagsRepository;
-        this.externalHooks = externalHooks;
+    constructor(tagService) {
+        this.tagService = tagService;
         this.config = config_1.default;
     }
     workflowsEnabledMiddleware(req, res, next) {
@@ -32,41 +29,19 @@ let TagsController = exports.TagsController = class TagsController {
         next();
     }
     async getAll(req) {
-        const { withUsageCount } = req.query;
-        if (withUsageCount === 'true') {
-            return this.tagsRepository
-                .find({
-                select: ['id', 'name', 'createdAt', 'updatedAt'],
-                relations: ['workflowMappings'],
-            })
-                .then((tags) => tags.map(({ workflowMappings, ...rest }) => ({
-                ...rest,
-                usageCount: workflowMappings.length,
-            })));
-        }
-        return this.tagsRepository.find({ select: ['id', 'name', 'createdAt', 'updatedAt'] });
+        return this.tagService.getAll({ withUsageCount: req.query.withUsageCount === 'true' });
     }
     async createTag(req) {
-        const newTag = this.tagsRepository.create({ name: req.body.name.trim() });
-        await this.externalHooks.run('tag.beforeCreate', [newTag]);
-        await (0, GenericHelpers_1.validateEntity)(newTag);
-        const tag = await this.tagsRepository.save(newTag);
-        await this.externalHooks.run('tag.afterCreate', [tag]);
-        return tag;
+        const tag = this.tagService.toEntity({ name: req.body.name });
+        return this.tagService.save(tag, 'create');
     }
     async updateTag(req) {
-        const newTag = this.tagsRepository.create({ id: req.params.id, name: req.body.name.trim() });
-        await this.externalHooks.run('tag.beforeUpdate', [newTag]);
-        await (0, GenericHelpers_1.validateEntity)(newTag);
-        const tag = await this.tagsRepository.save(newTag);
-        await this.externalHooks.run('tag.afterUpdate', [tag]);
-        return tag;
+        const newTag = this.tagService.toEntity({ id: req.params.id, name: req.body.name.trim() });
+        return this.tagService.save(newTag, 'update');
     }
     async deleteTag(req) {
         const { id } = req.params;
-        await this.externalHooks.run('tag.beforeDelete', [id]);
-        await this.tagsRepository.delete({ id });
-        await this.externalHooks.run('tag.afterDelete', [id]);
+        await this.tagService.delete(id);
         return true;
     }
 };
@@ -105,7 +80,6 @@ exports.TagsController = TagsController = __decorate([
     (0, decorators_1.Authorized)(),
     (0, decorators_1.RestController)('/tags'),
     (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [repositories_1.TagRepository,
-        ExternalHooks_1.ExternalHooks])
+    __metadata("design:paramtypes", [tag_service_1.TagService])
 ], TagsController);
 //# sourceMappingURL=tags.controller.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"tags.controller.js","sourceRoot":"","sources":["../../src/controllers/tags.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,sDAA8B;AAC9B,6CAAgG;AAGhG,mDAAiD;AACjD,qDAAkD;AAClD,qDAAmD;AAEnD,mCAAiC;AACjC,mDAAgD;AAKzC,IAAM,cAAc,4BAApB,MAAM,cAAc;IAG1B,YACS,cAA6B,EAC7B,aAA4B;QAD5B,mBAAc,GAAd,cAAc,CAAe;QAC7B,kBAAa,GAAb,aAAa,CAAe;QAJ7B,WAAM,GAAG,gBAAM,CAAC;IAKrB,CAAC;IAIJ,0BAA0B,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACzE,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC;YAC7C,MAAM,IAAI,gCAAe,CAAC,4BAA4B,CAAC,CAAC;QACzD,IAAI,EAAE,CAAC;IACR,CAAC;IAIK,AAAN,KAAK,CAAC,MAAM,CAAC,GAAuB;QACnC,MAAM,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QACrC,IAAI,cAAc,KAAK,MAAM,EAAE;YAC9B,OAAO,IAAI,CAAC,cAAc;iBACxB,IAAI,CAAC;gBACL,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC;gBAChD,SAAS,EAAE,CAAC,kBAAkB,CAAC;aAC/B,CAAC;iBACD,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACd,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,gBAAgB,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC5C,GAAG,IAAI;gBACP,UAAU,EAAE,gBAAgB,CAAC,MAAM;aACnC,CAAC,CAAC,CACH,CAAC;SACH;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IACvF,CAAC;IAIK,AAAN,KAAK,CAAC,SAAS,CAAC,GAAuB;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAE1E,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,IAAA,+BAAc,EAAC,MAAM,CAAC,CAAC;QAE7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,OAAO,GAAG,CAAC;IACZ,CAAC;IAIK,AAAN,KAAK,CAAC,SAAS,CAAC,GAAuB;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAE7F,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,IAAA,+BAAc,EAAC,MAAM,CAAC,CAAC;QAE7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,OAAO,GAAG,CAAC;IACZ,CAAC;IAIK,AAAN,KAAK,CAAC,SAAS,CAAC,GAAuB;QACtC,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC1B,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAEvD,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACtD,OAAO,IAAI,CAAC;IACb,CAAC;CACD,CAAA;AA/DA;IADC,IAAA,uBAAU,GAAE;;;;gEAKZ;AAIK;IADL,IAAA,gBAAG,EAAC,GAAG,CAAC;;;;4CAkBR;AAIK;IADL,IAAA,iBAAI,EAAC,GAAG,CAAC;;;;+CAUT;AAIK;IADL,IAAA,kBAAK,EAAC,YAAY,CAAC;;;;+CAUnB;AAIK;IAFL,IAAA,uBAAU,EAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/B,IAAA,mBAAM,EAAC,YAAY,CAAC;;;;+CAQpB;yBAxEW,cAAc;IAH1B,IAAA,uBAAU,GAAE;IACZ,IAAA,2BAAc,EAAC,OAAO,CAAC;IACvB,IAAA,gBAAO,GAAE;qCAKgB,4BAAa;QACd,6BAAa;GALzB,cAAc,CAyE1B"}
+{"version":3,"file":"tags.controller.js","sourceRoot":"","sources":["../../src/controllers/tags.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,sDAA8B;AAC9B,6CAAgG;AAChG,wDAAoD;AACpD,qDAAmD;AAEnD,mCAAiC;AAK1B,IAAM,cAAc,4BAApB,MAAM,cAAc;IAG1B,YAAoB,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QAFlC,WAAM,GAAG,gBAAM,CAAC;IAEqB,CAAC;IAI9C,0BAA0B,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACzE,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC;YAC7C,MAAM,IAAI,gCAAe,CAAC,4BAA4B,CAAC,CAAC;QACzD,IAAI,EAAE,CAAC;IACR,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CAAC,GAAuB;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,GAAG,CAAC,KAAK,CAAC,cAAc,KAAK,MAAM,EAAE,CAAC,CAAC;IACxF,CAAC;IAGK,AAAN,KAAK,CAAC,SAAS,CAAC,GAAuB;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAE9D,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAGK,AAAN,KAAK,CAAC,SAAS,CAAC,GAAuB;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAE3F,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAIK,AAAN,KAAK,CAAC,SAAS,CAAC,GAAuB;QACtC,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAE1B,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEjC,OAAO,IAAI,CAAC;IACb,CAAC;CACD,CAAA;AAlCA;IADC,IAAA,uBAAU,GAAE;;;;gEAKZ;AAGK;IADL,IAAA,gBAAG,EAAC,GAAG,CAAC;;;;4CAGR;AAGK;IADL,IAAA,iBAAI,EAAC,GAAG,CAAC;;;;+CAKT;AAGK;IADL,IAAA,kBAAK,EAAC,YAAY,CAAC;;;;+CAKnB;AAIK;IAFL,IAAA,uBAAU,EAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/B,IAAA,mBAAM,EAAC,YAAY,CAAC;;;;+CAOpB;yBAxCW,cAAc;IAH1B,IAAA,uBAAU,GAAE;IACZ,IAAA,2BAAc,EAAC,OAAO,CAAC;IACvB,IAAA,gBAAO,GAAE;qCAIuB,wBAAU;GAH9B,cAAc,CAyC1B"}

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

@@ -6,14 +6,11 @@ import type { UserManagementMailer } from '../UserManagement/email';
 import type { PublicUser, IDatabaseCollections, IExternalHooksClass, IInternalHooksClass } from '../Interfaces';
 import type { ActiveWorkflowRunner } from '../ActiveWorkflowRunner';
 import type { PostHogClient } from '../posthog';
-import type { JwtService } from '../services/jwt.service';
-import type { RoleService } from '../services/role.service';
 export declare class UsersController {
     private config;
     private logger;
     private externalHooks;
     private internalHooks;
-    private userRepository;
     private sharedCredentialsRepository;
     private sharedWorkflowRepository;
     private activeWorkflowRunner;
@@ -21,17 +18,16 @@ export declare class UsersController {
     private jwtService;
     private postHog?;
     private roleService;
-    constructor({ config, logger, externalHooks, internalHooks, repositories, activeWorkflowRunner, mailer, jwtService, postHog, roleService, }: {
+    private userService;
+    constructor({ config, logger, externalHooks, internalHooks, repositories, activeWorkflowRunner, mailer, postHog, }: {
         config: Config;
         logger: ILogger;
         externalHooks: IExternalHooksClass;
         internalHooks: IInternalHooksClass;
-        repositories: Pick<IDatabaseCollections, 'User' | 'SharedCredentials' | 'SharedWorkflow'>;
+        repositories: Pick<IDatabaseCollections, 'SharedCredentials' | 'SharedWorkflow'>;
         activeWorkflowRunner: ActiveWorkflowRunner;
         mailer: UserManagementMailer;
-        jwtService: JwtService;
         postHog?: PostHogClient;
-        roleService: RoleService;
     });
     sendEmailInvites(req: UserRequest.Invite): Promise<{
         user: {

package/dist/controllers/users.controller.js

@@ -26,25 +26,27 @@ const ResponseHelper_1 = require("../ResponseHelper");
 const requests_1 = require("../requests");
 const AuthIdentity_1 = require("../databases/entities/AuthIdentity");
 const samlHelpers_1 = require("../sso/saml/samlHelpers");
-const user_service_1 = require("../user/user.service");
 const class_transformer_1 = require("class-transformer");
 const License_1 = require("../License");
 const typedi_1 = require("typedi");
 const constants_1 = require("../constants");
+const jwt_service_1 = require("../services/jwt.service");
+const role_service_1 = require("../services/role.service");
+const user_service_1 = require("../services/user.service");
 let UsersController = exports.UsersController = class UsersController {
-    constructor({ config, logger, externalHooks, internalHooks, repositories, activeWorkflowRunner, mailer, jwtService, postHog, roleService, }) {
+    constructor({ config, logger, externalHooks, internalHooks, repositories, activeWorkflowRunner, mailer, postHog, }) {
         this.config = config;
         this.logger = logger;
         this.externalHooks = externalHooks;
         this.internalHooks = internalHooks;
-        this.userRepository = repositories.User;
         this.sharedCredentialsRepository = repositories.SharedCredentials;
         this.sharedWorkflowRepository = repositories.SharedWorkflow;
         this.activeWorkflowRunner = activeWorkflowRunner;
         this.mailer = mailer;
-        this.jwtService = jwtService;
+        this.jwtService = typedi_1.Container.get(jwt_service_1.JwtService);
         this.postHog = postHog;
-        this.roleService = roleService;
+        this.roleService = typedi_1.Container.get(role_service_1.RoleService);
+        this.userService = typedi_1.Container.get(user_service_1.UserService);
     }
     async sendEmailInvites(req) {
         const isWithinUsersLimit = typedi_1.Container.get(License_1.License).isWithinUsersLimit();
@@ -84,7 +86,7 @@ let UsersController = exports.UsersController = class UsersController {
             this.logger.error('Request to send email invite(s) to user(s) failed because no global member role was found in database');
             throw new ResponseHelper_1.InternalServerError('Members role not found in database - inconsistent state');
         }
-        const existingUsers = await this.userRepository.find({
+        const existingUsers = await this.userService.findMany({
             where: { email: (0, typeorm_1.In)(Object.keys(createUsers)) },
         });
         existingUsers.forEach((user) => {
@@ -98,7 +100,7 @@ let UsersController = exports.UsersController = class UsersController {
         const total = usersToSetUp.length;
         this.logger.debug(total > 1 ? `Creating ${total} user shells...` : 'Creating 1 user shell...');
         try {
-            await this.userRepository.manager.transaction(async (transactionManager) => Promise.all(usersToSetUp.map(async (email) => {
+            await this.userService.getManager().transaction(async (transactionManager) => Promise.all(usersToSetUp.map(async (email) => {
                 const newUser = Object.assign(new User_1.User(), {
                     email,
                     globalRole: role,
@@ -185,7 +187,7 @@ let UsersController = exports.UsersController = class UsersController {
             throw new ResponseHelper_1.BadRequestError('Invalid payload');
         }
         const validPassword = (0, UserManagementHelper_1.validatePassword)(password);
-        const users = await this.userRepository.find({
+        const users = await this.userService.findMany({
             where: { id: (0, typeorm_1.In)([inviterId, inviteeId]) },
             relations: ['globalRole'],
         });
@@ -204,7 +206,7 @@ let UsersController = exports.UsersController = class UsersController {
         invitee.firstName = firstName;
         invitee.lastName = lastName;
         invitee.password = await (0, UserManagementHelper_1.hashPassword)(validPassword);
-        const updatedUser = await this.userRepository.save(invitee);
+        const updatedUser = await this.userService.save(invitee);
         await (0, jwt_1.issueCookie)(res, updatedUser);
         void this.internalHooks.onUserSignup(updatedUser, {
             user_type: 'email',
@@ -215,11 +217,11 @@ let UsersController = exports.UsersController = class UsersController {
         return (0, UserManagementHelper_1.withFeatureFlags)(this.postHog, (0, UserManagementHelper_1.sanitizeUser)(updatedUser));
     }
     async listUsers(req) {
-        const users = await this.userRepository.find({ relations: ['globalRole', 'authIdentities'] });
+        const users = await this.userService.findMany({ relations: ['globalRole', 'authIdentities'] });
         return users.map((user) => (0, UserManagementHelper_1.addInviteLinkToUser)((0, UserManagementHelper_1.sanitizeUser)(user, ['personalizationAnswers']), req.user.id));
     }
     async getUserPasswordResetLink(req) {
-        const user = await this.userRepository.findOneOrFail({
+        const user = await this.userService.findOneOrFail({
             where: { id: req.params.id },
         });
         if (!user) {
@@ -229,7 +231,7 @@ let UsersController = exports.UsersController = class UsersController {
             expiresIn: '1d',
         });
         const baseUrl = (0, UserManagementHelper_1.getInstanceBaseUrl)();
-        const link = await user_service_1.UserService.generatePasswordResetUrl(baseUrl, resetPasswordToken);
+        const link = this.userService.generatePasswordResetUrl(baseUrl, resetPasswordToken);
         return {
             link,
         };
@@ -237,8 +239,8 @@ let UsersController = exports.UsersController = class UsersController {
     async updateUserSettings(req) {
         const payload = (0, class_transformer_1.plainToInstance)(requests_1.UserSettingsUpdatePayload, req.body);
         const id = req.params.id;
-        await user_service_1.UserService.updateUserSettings(id, payload);
-        const user = await this.userRepository.findOneOrFail({
+        await this.userService.updateSettings(id, payload);
+        const user = await this.userService.findOneOrFail({
             select: ['settings'],
             where: { id },
         });
@@ -254,7 +256,7 @@ let UsersController = exports.UsersController = class UsersController {
         if (transferId === idToDelete) {
             throw new ResponseHelper_1.BadRequestError('Request to delete a user failed because the user to delete and the transferee are the same user');
         }
-        const users = await this.userRepository.find({
+        const users = await this.userService.findMany({
             where: { id: (0, typeorm_1.In)([transferId, idToDelete]) },
         });
         if (!users.length || (transferId && users.length !== 2)) {
@@ -276,7 +278,7 @@ let UsersController = exports.UsersController = class UsersController {
         ]);
         if (transferId) {
             const transferee = users.find((user) => user.id === transferId);
-            await this.userRepository.manager.transaction(async (transactionManager) => {
+            await this.userService.getManager().transaction(async (transactionManager) => {
                 const sharedWorkflowIds = await transactionManager
                     .getRepository(SharedWorkflow_1.SharedWorkflow)
                     .find({
@@ -322,7 +324,7 @@ let UsersController = exports.UsersController = class UsersController {
                 where: { userId: userToDelete.id, roleId: credentialOwnerRole === null || credentialOwnerRole === void 0 ? void 0 : credentialOwnerRole.id },
             }),
         ]);
-        await this.userRepository.manager.transaction(async (transactionManager) => {
+        await this.userService.getManager().transaction(async (transactionManager) => {
             const ownedWorkflows = await Promise.all(ownedSharedWorkflows.map(async ({ workflow }) => {
                 if (workflow.active) {
                     await this.activeWorkflowRunner.remove(workflow.id);
@@ -353,7 +355,7 @@ let UsersController = exports.UsersController = class UsersController {
             this.logger.error('Request to reinvite a user failed because email sending was not set up');
             throw new ResponseHelper_1.InternalServerError('Email sending must be set up in order to invite other users');
         }
-        const reinvitee = await this.userRepository.findOneBy({ id: idToReinvite });
+        const reinvitee = await this.userService.findOneBy({ id: idToReinvite });
         if (!reinvitee) {
             this.logger.debug('Request to reinvite a user failed because the ID of the reinvitee was not found in database');
             throw new ResponseHelper_1.NotFoundError('Could not find user');