@things-factory/auth-base 8.0.0-alpha.35 → 8.0.0-alpha.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "8.0.0-alpha.35",
+  "version": "8.0.0-alpha.36",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -46,5 +46,5 @@
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0"
   },
-  "gitHead": "94fe243a5c99837a1e6f98de2c454c351ac8e6fd"
+  "gitHead": "7529955cea0ce5eaa29069374ceac5de848ca1a0"
 }

package/server/router/auth-public-process-router.ts

@@ -211,10 +211,9 @@ authPublicProcessRouter.post('/forgot-password', async (context, next) => {
 
 authPublicProcessRouter.post('/reset-password', async (context, next) => {
   const { header, t } = context
+  const { password, token } = context.request.body
 
   try {
-    const { password, token } = context.request.body
-
     if (!(token && password)) {
       let message = t('error.token or password is invalid')
 
@@ -243,7 +242,7 @@ authPublicProcessRouter.post('/reset-password', async (context, next) => {
 
     await resetPassword(token, password, context)
 
-    var message = t('text.password reset succeed')
+    var message = t('text.password changed successfully')
     context.body = message
 
     clearAccessTokenCookie(context)
@@ -266,10 +265,12 @@ authPublicProcessRouter.post('/reset-password', async (context, next) => {
 
     if (accepts(header.accept, ['text/html', '*/*'])) {
       await context.render('auth-page', {
-        pageElement: 'auth-result',
-        elementScript: '/auth/result.js',
+        pageElement: 'reset-password',
+        elementScript: '/auth/reset-password.js',
         data: {
+          token,
           message: e.message,
+          passwordRule,
           disableUserSignupProcess,
           disableUserFavoredLanguage,
           languages

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

@@ -216,16 +216,22 @@ export class UserMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To invite new user' })
-  async inviteUser(
-    @Arg('email', type => GraphQLEmailAddress) email: string,
-    @Ctx() context: ResolverContext
-  ): Promise<boolean> {
+  async inviteUser(@Arg('username') username: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain, tx } = context.state
-    const invitee: User = await getRepository(User, tx).findOne({
-      where: { email: ILike(email) },
+    const userRepository = getRepository(User, tx)
+
+    var invitee: User = await userRepository.findOne({
+      where: { username },
       relations: ['domains']
     })
 
+    if (!invitee && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+      invitee = await userRepository.findOne({
+        where: { email: ILike(username) },
+        relations: ['domains']
+      })
+    }
+
     if (!invitee) {
       throw new Error(context.t('error.failed to find x', { x: context.t('field.user') }))
     }
@@ -234,8 +240,9 @@ export class UserMutation {
     if (existingDomains.find((d: Domain) => d.id === domain.id)) {
       throw new Error(context.t('error.x already exists in y', { x: context.t('field.user'), y: domain.name }))
     }
+
     invitee.domains = [...existingDomains, domain]
-    await getRepository(User, tx).save(invitee)
+    await userRepository.save(invitee)
 
     return true
   }
@@ -243,16 +250,22 @@ export class UserMutation {
   @Directive('@transaction')
   @Directive('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)')
   @Mutation(returns => Boolean, { description: 'To delete domain user' })
-  async deleteDomainUser(
-    @Arg('email', type => GraphQLEmailAddress) email: string,
-    @Ctx() context: ResolverContext
-  ): Promise<boolean> {
+  async deleteDomainUser(@Arg('username') username: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { tx, domain } = context.state
+    const userRepository = getRepository(User, tx)
 
-    let user: User = await getRepository(User, tx).findOne({
-      where: { email: ILike(email) },
-      relations: ['domains', 'roles', 'roles.domain']
+    var user: User = await userRepository.findOne({
+      where: { username },
+      relations: ['domains', 'roles']
     })
+
+    if (!user && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+      user = await userRepository.findOne({
+        where: { email: ILike(username) },
+        relations: ['domains', 'roles']
+      })
+    }
+
     if (!user) {
       throw new Error(context.t('error.failed to find x', { x: context.t('field.user') }))
     }
@@ -266,9 +279,9 @@ export class UserMutation {
     user.domains.splice(targetDomainIdx, 1)
 
     // Remove domain's roles that user has
-    user.roles = user.roles.filter((role: Role) => role.domain.id !== domain.id)
+    user.roles = user.roles.filter((role: Role) => role.domainId !== domain.id)
 
-    await getRepository(User, tx).save(user)
+    await userRepository.save(user)
 
     return true
   }
@@ -276,18 +289,24 @@ export class UserMutation {
   @Directive('@privilege(domainOwnerGranted: true, superUserGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To transfer owner of domain' })
-  async transferOwner(
-    @Arg('email', type => GraphQLEmailAddress) email: string,
-    @Ctx() context: ResolverContext
-  ): Promise<boolean> {
+  async transferOwner(@Arg('username') username: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain, tx } = context.state
-    const user: User = await getRepository(User, tx).findOne({
-      where: { email: ILike(email) },
-      relations: ['domains', 'roles']
+    const userRepository = getRepository(User, tx)
+
+    var user: User = await userRepository.findOne({
+      where: { username },
+      relations: ['domains']
     })
 
+    if (!user && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+      user = await userRepository.findOne({
+        where: { email: 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 !== UserStatus.ACTIVATED) {
@@ -311,15 +330,24 @@ export class UserMutation {
   @Directive('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To activate user' })
-  async activateUser(@Arg('userId') userId: string, @Ctx() context: ResolverContext): Promise<boolean> {
+  async activateUser(@Arg('username') username: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { tx, domain } = context.state
+    const userRepository = getRepository(User, tx)
 
-    const targetUser: User = await getRepository(User, tx).findOne({
-      where: { id: userId },
+    var targetUser: User = await userRepository.findOne({
+      where: { username },
       relations: ['domains']
     })
+
+    if (!targetUser && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+      targetUser = await userRepository.findOne({
+        where: { email: 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 (!targetUser?.domains?.find((userDomain: Domain) => userDomain.id === domain.id)) {
@@ -329,7 +357,7 @@ export class UserMutation {
     targetUser.failCount = 0
     targetUser.status = UserStatus.ACTIVATED
 
-    await getRepository(User, tx).save(targetUser)
+    await userRepository.save(targetUser)
 
     return true
   }
@@ -337,15 +365,24 @@ export class UserMutation {
   @Directive('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To inactivate user' })
-  async inactivateUser(@Arg('userId') userId: string, @Ctx() context: ResolverContext): Promise<boolean> {
+  async inactivateUser(@Arg('username') username: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { tx, domain } = context.state
+    const userRepository = getRepository(User, tx)
 
-    const targetUser: User = await getRepository(User, tx).findOne({
-      where: { id: userId },
+    var targetUser: User = await userRepository.findOne({
+      where: { username },
       relations: ['domains']
     })
+
+    if (!targetUser && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+      targetUser = await userRepository.findOne({
+        where: { email: 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 (!targetUser?.domains?.find((userDomain: Domain) => userDomain.id === domain.id)) {
@@ -358,7 +395,7 @@ export class UserMutation {
 
     targetUser.status = UserStatus.INACTIVE
 
-    await getRepository(User, tx).save(targetUser)
+    await userRepository.save(targetUser)
 
     return true
   }
@@ -366,7 +403,7 @@ export class UserMutation {
   @Directive('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To reset password to default' })
-  async resetPasswordToDefault(@Arg('userId') userId: string, @Ctx() context: ResolverContext): Promise<boolean> {
+  async resetPasswordToDefault(@Arg('username') username: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { tx, domain } = context.state
 
     const { defaultPassword } = config.get('password')
@@ -374,12 +411,22 @@ export class UserMutation {
       throw new Error('No default password found')
     }
 
-    const targetUser: User = await getRepository(User, tx).findOne({
-      where: { id: userId },
+    const userRepository = getRepository(User, tx)
+
+    var targetUser: User = await userRepository.findOne({
+      where: { username },
       relations: ['domains']
     })
+
+    if (!targetUser && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+      targetUser = await userRepository.findOne({
+        where: { email: 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 (!targetUser?.domains?.find((userDomain: Domain) => userDomain.id === domain.id)) {
@@ -388,7 +435,8 @@ export class UserMutation {
 
     targetUser.salt = User.generateSalt()
     targetUser.password = User.encode(defaultPassword, targetUser.salt)
-    await getRepository(User, tx).save(targetUser)
+
+    await userRepository.save(targetUser)
 
     return true
   }
@@ -397,18 +445,28 @@ export class UserMutation {
   @Directive('@transaction')
   @Mutation(returns => User, { description: 'To update roles for a user' })
   async updateUserRoles(
-    @Arg('userId') userId: string,
+    @Arg('username') username: string,
     @Arg('availableRoles', type => [ObjectRef]) availableRoles: ObjectRef[],
     @Arg('selectedRoles', type => [ObjectRef]) selectedRoles: ObjectRef[],
     @Ctx() context: ResolverContext
   ) {
     const { domain, tx } = context.state
-    let user: User = await getRepository(User, tx).findOne({
-      where: { id: userId },
+    const userRepository = getRepository(User, tx)
+
+    var user: User = await userRepository.findOne({
+      where: { username },
       relations: ['domains', 'roles']
     })
+
+    if (!user && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+      user = await userRepository.findOne({
+        where: { email: 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: Domain) => d.id).indexOf(domain.id) < 0) {
@@ -419,6 +477,6 @@ export class UserMutation {
     user.roles = user.roles.filter((r: Role) => availableRoleIds.indexOf(r.id) < 0)
     user.roles = user.roles.concat(selectedRoles as Role[])
 
-    return await getRepository(User, tx).save(user)
+    return await userRepository.save(user)
   }
 }

package/translations/en.json

@@ -59,6 +59,7 @@
   "text.signout successfully": "signout successfully",
   "text.user activated successfully": "user activated successfully",
   "text.user credential registered successfully": "device registration has been successfully completed. You can now use biometric authentication.",
+  "text.user inactivated successfully": "user inactivated successfully",
   "text.user registered successfully": "user registered successfully. find your email to activate account",
   "text.verification email sent": "verification email sent"
 }

package/translations/ja.json

@@ -59,6 +59,7 @@
   "text.signout successfully": "ログアウトに成功しました.",
   "text.user activated successfully": "ユーザーが正常に活性化されました.",
   "text.user credential registered successfully": "デバイスの登録が正常に完了しました。今後は生体認証を使用できます。",
+  "text.user inactivated successfully": "ユーザーが正常に非アクティブ化されました.",
   "text.user registered successfully": "ユーザーが正常に登録されました. 確認メールでアカウントを有効にしてください.",
   "text.verification email sent": "確認メールを送りました."
 }

package/translations/ko.json

@@ -59,6 +59,7 @@
   "text.signout successfully": "성공적으로 로그아웃 하였습니다.",
   "text.user activated successfully": "사용자가 성공적으로 활성화되었습니다.",
   "text.user credential registered successfully": "기기 등록이 성공적으로 완료되었습니다. 이제 바이오메트릭 인증을 사용할 수 있습니다.",
+  "text.user inactivated successfully": "사용자가 성공적으로 비활성화되었습니다.",
   "text.user registered successfully": "사용자가 성공적으로 등록되었습니다. 확인 이메일을 통해서 계정을 활성화하시기 바랍니다.",
   "text.verification email sent": "확인 이메일을 보냈습니다."
 }

package/translations/ms.json

@@ -59,6 +59,7 @@
   "text.signout successfully": "Berjaya keluar",
   "text.user activated successfully": "Pengguna diaktifkan dengan berjaya",
   "text.user credential registered successfully": "pendaftaran peranti berjaya diselesaikan. Kini anda boleh menggunakan pengesahan biometrik.",
+  "text.user inactivated successfully": "Pengguna tidak aktif dengan berjaya",
   "text.user registered successfully": "Pengguna berjaya didaftarkan. Cari e-mel anda untuk mengaktifkan akaun",
   "text.verification email sent": "E-mel pengesahan telah dihantar"
 }

package/translations/zh.json

@@ -60,6 +60,7 @@
   "text.signout successfully": "登出成功。",
   "text.user activated successfully": "用户激活成功",
   "text.user credential registered successfully": "设备注册已成功完成。现在可以使用生物识别认证。",
+  "text.user inactivated successfully": "用户已成功停用",
   "text.user registered successfully": "用户注册成功。 请查看电子邮件以激活帐户。",
   "text.verification email sent": "验证邮件已发送"
 }