@things-factory/auth-base 8.0.5 → 9.0.0-beta.12

package/dist-server/service/user/user-mutation.js

@@ -7,56 +7,65 @@ const graphql_scalars_1 = require("graphql-scalars");
 const typeorm_1 = require("typeorm");
 const env_1 = require("@things-factory/env");
 const shell_1 = require("@things-factory/shell");
-const delete_user_1 = require("../../controllers/delete-user");
-const get_domain_users_1 = require("../../utils/get-domain-users");
-const role_1 = require("../role/role");
-const user_1 = require("./user");
-const user_types_1 = require("./user-types");
+const delete_user_js_1 = require("../../controllers/delete-user.js");
+const get_domain_users_js_1 = require("../../utils/get-domain-users.js");
+const role_js_1 = require("../role/role.js");
+const user_js_1 = require("./user.js");
+const user_types_js_1 = require("./user-types.js");
+const error_code_js_1 = require("../../constants/error-code.js");
 let UserMutation = class UserMutation {
     async createUser(user, context) {
         const { domain, tx } = context.state;
         const { defaultPassword } = env_1.config.get('password');
-        const { email } = user;
+        const { username, email } = user;
+        const userRepository = (0, shell_1.getRepository)(user_js_1.User, tx);
+        user.username = username.trim();
         user.email = email.trim();
-        const oldUser = await (0, shell_1.getRepository)(user_1.User, tx).findOne({ where: { email: (0, typeorm_1.ILike)(user.email) } });
-        if (oldUser) {
-            throw new Error(context.t('error.x already exists in y', { x: context.t('field.user'), y: 'operato' }));
+        if (await userRepository.findOne({ where: { username: user.username } })) {
+            throw new Error(context.t(error_code_js_1.USERNAME_ALREADY_EXISTS));
+        }
+        if (await userRepository.findOne({ where: { email: (0, typeorm_1.ILike)(user.email) } })) {
+            throw new Error(context.t(error_code_js_1.EMAIL_ALREADY_EXISTS));
         }
         if (!user.password && !defaultPassword) {
-            throw new Error(context.t('error.initial password or default password should be supported'));
+            throw new Error('initial password or default password should be supported.');
+        }
+        // TODO username은 다음 패턴을 따라야 한다. pattern="^[A-Za-z0-9]*$"
+        if (!/^[A-Za-z0-9]*$/.test(user.username)) {
+            throw new Error(context.t('error.invalid x', { x: context.t('field.username') }));
         }
         // consider if validation password rule is required
         /* check if password is following the rule */
         // User.validatePasswordByRule(user.password, context.lng)
-        const salt = user_1.User.generateSalt();
-        return await (0, shell_1.getRepository)(user_1.User, tx).save(Object.assign(Object.assign({ creator: context.state.user, updater: context.state.user }, user), { domains: [domain], roles: user.roles && user.roles.length
-                ? await (0, shell_1.getRepository)(role_1.Role, tx).findBy({
+        const salt = user_js_1.User.generateSalt();
+        return await userRepository.save(Object.assign(Object.assign({ creator: context.state.user, updater: context.state.user }, user), { domains: [domain], roles: user.roles && user.roles.length
+                ? await (0, shell_1.getRepository)(role_js_1.Role, tx).findBy({
                     id: (0, typeorm_1.In)(user.roles.map(role => role.id)),
                     domain: { id: domain.id }
                 })
-                : [], salt, passwordUpdatedAt: new Date(), password: user.password ? user_1.User.encode(user.password, salt) : user_1.User.encode(defaultPassword, salt) }));
+                : [], salt, passwordUpdatedAt: new Date(), password: user.password ? user_js_1.User.encode(user.password, salt) : user_js_1.User.encode(defaultPassword, salt) }));
     }
     async updateUser(email, patch, context) {
         const { domain, user: updater, tx } = context.state;
-        const qb = (0, get_domain_users_1.buildDomainUsersQueryBuilder)(domain.id, 'USER');
+        const qb = (0, get_domain_users_js_1.buildDomainUsersQueryBuilder)(domain.id, 'USER');
         const user = await qb
             .andWhere('LOWER(USER.email) = :email', { email: (email === null || email === void 0 ? void 0 : email.toLowerCase().trim()) || '' })
             .leftJoinAndSelect('USER.roles', 'ROLES')
             .leftJoinAndSelect('ROLES.domain', 'R_DOMAIN')
             .getOne();
         if (patch.roles) {
-            patch.roles = await (0, shell_1.getRepository)(role_1.Role, tx).find({
+            patch.roles = await (0, shell_1.getRepository)(role_js_1.Role, tx).find({
                 where: { id: (0, typeorm_1.In)(patch.roles.map((r) => r.id)) }
             });
         }
         if (patch.status && patch.status === 'activated') {
-            user.status = user_1.UserStatus.ACTIVATED;
+            user.status = user_js_1.UserStatus.ACTIVATED;
         }
-        return await (0, shell_1.getRepository)(user_1.User, tx).save(Object.assign(Object.assign(Object.assign({}, user), patch), { updater }));
+        return await (0, shell_1.getRepository)(user_js_1.User, tx).save(Object.assign(Object.assign(Object.assign({}, user), patch), { updater }));
     }
     async updateMultipleUser(patches, context) {
         const { domain, user, tx } = context.state;
-        const userRepo = (0, shell_1.getRepository)(user_1.User, tx);
+        const userRepo = (0, shell_1.getRepository)(user_js_1.User, tx);
         let results = [];
         const _createRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === '+');
         const _updateRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === 'M');
@@ -66,8 +75,8 @@ let UserMutation = class UserMutation {
                 // consider if validation password rule is required
                 /* check if password is following the rule */
                 // User.validatePasswordByRule(newRecord.password, context.lng)
-                const salt = user_1.User.generateSalt();
-                const result = await userRepo.save(Object.assign(Object.assign({}, newRecord), { domains: [domain], salt, password: user_1.User.encode(newRecord.password, salt), passwordUpdatedAt: new Date(), creator: user, updater: user }));
+                const salt = user_js_1.User.generateSalt();
+                const result = await userRepo.save(Object.assign(Object.assign({}, newRecord), { domains: [domain], salt, password: user_js_1.User.encode(newRecord.password, salt), passwordUpdatedAt: new Date(), creator: user, updater: user }));
                 // repository api는 작동하지 않음.
                 // await tx
                 //   .createQueryBuilder()
@@ -89,7 +98,7 @@ let UserMutation = class UserMutation {
                 // User.validatePasswordByRule(updateRecord.password, context.lng)
                 const user = await userRepo.findOne({ where: { id: updateRecord.id }, relations: ['domains'] });
                 var domains = user.domains.find(d => d.id === domain.id) ? user.domains : [...user.domains, domain];
-                const result = await userRepo.save(Object.assign(Object.assign(Object.assign({}, user), updateRecord), { domains, password: updateRecord.password ? user_1.User.encode(updateRecord.password, user.salt) : user.password, updater: user }));
+                const result = await userRepo.save(Object.assign(Object.assign(Object.assign({}, user), updateRecord), { domains, password: updateRecord.password ? user_js_1.User.encode(updateRecord.password, user.salt) : user.password, updater: user }));
                 if (!updateRecord.status) {
                     continue;
                 }
@@ -115,22 +124,29 @@ let UserMutation = class UserMutation {
         }
         return results;
     }
-    async deleteUser(email, context) {
+    async deleteUser(username, context) {
         const { tx } = context.state;
-        await (0, delete_user_1.deleteUser)({ email }, tx);
+        await (0, delete_user_js_1.deleteUser)({ username }, tx);
         return true;
     }
-    async deleteUsers(emails, context) {
+    async deleteUsers(usernames, context) {
         const { tx } = context.state;
-        await (0, delete_user_1.deleteUsers)({ emails }, tx);
+        await (0, delete_user_js_1.deleteUsers)({ usernames }, tx);
         return true;
     }
-    async inviteUser(email, context) {
+    async inviteUser(username, context) {
         const { domain, tx } = context.state;
-        const invitee = await (0, shell_1.getRepository)(user_1.User, tx).findOne({
-            where: { email: (0, typeorm_1.ILike)(email) },
+        const userRepository = (0, shell_1.getRepository)(user_js_1.User, tx);
+        var invitee = await userRepository.findOne({
+            where: { username },
             relations: ['domains']
         });
+        if (!invitee && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+            invitee = await userRepository.findOne({
+                where: { email: (0, typeorm_1.ILike)(username) },
+                relations: ['domains']
+            });
+        }
         if (!invitee) {
             throw new Error(context.t('error.failed to find x', { x: context.t('field.user') }));
         }
@@ -139,15 +155,22 @@ let UserMutation = class UserMutation {
             throw new Error(context.t('error.x already exists in y', { x: context.t('field.user'), y: domain.name }));
         }
         invitee.domains = [...existingDomains, domain];
-        await (0, shell_1.getRepository)(user_1.User, tx).save(invitee);
+        await userRepository.save(invitee);
         return true;
     }
-    async deleteDomainUser(email, context) {
+    async deleteDomainUser(username, context) {
         const { tx, domain } = context.state;
-        let user = await (0, shell_1.getRepository)(user_1.User, tx).findOne({
-            where: { email: (0, typeorm_1.ILike)(email) },
-            relations: ['domains', 'roles', 'roles.domain']
+        const userRepository = (0, shell_1.getRepository)(user_js_1.User, tx);
+        var user = await userRepository.findOne({
+            where: { username },
+            relations: ['domains', 'roles']
         });
+        if (!user && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+            user = await userRepository.findOne({
+                where: { email: (0, typeorm_1.ILike)(username) },
+                relations: ['domains', 'roles']
+            });
+        }
         if (!user) {
             throw new Error(context.t('error.failed to find x', { x: context.t('field.user') }));
         }
@@ -158,20 +181,27 @@ let UserMutation = class UserMutation {
         // Remove domain relation with user
         user.domains.splice(targetDomainIdx, 1);
         // Remove domain's roles that user has
-        user.roles = user.roles.filter((role) => role.domain.id !== domain.id);
-        await (0, shell_1.getRepository)(user_1.User, tx).save(user);
+        user.roles = user.roles.filter((role) => role.domainId !== domain.id);
+        await userRepository.save(user);
         return true;
     }
-    async transferOwner(email, context) {
+    async transferOwner(username, context) {
         const { domain, tx } = context.state;
-        const user = await (0, shell_1.getRepository)(user_1.User, tx).findOne({
-            where: { email: (0, typeorm_1.ILike)(email) },
-            relations: ['domains', 'roles']
+        const userRepository = (0, shell_1.getRepository)(user_js_1.User, tx);
+        var user = await userRepository.findOne({
+            where: { username },
+            relations: ['domains']
         });
+        if (!user && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+            user = await userRepository.findOne({
+                where: { email: (0, typeorm_1.ILike)(username) },
+                relations: ['domains']
+            });
+        }
         if (!user) {
-            throw new Error('Failed to find user');
+            throw new Error(context.t('error.failed to find x', { x: context.t('field.user') }));
         }
-        if (user.status !== user_1.UserStatus.ACTIVATED) {
+        if (user.status !== user_js_1.UserStatus.ACTIVATED) {
             throw new Error('Only activated users are eligible to receive admin privileges.');
         }
         if (user.domains.map((d) => d.id).indexOf(domain.id) < 0) {
@@ -184,33 +214,47 @@ let UserMutation = class UserMutation {
         await (0, shell_1.getRepository)(shell_1.Domain, tx).save(domain);
         return true;
     }
-    async activateUser(userId, context) {
+    async activateUser(username, context) {
         var _a;
         const { tx, domain } = context.state;
-        const targetUser = await (0, shell_1.getRepository)(user_1.User, tx).findOne({
-            where: { id: userId },
+        const userRepository = (0, shell_1.getRepository)(user_js_1.User, tx);
+        var targetUser = await userRepository.findOne({
+            where: { username },
             relations: ['domains']
         });
+        if (!targetUser && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+            targetUser = await userRepository.findOne({
+                where: { email: (0, typeorm_1.ILike)(username) },
+                relations: ['domains']
+            });
+        }
         if (!targetUser) {
-            throw new Error('No user found');
+            throw new Error(context.t('error.failed to find x', { x: context.t('field.user') }));
         }
         if (!((_a = targetUser === null || targetUser === void 0 ? void 0 : targetUser.domains) === null || _a === void 0 ? void 0 : _a.find((userDomain) => userDomain.id === domain.id))) {
             throw new Error('User is not belong to domain');
         }
         targetUser.failCount = 0;
-        targetUser.status = user_1.UserStatus.ACTIVATED;
-        await (0, shell_1.getRepository)(user_1.User, tx).save(targetUser);
+        targetUser.status = user_js_1.UserStatus.ACTIVATED;
+        await userRepository.save(targetUser);
         return true;
     }
-    async inactivateUser(userId, context) {
+    async inactivateUser(username, context) {
         var _a;
         const { tx, domain } = context.state;
-        const targetUser = await (0, shell_1.getRepository)(user_1.User, tx).findOne({
-            where: { id: userId },
+        const userRepository = (0, shell_1.getRepository)(user_js_1.User, tx);
+        var targetUser = await userRepository.findOne({
+            where: { username },
             relations: ['domains']
         });
+        if (!targetUser && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+            targetUser = await userRepository.findOne({
+                where: { email: (0, typeorm_1.ILike)(username) },
+                relations: ['domains']
+            });
+        }
         if (!targetUser) {
-            throw new Error('No user found');
+            throw new Error(context.t('error.failed to find x', { x: context.t('field.user') }));
         }
         if (!((_a = targetUser === null || targetUser === void 0 ? void 0 : targetUser.domains) === null || _a === void 0 ? void 0 : _a.find((userDomain) => userDomain.id === domain.id))) {
             throw new Error('User is not belong to domain');
@@ -218,40 +262,54 @@ let UserMutation = class UserMutation {
         if (targetUser.userType == 'admin' || targetUser.id === domain.owner) {
             throw new Error('Admin deactivation not allowed');
         }
-        targetUser.status = user_1.UserStatus.INACTIVE;
-        await (0, shell_1.getRepository)(user_1.User, tx).save(targetUser);
+        targetUser.status = user_js_1.UserStatus.INACTIVE;
+        await userRepository.save(targetUser);
         return true;
     }
-    async resetPasswordToDefault(userId, context) {
+    async resetPasswordToDefault(username, context) {
         var _a;
         const { tx, domain } = context.state;
         const { defaultPassword } = env_1.config.get('password');
         if (!defaultPassword) {
             throw new Error('No default password found');
         }
-        const targetUser = await (0, shell_1.getRepository)(user_1.User, tx).findOne({
-            where: { id: userId },
+        const userRepository = (0, shell_1.getRepository)(user_js_1.User, tx);
+        var targetUser = await userRepository.findOne({
+            where: { username },
             relations: ['domains']
         });
+        if (!targetUser && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+            targetUser = await userRepository.findOne({
+                where: { email: (0, typeorm_1.ILike)(username) },
+                relations: ['domains']
+            });
+        }
         if (!targetUser) {
-            throw new Error('No user found');
+            throw new Error(context.t('error.failed to find x', { x: context.t('field.user') }));
         }
         if (!((_a = targetUser === null || targetUser === void 0 ? void 0 : targetUser.domains) === null || _a === void 0 ? void 0 : _a.find((userDomain) => userDomain.id === domain.id))) {
             throw new Error('User is not belong to domain');
         }
-        targetUser.salt = user_1.User.generateSalt();
-        targetUser.password = user_1.User.encode(defaultPassword, targetUser.salt);
-        await (0, shell_1.getRepository)(user_1.User, tx).save(targetUser);
+        targetUser.salt = user_js_1.User.generateSalt();
+        targetUser.password = user_js_1.User.encode(defaultPassword, targetUser.salt);
+        await userRepository.save(targetUser);
         return true;
     }
-    async updateUserRoles(userId, availableRoles, selectedRoles, context) {
+    async updateUserRoles(username, availableRoles, selectedRoles, context) {
         const { domain, tx } = context.state;
-        let user = await (0, shell_1.getRepository)(user_1.User, tx).findOne({
-            where: { id: userId },
+        const userRepository = (0, shell_1.getRepository)(user_js_1.User, tx);
+        var user = await userRepository.findOne({
+            where: { username },
             relations: ['domains', 'roles']
         });
+        if (!user && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+            user = await userRepository.findOne({
+                where: { email: (0, typeorm_1.ILike)(username) },
+                relations: ['domains', 'roles']
+            });
+        }
         if (!user) {
-            throw new Error('Failed to find user');
+            throw new Error(context.t('error.failed to find x', { x: context.t('field.user') }));
         }
         if (user.domains.map((d) => d.id).indexOf(domain.id) < 0) {
             throw new Error(`User is not belongs to current domain`);
@@ -259,36 +317,36 @@ let UserMutation = class UserMutation {
         const availableRoleIds = availableRoles.map((r) => r.id);
         user.roles = user.roles.filter((r) => availableRoleIds.indexOf(r.id) < 0);
         user.roles = user.roles.concat(selectedRoles);
-        return await (0, shell_1.getRepository)(user_1.User, tx).save(user);
+        return await userRepository.save(user);
     }
 };
 exports.UserMutation = UserMutation;
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)'),
     (0, type_graphql_1.Directive)('@transaction'),
-    (0, type_graphql_1.Mutation)(returns => user_1.User, { description: 'To create new user' }),
+    (0, type_graphql_1.Mutation)(returns => user_js_1.User, { description: 'To create new user' }),
     tslib_1.__param(0, (0, type_graphql_1.Arg)('user')),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [user_types_1.NewUser, Object]),
+    tslib_1.__metadata("design:paramtypes", [user_types_js_1.NewUser, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], UserMutation.prototype, "createUser", null);
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)'),
     (0, type_graphql_1.Directive)('@transaction'),
-    (0, type_graphql_1.Mutation)(returns => user_1.User, { description: 'To modify user information' }),
+    (0, type_graphql_1.Mutation)(returns => user_js_1.User, { description: 'To modify user information' }),
     tslib_1.__param(0, (0, type_graphql_1.Arg)('email', type => graphql_scalars_1.GraphQLEmailAddress)),
     tslib_1.__param(1, (0, type_graphql_1.Arg)('patch')),
     tslib_1.__param(2, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, user_types_1.UserPatch, Object]),
+    tslib_1.__metadata("design:paramtypes", [String, user_types_js_1.UserPatch, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], UserMutation.prototype, "updateUser", null);
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)'),
     (0, type_graphql_1.Directive)('@transaction'),
-    (0, type_graphql_1.Mutation)(returns => [user_1.User], { description: 'To modify multiple users information' }),
-    tslib_1.__param(0, (0, type_graphql_1.Arg)('patches', type => [user_types_1.UserPatch])),
+    (0, type_graphql_1.Mutation)(returns => [user_js_1.User], { description: 'To modify multiple users information' }),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('patches', type => [user_types_js_1.UserPatch])),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Array, Object]),
@@ -298,7 +356,7 @@ tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)'),
     (0, type_graphql_1.Directive)('@transaction'),
     (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To delete a user' }),
-    tslib_1.__param(0, (0, type_graphql_1.Arg)('email', type => graphql_scalars_1.GraphQLEmailAddress)),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('username')),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String, Object]),
@@ -308,7 +366,7 @@ tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)'),
     (0, type_graphql_1.Directive)('@transaction'),
     (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To delete some users' }),
-    tslib_1.__param(0, (0, type_graphql_1.Arg)('emails', type => [String])),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('usernames', type => [String])),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Array, Object]),
@@ -317,7 +375,7 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@transaction'),
     (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To invite new user' }),
-    tslib_1.__param(0, (0, type_graphql_1.Arg)('email', type => graphql_scalars_1.GraphQLEmailAddress)),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('username')),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String, Object]),
@@ -327,7 +385,7 @@ tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@transaction'),
     (0, type_graphql_1.Directive)('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)'),
     (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To delete domain user' }),
-    tslib_1.__param(0, (0, type_graphql_1.Arg)('email', type => graphql_scalars_1.GraphQLEmailAddress)),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('username')),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String, Object]),
@@ -337,7 +395,7 @@ tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(domainOwnerGranted: true, superUserGranted: true)'),
     (0, type_graphql_1.Directive)('@transaction'),
     (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To transfer owner of domain' }),
-    tslib_1.__param(0, (0, type_graphql_1.Arg)('email', type => graphql_scalars_1.GraphQLEmailAddress)),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('username')),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String, Object]),
@@ -347,7 +405,7 @@ tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)'),
     (0, type_graphql_1.Directive)('@transaction'),
     (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To activate user' }),
-    tslib_1.__param(0, (0, type_graphql_1.Arg)('userId')),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('username')),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String, Object]),
@@ -357,7 +415,7 @@ tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)'),
     (0, type_graphql_1.Directive)('@transaction'),
     (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To inactivate user' }),
-    tslib_1.__param(0, (0, type_graphql_1.Arg)('userId')),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('username')),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String, Object]),
@@ -367,7 +425,7 @@ tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)'),
     (0, type_graphql_1.Directive)('@transaction'),
     (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To reset password to default' }),
-    tslib_1.__param(0, (0, type_graphql_1.Arg)('userId')),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('username')),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String, Object]),
@@ -376,8 +434,8 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)'),
     (0, type_graphql_1.Directive)('@transaction'),
-    (0, type_graphql_1.Mutation)(returns => user_1.User, { description: 'To update roles for a user' }),
-    tslib_1.__param(0, (0, type_graphql_1.Arg)('userId')),
+    (0, type_graphql_1.Mutation)(returns => user_js_1.User, { description: 'To update roles for a user' }),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('username')),
     tslib_1.__param(1, (0, type_graphql_1.Arg)('availableRoles', type => [shell_1.ObjectRef])),
     tslib_1.__param(2, (0, type_graphql_1.Arg)('selectedRoles', type => [shell_1.ObjectRef])),
     tslib_1.__param(3, (0, type_graphql_1.Ctx)()),
@@ -386,6 +444,6 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], UserMutation.prototype, "updateUserRoles", null);
 exports.UserMutation = UserMutation = tslib_1.__decorate([
-    (0, type_graphql_1.Resolver)(user_1.User)
+    (0, type_graphql_1.Resolver)(user_js_1.User)
 ], UserMutation);
 //# sourceMappingURL=user-mutation.js.map