@things-factory/auth-base 8.0.0-alpha.8 → 8.0.0-beta.0

package/dist-server/service/invitation/invitation-mutation.d.ts

@@ -1,3 +1,4 @@
+import { User } from '../../service/user/user';
 import { Invitation } from './invitation';
 export declare class InvitationMutation {
     cancelInvitation(email: string, reference: string, type: string): Promise<boolean>;
@@ -5,12 +6,12 @@ export declare class InvitationMutation {
         email: string;
         reference: string;
         type: string;
-        creator: import("..").User;
-        updater: import("..").User;
+        updater: User;
         id: string;
         token: string;
         createdAt: Date;
         updatedAt: Date;
+        creator: User;
         creatorId: string;
         updaterId: string;
     } & Invitation>;

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

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvitationMutation = void 0;
 const tslib_1 = require("tslib");
+const typeorm_1 = require("typeorm");
 const type_graphql_1 = require("type-graphql");
 const graphql_scalars_1 = require("graphql-scalars");
 const shell_1 = require("@things-factory/shell");
+const user_1 = require("../../service/user/user");
 const invitation_1 = require("../../controllers/invitation");
 const invitation_2 = require("./invitation");
 let InvitationMutation = class InvitationMutation {
@@ -18,26 +20,36 @@ let InvitationMutation = class InvitationMutation {
         return true;
     }
     async sendInvitation(email, reference, type, context) {
-        const repository = (0, shell_1.getRepository)(invitation_2.Invitation);
-        const oldone = await repository.findOneBy({
-            email,
-            type,
-            reference
+        const { user: updater } = context.state;
+        const invitationRepository = (0, shell_1.getRepository)(invitation_2.Invitation);
+        var user = await (0, shell_1.getRepository)(user_1.User).findOne({
+            where: {
+                email: (0, typeorm_1.ILike)(email),
+                status: user_1.UserStatus.ACTIVATED
+            }
         });
-        // TODO send invitation
+        if (!user) {
+            throw new Error(`user not found: ${email}`);
+        }
         await (0, invitation_1.sendInvitationEmail)({
             invitation: {
                 email,
                 reference,
                 type
             },
+            user,
             context
         });
+        const oldone = await invitationRepository.findOneBy({
+            email,
+            type,
+            reference
+        });
         // update or create
-        return await repository.save(Object.assign(Object.assign({}, oldone), { // take only id from oldone for update
+        return await invitationRepository.save(Object.assign(Object.assign({ creator: updater }, oldone), { // take only id from oldone for update
             email,
             reference,
-            type, creator: context.state.user, updater: context.state.user }));
+            type, updater: updater }));
     }
 };
 exports.InvitationMutation = InvitationMutation;

package/dist-server/service/invitation/invitation-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"invitation-mutation.js","sourceRoot":"","sources":["../../../server/service/invitation/invitation-mutation.ts"],"names":[],"mappings":";;;;AAAA,+CAA2D;AAC3D,qDAAqD;AAErD,iDAAqD;AAErD,6DAAkE;AAClE,6CAAyC;AAGlC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAEvB,AAAN,KAAK,CAAC,gBAAgB,CACuB,KAAa,EACtC,SAAiB,EACtB,IAAY;QAEzB,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,uBAAU,CAAC,CAAA;QAE5C,MAAM,UAAU,CAAC,MAAM,CAAC;YACtB,KAAK;YACL,SAAS;YACT,IAAI;SACL,CAAC,CAAA;QAEF,OAAO,IAAI,CAAA;IACb,CAAC;IAGK,AAAN,KAAK,CAAC,cAAc,CACyB,KAAa,EACtC,SAAiB,EACtB,IAAY,EAClB,OAAwB;QAE/B,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,uBAAU,CAAC,CAAA;QAE5C,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC;YACxC,KAAK;YACL,IAAI;YACJ,SAAS;SACV,CAAC,CAAA;QAEF,uBAAuB;QACvB,MAAM,IAAA,gCAAmB,EAAC;YACxB,UAAU,EAAE;gBACV,KAAK;gBACL,SAAS;gBACT,IAAI;aACL;YACD,OAAO;SACR,CAAC,CAAA;QAEF,mBAAmB;QACnB,OAAO,MAAM,UAAU,CAAC,IAAI,iCACvB,MAAM,KAAE,sCAAsC;YACjD,KAAK;YACL,SAAS;YACT,IAAI,EACJ,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,EAC3B,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,IAC3B,CAAA;IACJ,CAAC;CACF,CAAA;AArDY,gDAAkB;AAEvB;IADL,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC;IAE1B,mBAAA,IAAA,kBAAG,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,qCAAmB,CAAC,CAAA;IACzC,mBAAA,IAAA,kBAAG,EAAC,WAAW,CAAC,CAAA;IAChB,mBAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;;;;0DAWb;AAGK;IADL,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,uBAAU,CAAC;IAE7B,mBAAA,IAAA,kBAAG,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,qCAAmB,CAAC,CAAA;IACzC,mBAAA,IAAA,kBAAG,EAAC,WAAW,CAAC,CAAA;IAChB,mBAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;IACX,mBAAA,IAAA,kBAAG,GAAE,CAAA;;;;wDA6BP;6BApDU,kBAAkB;IAD9B,IAAA,uBAAQ,EAAC,uBAAU,CAAC;GACR,kBAAkB,CAqD9B","sourcesContent":["import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'\nimport { GraphQLEmailAddress } from 'graphql-scalars'\n\nimport { getRepository } from '@things-factory/shell'\n\nimport { sendInvitationEmail } from '../../controllers/invitation'\nimport { Invitation } from './invitation'\n\n@Resolver(Invitation)\nexport class InvitationMutation {\n  @Mutation(returns => Boolean)\n  async cancelInvitation(\n    @Arg('email', type => GraphQLEmailAddress) email: string,\n    @Arg('reference') reference: string,\n    @Arg('type') type: string\n  ) {\n    const repository = getRepository(Invitation)\n\n    await repository.delete({\n      email,\n      reference,\n      type\n    })\n\n    return true\n  }\n\n  @Mutation(returns => Invitation)\n  async sendInvitation(\n    @Arg('email', type => GraphQLEmailAddress) email: string,\n    @Arg('reference') reference: string,\n    @Arg('type') type: string,\n    @Ctx() context: ResolverContext\n  ) {\n    const repository = getRepository(Invitation)\n\n    const oldone = await repository.findOneBy({\n      email,\n      type,\n      reference\n    })\n\n    // TODO send invitation\n    await sendInvitationEmail({\n      invitation: {\n        email,\n        reference,\n        type\n      },\n      context\n    })\n\n    // update or create\n    return await repository.save({\n      ...oldone, // take only id from oldone for update\n      email,\n      reference,\n      type,\n      creator: context.state.user,\n      updater: context.state.user\n    })\n  }\n}\n"]}
+{"version":3,"file":"invitation-mutation.js","sourceRoot":"","sources":["../../../server/service/invitation/invitation-mutation.ts"],"names":[],"mappings":";;;;AAAA,qCAA+B;AAE/B,+CAA2D;AAC3D,qDAAqD;AAErD,iDAAqD;AAErD,kDAA0D;AAC1D,6DAAkE;AAClE,6CAAyC;AAGlC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAEvB,AAAN,KAAK,CAAC,gBAAgB,CACuB,KAAa,EACtC,SAAiB,EACtB,IAAY;QAEzB,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,uBAAU,CAAC,CAAA;QAE5C,MAAM,UAAU,CAAC,MAAM,CAAC;YACtB,KAAK;YACL,SAAS;YACT,IAAI;SACL,CAAC,CAAA;QAEF,OAAO,IAAI,CAAA;IACb,CAAC;IAGK,AAAN,KAAK,CAAC,cAAc,CACyB,KAAa,EACtC,SAAiB,EACtB,IAAY,EAClB,OAAwB;QAE/B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QACvC,MAAM,oBAAoB,GAAG,IAAA,qBAAa,EAAC,uBAAU,CAAC,CAAA;QAEtD,IAAI,IAAI,GAAG,MAAM,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAC,OAAO,CAAC;YAC3C,KAAK,EAAE;gBACL,KAAK,EAAE,IAAA,eAAK,EAAC,KAAK,CAAC;gBACnB,MAAM,EAAE,iBAAU,CAAC,SAAS;aAC7B;SACF,CAAC,CAAA;QAEF,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,mBAAmB,KAAK,EAAE,CAAC,CAAA;QAC7C,CAAC;QAED,MAAM,IAAA,gCAAmB,EAAC;YACxB,UAAU,EAAE;gBACV,KAAK;gBACL,SAAS;gBACT,IAAI;aACL;YACD,IAAI;YACJ,OAAO;SACR,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,SAAS,CAAC;YAClD,KAAK;YACL,IAAI;YACJ,SAAS;SACV,CAAC,CAAA;QAEF,mBAAmB;QACnB,OAAO,MAAM,oBAAoB,CAAC,IAAI,+BACpC,OAAO,EAAE,OAAO,IACb,MAAM,KAAE,sCAAsC;YACjD,KAAK;YACL,SAAS;YACT,IAAI,EACJ,OAAO,EAAE,OAAO,IAChB,CAAA;IACJ,CAAC;CACF,CAAA;AAjEY,gDAAkB;AAEvB;IADL,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC;IAE1B,mBAAA,IAAA,kBAAG,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,qCAAmB,CAAC,CAAA;IACzC,mBAAA,IAAA,kBAAG,EAAC,WAAW,CAAC,CAAA;IAChB,mBAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;;;;0DAWb;AAGK;IADL,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,uBAAU,CAAC;IAE7B,mBAAA,IAAA,kBAAG,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,qCAAmB,CAAC,CAAA;IACzC,mBAAA,IAAA,kBAAG,EAAC,WAAW,CAAC,CAAA;IAChB,mBAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;IACX,mBAAA,IAAA,kBAAG,GAAE,CAAA;;;;wDAyCP;6BAhEU,kBAAkB;IAD9B,IAAA,uBAAQ,EAAC,uBAAU,CAAC;GACR,kBAAkB,CAiE9B","sourcesContent":["import { ILike } from 'typeorm'\n\nimport { Arg, Ctx, Mutation, Resolver } from 'type-graphql'\nimport { GraphQLEmailAddress } from 'graphql-scalars'\n\nimport { getRepository } from '@things-factory/shell'\n\nimport { User, UserStatus } from '../../service/user/user'\nimport { sendInvitationEmail } from '../../controllers/invitation'\nimport { Invitation } from './invitation'\n\n@Resolver(Invitation)\nexport class InvitationMutation {\n  @Mutation(returns => Boolean)\n  async cancelInvitation(\n    @Arg('email', type => GraphQLEmailAddress) email: string,\n    @Arg('reference') reference: string,\n    @Arg('type') type: string\n  ) {\n    const repository = getRepository(Invitation)\n\n    await repository.delete({\n      email,\n      reference,\n      type\n    })\n\n    return true\n  }\n\n  @Mutation(returns => Invitation)\n  async sendInvitation(\n    @Arg('email', type => GraphQLEmailAddress) email: string,\n    @Arg('reference') reference: string,\n    @Arg('type') type: string,\n    @Ctx() context: ResolverContext\n  ) {\n    const { user: updater } = context.state\n    const invitationRepository = getRepository(Invitation)\n\n    var user = await getRepository(User).findOne({\n      where: {\n        email: ILike(email),\n        status: UserStatus.ACTIVATED\n      }\n    })\n\n    if (!user) {\n      throw new Error(`user not found: ${email}`)\n    }\n\n    await sendInvitationEmail({\n      invitation: {\n        email,\n        reference,\n        type\n      },\n      user,\n      context\n    })\n\n    const oldone = await invitationRepository.findOneBy({\n      email,\n      type,\n      reference\n    })\n\n    // update or create\n    return await invitationRepository.save({\n      creator: updater,\n      ...oldone, // take only id from oldone for update\n      email,\n      reference,\n      type,\n      updater: updater\n    })\n  }\n}\n"]}

package/dist-server/service/user/user-mutation.d.ts

@@ -9,6 +9,7 @@ export declare class UserMutation {
         salt: string;
         passwordUpdatedAt: Date;
         password: string;
+        username: string;
         name: string;
         description?: string;
         email: string;
@@ -18,13 +19,13 @@ export declare class UserMutation {
     } & User>;
     updateUser(email: string, patch: UserPatch, context: ResolverContext): Promise<any>;
     updateMultipleUser(patches: UserPatch[], context: ResolverContext): Promise<any[]>;
-    deleteUser(email: string, context: ResolverContext): Promise<boolean>;
-    deleteUsers(emails: string[], context: ResolverContext): Promise<boolean>;
-    inviteUser(email: string, context: ResolverContext): Promise<boolean>;
-    deleteDomainUser(email: string, context: ResolverContext): Promise<boolean>;
-    transferOwner(email: string, context: ResolverContext): Promise<boolean>;
-    activateUser(userId: string, context: ResolverContext): Promise<boolean>;
-    inactivateUser(userId: string, context: ResolverContext): Promise<boolean>;
-    resetPasswordToDefault(userId: string, context: ResolverContext): Promise<boolean>;
-    updateUserRoles(userId: string, availableRoles: ObjectRef[], selectedRoles: ObjectRef[], context: ResolverContext): Promise<User>;
+    deleteUser(username: string, context: ResolverContext): Promise<boolean>;
+    deleteUsers(usernames: string[], context: ResolverContext): Promise<boolean>;
+    inviteUser(username: string, context: ResolverContext): Promise<boolean>;
+    deleteDomainUser(username: string, context: ResolverContext): Promise<boolean>;
+    transferOwner(username: string, context: ResolverContext): Promise<boolean>;
+    activateUser(username: string, context: ResolverContext): Promise<boolean>;
+    inactivateUser(username: string, context: ResolverContext): Promise<boolean>;
+    resetPasswordToDefault(username: string, context: ResolverContext): Promise<boolean>;
+    updateUserRoles(username: string, availableRoles: ObjectRef[], selectedRoles: ObjectRef[], context: ResolverContext): Promise<User>;
 }

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

@@ -12,32 +12,41 @@ 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 error_code_1 = require("../../constants/error-code");
 let UserMutation = class UserMutation {
     async createUser(user, context) {
-        const { domain } = context.state;
+        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_1.User, tx);
+        user.username = username.trim();
         user.email = email.trim();
-        const oldUser = await (0, shell_1.getRepository)(user_1.User).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_1.USERNAME_ALREADY_EXISTS));
+        }
+        if (await userRepository.findOne({ where: { email: (0, typeorm_1.ILike)(user.email) } })) {
+            throw new Error(context.t(error_code_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).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).findBy({
+        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_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) }));
     }
     async updateUser(email, patch, context) {
-        const { domain, user: updater } = context.state;
+        const { domain, user: updater, tx } = context.state;
         const qb = (0, get_domain_users_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()) || '' })
@@ -45,16 +54,18 @@ let UserMutation = class UserMutation {
             .leftJoinAndSelect('ROLES.domain', 'R_DOMAIN')
             .getOne();
         if (patch.roles) {
-            patch.roles = await (0, shell_1.getRepository)(role_1.Role).find({ where: { id: (0, typeorm_1.In)(patch.roles.map((r) => r.id)) } });
+            patch.roles = await (0, shell_1.getRepository)(role_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;
         }
-        return await (0, shell_1.getRepository)(user_1.User).save(Object.assign(Object.assign(Object.assign({}, user), patch), { updater }));
+        return await (0, shell_1.getRepository)(user_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 = tx.getRepository(user_1.User);
+        const userRepo = (0, shell_1.getRepository)(user_1.User, tx);
         let results = [];
         const _createRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === '+');
         const _updateRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === 'M');
@@ -113,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_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_1.deleteUsers)({ usernames }, tx);
         return true;
     }
-    async inviteUser(email, context) {
-        const { domain } = context.state;
-        const invitee = await (0, shell_1.getRepository)(user_1.User).findOne({
-            where: { email: (0, typeorm_1.ILike)(email) },
+    async inviteUser(username, context) {
+        const { domain, tx } = context.state;
+        const userRepository = (0, shell_1.getRepository)(user_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') }));
         }
@@ -137,14 +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).save(invitee);
+        await userRepository.save(invitee);
         return true;
     }
-    async deleteDomainUser(email, context) {
+    async deleteDomainUser(username, context) {
         const { tx, domain } = context.state;
-        let user = await tx
-            .getRepository(user_1.User)
-            .findOne({ where: { email: (0, typeorm_1.ILike)(email) }, relations: ['domains', 'roles', 'roles.domain'] });
+        const userRepository = (0, shell_1.getRepository)(user_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') }));
         }
@@ -155,46 +181,80 @@ 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 tx.getRepository(user_1.User).save(user);
+        user.roles = user.roles.filter((role) => role.domainId !== domain.id);
+        await userRepository.save(user);
         return true;
     }
-    async transferOwner(email, context) {
-        const { domain } = context.state;
-        const user = await (0, shell_1.getRepository)(user_1.User).findOne({
-            where: { email: (0, typeorm_1.ILike)(email) }
+    async transferOwner(username, context) {
+        const { domain, tx } = context.state;
+        const userRepository = (0, shell_1.getRepository)(user_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(context.t('error.failed to find x', { x: context.t('field.user') }));
+        }
+        if (user.status !== user_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) {
+            throw new Error(`User is not belongs to current domain`);
+        }
+        if (user.roles.filter((r) => r.domainId == domain.id).length == 0) {
+            throw new Error(`Only users with at least one role in this domain are eligible to receive admin privileges.`);
+        }
         domain.owner = user.id;
-        await (0, shell_1.getRepository)(shell_1.Domain).save(domain);
+        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 tx.getRepository(user_1.User).findOne({
-            where: { id: userId },
+        const userRepository = (0, shell_1.getRepository)(user_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 tx.getRepository(user_1.User).save(targetUser);
+        await userRepository.save(targetUser);
         return true;
     }
-    async inactivateUser(userId, context) {
+    async inactivateUser(username, context) {
         var _a;
         const { tx, domain } = context.state;
-        const targetUser = await tx.getRepository(user_1.User).findOne({
-            where: { id: userId },
+        const userRepository = (0, shell_1.getRepository)(user_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');
@@ -203,39 +263,53 @@ let UserMutation = class UserMutation {
             throw new Error('Admin deactivation not allowed');
         }
         targetUser.status = user_1.UserStatus.INACTIVE;
-        await tx.getRepository(user_1.User).save(targetUser);
+        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 tx.getRepository(user_1.User).findOne({
-            where: { id: userId },
+        const userRepository = (0, shell_1.getRepository)(user_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 tx.getRepository(user_1.User).save(targetUser);
+        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 tx.getRepository(user_1.User).findOne({
-            where: { id: userId },
+        const userRepository = (0, shell_1.getRepository)(user_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`);
@@ -243,7 +317,7 @@ 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 tx.getRepository(user_1.User).save(user);
+        return await userRepository.save(user);
     }
 };
 exports.UserMutation = UserMutation;
@@ -282,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]),
@@ -292,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]),
@@ -301,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]),
@@ -311,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]),
@@ -321,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]),
@@ -331,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]),
@@ -341,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]),
@@ -351,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]),
@@ -361,7 +435,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 => user_1.User, { description: 'To update roles for a 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.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)()),