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

package/dist-server/controllers/reset-password.js

@@ -6,25 +6,25 @@ const url_1 = require("url");
 const email_base_1 = require("@things-factory/email-base");
 const env_1 = require("@things-factory/env");
 const shell_1 = require("@things-factory/shell");
-const error_code_1 = require("../constants/error-code");
-const auth_error_1 = require("../errors/auth-error");
-const password_history_1 = require("../service/password-history/password-history");
-const user_1 = require("../service/user/user");
-const verification_token_1 = require("../service/verification-token/verification-token");
-const reset_password_email_1 = require("../templates/reset-password-email");
-const make_verification_token_1 = require("./utils/make-verification-token");
-const save_verification_token_1 = require("./utils/save-verification-token");
+const error_code_js_1 = require("../constants/error-code.js");
+const auth_error_js_1 = require("../errors/auth-error.js");
+const password_history_js_1 = require("../service/password-history/password-history.js");
+const user_js_1 = require("../service/user/user.js");
+const verification_token_js_1 = require("../service/verification-token/verification-token.js");
+const reset_password_email_js_1 = require("../templates/reset-password-email.js");
+const make_verification_token_js_1 = require("./utils/make-verification-token.js");
+const save_verification_token_js_1 = require("./utils/save-verification-token.js");
 const HISTORY_SIZE = env_1.config.get('password', { history: 0 }).history;
 async function sendPasswordResetEmail({ user, context }) {
     try {
-        var token = (0, make_verification_token_1.makeVerificationToken)();
-        var verifaction = await (0, save_verification_token_1.saveVerificationToken)(user.id, token, verification_token_1.VerificationTokenType.PASSWORD_RESET);
+        var token = (0, make_verification_token_js_1.makeVerificationToken)();
+        var verifaction = await (0, save_verification_token_js_1.saveVerificationToken)(user.id, token, verification_token_js_1.VerificationTokenType.PASSWORD_RESET);
         if (verifaction) {
             var serviceUrl = new url_1.URL(`/auth/reset-password?token=${token}`, context.header.referer);
             await (0, email_base_1.sendEmail)({
                 receiver: user.email,
                 subject: 'Reset your password',
-                content: (0, reset_password_email_1.getResetPasswordEmailForm)({
+                content: (0, reset_password_email_js_1.getResetPasswordEmailForm)({
                     name: user.name,
                     resetUrl: serviceUrl
                 })
@@ -38,10 +38,10 @@ async function sendPasswordResetEmail({ user, context }) {
 }
 async function resetPassword(token, password, context) {
     const { t } = context;
-    const verificationToken = await (0, shell_1.getRepository)(verification_token_1.VerificationToken).findOne({
+    const verificationToken = await (0, shell_1.getRepository)(verification_token_js_1.VerificationToken).findOne({
         where: {
             token,
-            type: verification_token_1.VerificationTokenType.PASSWORD_RESET
+            type: verification_token_js_1.VerificationTokenType.PASSWORD_RESET
         }
     });
     if (!verificationToken) {
@@ -51,7 +51,7 @@ async function resetPassword(token, password, context) {
     if (!userId) {
         throw new Error(t('text.invalid verification token'));
     }
-    var user = await (0, shell_1.getRepository)(user_1.User).findOneBy({ id: userId });
+    var user = await (0, shell_1.getRepository)(user_js_1.User).findOneBy({ id: userId });
     if (!user) {
         throw new Error(t('error.user not found'));
     }
@@ -59,10 +59,10 @@ async function resetPassword(token, password, context) {
     //   throw new Error(t('text.inactive user'))
     // }
     /* check if password is following the rule */
-    user_1.User.validatePasswordByRule(password, context === null || context === void 0 ? void 0 : context.lng);
-    user.password = user_1.User.encode(password, user.salt);
+    user_js_1.User.validatePasswordByRule(password, context === null || context === void 0 ? void 0 : context.lng);
+    user.password = user_js_1.User.encode(password, user.salt);
     if (HISTORY_SIZE > 0) {
-        var passwordHistory = await (0, shell_1.getRepository)(password_history_1.PasswordHistory).findOneBy({ userId: user.id });
+        var passwordHistory = await (0, shell_1.getRepository)(password_history_js_1.PasswordHistory).findOneBy({ userId: user.id });
         var history = [];
         if (passwordHistory) {
             try {
@@ -76,20 +76,20 @@ async function resetPassword(token, password, context) {
                 console.error('password history currupted - not json format');
             }
             const found = history.slice(0, HISTORY_SIZE).find(h => {
-                return user_1.User.verify(h.password, password, h.salt);
+                return user_js_1.User.verify(h.password, password, h.salt);
             });
             if (found) {
-                throw new auth_error_1.AuthError({
-                    errorCode: error_code_1.PASSWORD_USED_PAST
+                throw new auth_error_js_1.AuthError({
+                    errorCode: error_code_js_1.PASSWORD_USED_PAST
                 });
             }
         }
     }
-    await (0, shell_1.getRepository)(user_1.User).save(Object.assign(Object.assign({}, user), { passwordUpdatedAt: new Date() }));
-    await (0, shell_1.getRepository)(verification_token_1.VerificationToken).delete({
+    await (0, shell_1.getRepository)(user_js_1.User).save(Object.assign(Object.assign({}, user), { passwordUpdatedAt: new Date() }));
+    await (0, shell_1.getRepository)(verification_token_js_1.VerificationToken).delete({
         userId,
         token,
-        type: verification_token_1.VerificationTokenType.PASSWORD_RESET
+        type: verification_token_js_1.VerificationTokenType.PASSWORD_RESET
     });
     if (HISTORY_SIZE > 0) {
         history = [
@@ -99,7 +99,7 @@ async function resetPassword(token, password, context) {
             },
             ...history
         ].slice(0, HISTORY_SIZE);
-        await (0, shell_1.getRepository)(password_history_1.PasswordHistory).save({
+        await (0, shell_1.getRepository)(password_history_js_1.PasswordHistory).save({
             userId: user.id,
             history: JSON.stringify(history)
         });

package/dist-server/controllers/reset-password.js.map

@@ -1 +1 @@
-{"version":3,"file":"reset-password.js","sourceRoot":"","sources":["../../server/controllers/reset-password.ts"],"names":[],"mappings":"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","sourcesContent":["import { URL } from 'url'\n\nimport { sendEmail } from '@things-factory/email-base'\nimport { config } from '@things-factory/env'\nimport { getRepository } from '@things-factory/shell'\n\nimport { PASSWORD_USED_PAST } from '../constants/error-code'\nimport { AuthError } from '../errors/auth-error'\nimport { PasswordHistory } from '../service/password-history/password-history'\nimport { User } from '../service/user/user'\nimport { VerificationToken, VerificationTokenType } from '../service/verification-token/verification-token'\nimport { getResetPasswordEmailForm } from '../templates/reset-password-email'\nimport { makeVerificationToken } from './utils/make-verification-token'\nimport { saveVerificationToken } from './utils/save-verification-token'\n\nconst HISTORY_SIZE = config.get('password', { history: 0 }).history\n\nexport async function sendPasswordResetEmail({ user, context }) {\n  try {\n    var token = makeVerificationToken()\n    var verifaction = await saveVerificationToken(user.id, token, VerificationTokenType.PASSWORD_RESET)\n\n    if (verifaction) {\n      var serviceUrl = new URL(`/auth/reset-password?token=${token}`, context.header.referer)\n      await sendEmail({\n        receiver: user.email,\n        subject: 'Reset your password',\n        content: getResetPasswordEmailForm({\n          name: user.name,\n          resetUrl: serviceUrl\n        })\n      })\n\n      return true\n    }\n  } catch (e) {\n    return false\n  }\n}\n\nexport async function resetPassword(token, password, context) {\n  const { t } = context\n\n  const verificationToken = await getRepository(VerificationToken).findOne({\n    where: {\n      token,\n      type: VerificationTokenType.PASSWORD_RESET\n    }\n  })\n\n  if (!verificationToken) {\n    throw new Error(t('text.invalid verification token'))\n  }\n\n  const { userId } = verificationToken\n  if (!userId) {\n    throw new Error(t('text.invalid verification token'))\n  }\n\n  var user = await getRepository(User).findOneBy({ id: userId })\n  if (!user) {\n    throw new Error(t('error.user not found'))\n  }\n\n  // if (user.status == UserStatus.INACTIVE) {\n  //   throw new Error(t('text.inactive user'))\n  // }\n\n  /* check if password is following the rule */\n  User.validatePasswordByRule(password, context?.lng)\n\n  user.password = User.encode(password, user.salt)\n\n  if (HISTORY_SIZE > 0) {\n    var passwordHistory: PasswordHistory = await getRepository(PasswordHistory).findOneBy({ userId: user.id })\n    var history = []\n\n    if (passwordHistory) {\n      try {\n        history = JSON.parse(passwordHistory.history)\n        if (!(history instanceof Array)) {\n          console.error('password history maybe currupted - not an array')\n          history = []\n        }\n      } catch (e) {\n        console.error('password history currupted - not json format')\n      }\n\n      const found = history.slice(0, HISTORY_SIZE).find(h => {\n        return User.verify(h.password, password, h.salt)\n      })\n\n      if (found) {\n        throw new AuthError({\n          errorCode: PASSWORD_USED_PAST\n        })\n      }\n    }\n  }\n\n  await getRepository(User).save({\n    ...user,\n    passwordUpdatedAt: new Date()\n  })\n\n  await getRepository(VerificationToken).delete({\n    userId,\n    token,\n    type: VerificationTokenType.PASSWORD_RESET\n  })\n\n  if (HISTORY_SIZE > 0) {\n    history = [\n      {\n        password: user.password,\n        salt: user.salt\n      },\n      ...history\n    ].slice(0, HISTORY_SIZE)\n\n    await getRepository(PasswordHistory).save({\n      userId: user.id,\n      history: JSON.stringify(history)\n    })\n  }\n}\n"]}
+{"version":3,"file":"reset-password.js","sourceRoot":"","sources":["../../server/controllers/reset-password.ts"],"names":[],"mappings":"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","sourcesContent":["import { URL } from 'url'\n\nimport { sendEmail } from '@things-factory/email-base'\nimport { config } from '@things-factory/env'\nimport { getRepository } from '@things-factory/shell'\n\nimport { PASSWORD_USED_PAST } from '../constants/error-code.js'\nimport { AuthError } from '../errors/auth-error.js'\nimport { PasswordHistory } from '../service/password-history/password-history.js'\nimport { User } from '../service/user/user.js'\nimport { VerificationToken, VerificationTokenType } from '../service/verification-token/verification-token.js'\nimport { getResetPasswordEmailForm } from '../templates/reset-password-email.js'\nimport { makeVerificationToken } from './utils/make-verification-token.js'\nimport { saveVerificationToken } from './utils/save-verification-token.js'\n\nconst HISTORY_SIZE = config.get('password', { history: 0 }).history\n\nexport async function sendPasswordResetEmail({ user, context }) {\n  try {\n    var token = makeVerificationToken()\n    var verifaction = await saveVerificationToken(user.id, token, VerificationTokenType.PASSWORD_RESET)\n\n    if (verifaction) {\n      var serviceUrl = new URL(`/auth/reset-password?token=${token}`, context.header.referer)\n      await sendEmail({\n        receiver: user.email,\n        subject: 'Reset your password',\n        content: getResetPasswordEmailForm({\n          name: user.name,\n          resetUrl: serviceUrl\n        })\n      })\n\n      return true\n    }\n  } catch (e) {\n    return false\n  }\n}\n\nexport async function resetPassword(token, password, context) {\n  const { t } = context\n\n  const verificationToken = await getRepository(VerificationToken).findOne({\n    where: {\n      token,\n      type: VerificationTokenType.PASSWORD_RESET\n    }\n  })\n\n  if (!verificationToken) {\n    throw new Error(t('text.invalid verification token'))\n  }\n\n  const { userId } = verificationToken\n  if (!userId) {\n    throw new Error(t('text.invalid verification token'))\n  }\n\n  var user = await getRepository(User).findOneBy({ id: userId })\n  if (!user) {\n    throw new Error(t('error.user not found'))\n  }\n\n  // if (user.status == UserStatus.INACTIVE) {\n  //   throw new Error(t('text.inactive user'))\n  // }\n\n  /* check if password is following the rule */\n  User.validatePasswordByRule(password, context?.lng)\n\n  user.password = User.encode(password, user.salt)\n\n  if (HISTORY_SIZE > 0) {\n    var passwordHistory: PasswordHistory = await getRepository(PasswordHistory).findOneBy({ userId: user.id })\n    var history = []\n\n    if (passwordHistory) {\n      try {\n        history = JSON.parse(passwordHistory.history)\n        if (!(history instanceof Array)) {\n          console.error('password history maybe currupted - not an array')\n          history = []\n        }\n      } catch (e) {\n        console.error('password history currupted - not json format')\n      }\n\n      const found = history.slice(0, HISTORY_SIZE).find(h => {\n        return User.verify(h.password, password, h.salt)\n      })\n\n      if (found) {\n        throw new AuthError({\n          errorCode: PASSWORD_USED_PAST\n        })\n      }\n    }\n  }\n\n  await getRepository(User).save({\n    ...user,\n    passwordUpdatedAt: new Date()\n  })\n\n  await getRepository(VerificationToken).delete({\n    userId,\n    token,\n    type: VerificationTokenType.PASSWORD_RESET\n  })\n\n  if (HISTORY_SIZE > 0) {\n    history = [\n      {\n        password: user.password,\n        salt: user.salt\n      },\n      ...history\n    ].slice(0, HISTORY_SIZE)\n\n    await getRepository(PasswordHistory).save({\n      userId: user.id,\n      history: JSON.stringify(history)\n    })\n  }\n}\n"]}

package/dist-server/controllers/signin.d.ts

@@ -1,5 +1,8 @@
-import { User } from '../service/user/user';
-export declare function signin(attrs: any, context?: any): Promise<{
+import { User } from '../service/user/user.js';
+export declare function signin(attrs: {
+    username: string;
+    password: string;
+}, context?: any): Promise<{
     user: User;
     token: string;
     domains: import("@things-factory/shell").Domain[];

package/dist-server/controllers/signin.js

@@ -3,54 +3,69 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.signin = signin;
 const typeorm_1 = require("typeorm");
 const shell_1 = require("@things-factory/shell");
-const unlock_user_1 = require("../controllers/unlock-user");
-const auth_error_1 = require("../errors/auth-error");
-const user_1 = require("../service/user/user");
+const unlock_user_js_1 = require("../controllers/unlock-user.js");
+const auth_error_js_1 = require("../errors/auth-error.js");
+const user_js_1 = require("../service/user/user.js");
 async function signin(attrs, context) {
     const { domain } = (context === null || context === void 0 ? void 0 : context.state) || {};
-    const repository = (0, shell_1.getRepository)(user_1.User);
-    const user = await repository.findOne({ where: { email: (0, typeorm_1.ILike)(attrs.email) }, relations: ['domains'] });
+    const { username } = attrs;
+    const repository = (0, shell_1.getRepository)(user_js_1.User);
+    var user = await repository.findOne({
+        where: { username },
+        relations: ['domains']
+    });
+    if (!user && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+        user = await repository.findOne({
+            where: {
+                email: (0, typeorm_1.ILike)(username)
+            },
+            relations: ['domains']
+        });
+    }
     if (!user)
-        throw new auth_error_1.AuthError({
-            errorCode: auth_error_1.AuthError.ERROR_CODES.USER_NOT_FOUND
+        throw new auth_error_js_1.AuthError({
+            errorCode: auth_error_js_1.AuthError.ERROR_CODES.USER_NOT_FOUND
         });
-    if (user.status == user_1.UserStatus.DELETED) {
-        throw new auth_error_1.AuthError({
-            errorCode: auth_error_1.AuthError.ERROR_CODES.USER_DELETED
+    if (user.status == user_js_1.UserStatus.DELETED) {
+        throw new auth_error_js_1.AuthError({
+            errorCode: auth_error_js_1.AuthError.ERROR_CODES.USER_DELETED
         });
     }
-    if (user.status == user_1.UserStatus.LOCKED) {
-        (0, unlock_user_1.sendUnlockUserEmail)({
+    if (user.status == user_js_1.UserStatus.LOCKED) {
+        (0, unlock_user_js_1.sendUnlockUserEmail)({
             user,
             context
         });
-        throw new auth_error_1.AuthError({
-            errorCode: auth_error_1.AuthError.ERROR_CODES.USER_LOCKED,
+        throw new auth_error_js_1.AuthError({
+            errorCode: auth_error_js_1.AuthError.ERROR_CODES.USER_LOCKED,
             detail: {
+                username: user.username,
                 email: user.email
             }
         });
     }
-    if (!user_1.User.verify(user.password, attrs.password, user.salt)) {
+    if (!user_js_1.User.verify(user.password, attrs.password, user.salt)) {
         user.failCount++;
         if (user.failCount >= 5)
-            user.status = user_1.UserStatus.LOCKED;
+            user.status = user_js_1.UserStatus.LOCKED;
         await repository.save(user);
-        if (user.status == user_1.UserStatus.LOCKED) {
-            (0, unlock_user_1.sendUnlockUserEmail)({
+        if (user.status == user_js_1.UserStatus.LOCKED) {
+            (0, unlock_user_js_1.sendUnlockUserEmail)({
                 user,
                 context
             });
-            throw new auth_error_1.AuthError({
-                errorCode: auth_error_1.AuthError.ERROR_CODES.USER_LOCKED,
+            throw new auth_error_js_1.AuthError({
+                errorCode: auth_error_js_1.AuthError.ERROR_CODES.USER_LOCKED,
                 detail: {
+                    username: user.username,
                     email: user.email
                 }
             });
         }
-        throw new auth_error_1.AuthError({
-            errorCode: auth_error_1.AuthError.ERROR_CODES.PASSWORD_NOT_MATCHED,
+        throw new auth_error_js_1.AuthError({
+            errorCode: auth_error_js_1.AuthError.ERROR_CODES.PASSWORD_NOT_MATCHED,
             detail: {
+                username: user.username,
                 email: user.email,
                 failCount: user.failCount
             }
@@ -60,10 +75,11 @@ async function signin(attrs, context) {
         user.failCount = 0;
         await repository.save(user);
     }
-    if (user.status == user_1.UserStatus.INACTIVE) {
-        throw new auth_error_1.AuthError({
-            errorCode: auth_error_1.AuthError.ERROR_CODES.USER_NOT_ACTIVATED,
+    if (user.status == user_js_1.UserStatus.INACTIVE) {
+        throw new auth_error_js_1.AuthError({
+            errorCode: auth_error_js_1.AuthError.ERROR_CODES.USER_NOT_ACTIVATED,
             detail: {
+                username: user.username,
                 email: user.email
             }
         });

package/dist-server/controllers/signin.js.map

@@ -1 +1 @@
-{"version":3,"file":"signin.js","sourceRoot":"","sources":["../../server/controllers/signin.ts"],"names":[],"mappings":"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","sourcesContent":["import { ILike } from 'typeorm'\nimport { getRepository } from '@things-factory/shell'\n\nimport { sendUnlockUserEmail } from '../controllers/unlock-user'\nimport { AuthError } from '../errors/auth-error'\nimport { User, UserStatus } from '../service/user/user'\n\nexport async function signin(attrs, context?) {\n  const { domain } = context?.state || {}\n\n  const repository = getRepository(User)\n  const user = await repository.findOne({ where: { email: ILike(attrs.email) }, relations: ['domains'] })\n  if (!user)\n    throw new AuthError({\n      errorCode: AuthError.ERROR_CODES.USER_NOT_FOUND\n    })\n\n  if (user.status == UserStatus.DELETED) {\n    throw new AuthError({\n      errorCode: AuthError.ERROR_CODES.USER_DELETED\n    })\n  }\n\n  if (user.status == UserStatus.LOCKED) {\n    sendUnlockUserEmail({\n      user,\n      context\n    })\n    throw new AuthError({\n      errorCode: AuthError.ERROR_CODES.USER_LOCKED,\n      detail: {\n        email: user.email\n      }\n    })\n  }\n\n  if (!User.verify(user.password, attrs.password, user.salt)) {\n    user.failCount++\n    if (user.failCount >= 5) user.status = UserStatus.LOCKED\n    await repository.save(user)\n    if (user.status == UserStatus.LOCKED) {\n      sendUnlockUserEmail({\n        user,\n        context\n      })\n      throw new AuthError({\n        errorCode: AuthError.ERROR_CODES.USER_LOCKED,\n        detail: {\n          email: user.email\n        }\n      })\n    }\n    throw new AuthError({\n      errorCode: AuthError.ERROR_CODES.PASSWORD_NOT_MATCHED,\n      detail: {\n        email: user.email,\n        failCount: user.failCount\n      }\n    })\n  } else {\n    user.failCount = 0\n    await repository.save(user)\n  }\n\n  if (user.status == UserStatus.INACTIVE) {\n    throw new AuthError({\n      errorCode: AuthError.ERROR_CODES.USER_NOT_ACTIVATED,\n      detail: {\n        email: user.email\n      }\n    })\n  }\n\n  return {\n    user,\n    token: await user.sign({ subdomain: domain?.subdomain }),\n    domains: user.domains || []\n  }\n}\n"]}
+{"version":3,"file":"signin.js","sourceRoot":"","sources":["../../server/controllers/signin.ts"],"names":[],"mappings":"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","sourcesContent":["import { ILike } from 'typeorm'\nimport { getRepository } from '@things-factory/shell'\n\nimport { sendUnlockUserEmail } from '../controllers/unlock-user.js'\nimport { AuthError } from '../errors/auth-error.js'\nimport { User, UserStatus } from '../service/user/user.js'\n\nexport async function signin(attrs: { username: string; password: string }, context?) {\n  const { domain } = context?.state || {}\n  const { username } = attrs\n\n  const repository = getRepository(User)\n\n  var user = await repository.findOne({\n    where: { username },\n    relations: ['domains']\n  })\n\n  if (!user && /^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$/.test(username)) {\n    user = await repository.findOne({\n      where: {\n        email: ILike(username)\n      },\n      relations: ['domains']\n    })\n  }\n\n  if (!user)\n    throw new AuthError({\n      errorCode: AuthError.ERROR_CODES.USER_NOT_FOUND\n    })\n\n  if (user.status == UserStatus.DELETED) {\n    throw new AuthError({\n      errorCode: AuthError.ERROR_CODES.USER_DELETED\n    })\n  }\n\n  if (user.status == UserStatus.LOCKED) {\n    sendUnlockUserEmail({\n      user,\n      context\n    })\n    throw new AuthError({\n      errorCode: AuthError.ERROR_CODES.USER_LOCKED,\n      detail: {\n        username: user.username,\n        email: user.email\n      }\n    })\n  }\n\n  if (!User.verify(user.password, attrs.password, user.salt)) {\n    user.failCount++\n    if (user.failCount >= 5) user.status = UserStatus.LOCKED\n    await repository.save(user)\n    if (user.status == UserStatus.LOCKED) {\n      sendUnlockUserEmail({\n        user,\n        context\n      })\n      throw new AuthError({\n        errorCode: AuthError.ERROR_CODES.USER_LOCKED,\n        detail: {\n          username: user.username,\n          email: user.email\n        }\n      })\n    }\n    throw new AuthError({\n      errorCode: AuthError.ERROR_CODES.PASSWORD_NOT_MATCHED,\n      detail: {\n        username: user.username,\n        email: user.email,\n        failCount: user.failCount\n      }\n    })\n  } else {\n    user.failCount = 0\n    await repository.save(user)\n  }\n\n  if (user.status == UserStatus.INACTIVE) {\n    throw new AuthError({\n      errorCode: AuthError.ERROR_CODES.USER_NOT_ACTIVATED,\n      detail: {\n        username: user.username,\n        email: user.email\n      }\n    })\n  }\n\n  return {\n    user,\n    token: await user.sign({ subdomain: domain?.subdomain }),\n    domains: user.domains || []\n  }\n}\n"]}

package/dist-server/controllers/signup.d.ts

@@ -1,4 +1,4 @@
-import { User } from '../service/user/user';
+import { User } from '../service/user/user.js';
 export declare function signup(attrs: any, withEmailVerification?: Boolean): Promise<{
     token: {
         user: User;

package/dist-server/controllers/signup.js

@@ -3,39 +3,48 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.signup = signup;
 const typeorm_1 = require("typeorm");
 const shell_1 = require("@things-factory/shell");
-const error_code_1 = require("../constants/error-code");
-const auth_error_1 = require("../errors/auth-error");
-const user_1 = require("../service/user/user");
-const signin_1 = require("./signin");
-const verification_1 = require("./verification");
+const error_code_js_1 = require("../constants/error-code.js");
+const auth_error_js_1 = require("../errors/auth-error.js");
+const user_js_1 = require("../service/user/user.js");
+const signin_js_1 = require("./signin.js");
+const verification_js_1 = require("./verification.js");
 async function signup(attrs, withEmailVerification) {
-    const { name, email, password, domain, context } = attrs;
+    const { name, username, password, domain, context } = attrs;
     /* check if password is following the rule */
-    user_1.User.validatePasswordByRule(password, context.lng);
-    const repository = (0, shell_1.getRepository)(user_1.User);
-    const duplicated = await repository.findOneBy({ email: (0, typeorm_1.ILike)(email) });
+    user_js_1.User.validatePasswordByRule(password, context.lng);
+    const repository = (0, shell_1.getRepository)(user_js_1.User);
+    var duplicated = await repository.findOne({
+        where: { username },
+        relations: ['domains']
+    });
+    if (!duplicated && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+        user = await repository.findOne({
+            where: { email: (0, typeorm_1.ILike)(username) },
+            relations: ['domains']
+        });
+    }
     if (duplicated) {
-        throw new auth_error_1.AuthError({
-            errorCode: error_code_1.USER_DUPLICATED,
+        throw new auth_error_js_1.AuthError({
+            errorCode: error_code_js_1.USER_DUPLICATED,
             detail: {
                 name,
-                email
+                username
             }
         });
     }
-    const salt = user_1.User.generateSalt();
-    var user = await repository.save(Object.assign(Object.assign({ userType: 'user' }, attrs), { salt, password: user_1.User.encode(password, salt), passwordUpdatedAt: new Date(), domains: domain ? [domain] : [] }));
+    const salt = user_js_1.User.generateSalt();
+    var user = await repository.save(Object.assign(Object.assign({ userType: 'user' }, attrs), { salt, password: user_js_1.User.encode(password, salt), passwordUpdatedAt: new Date(), domains: domain ? [domain] : [] }));
     var succeed = false;
     if (withEmailVerification) {
-        succeed = await (0, verification_1.sendVerificationEmail)({
+        succeed = await (0, verification_js_1.sendVerificationEmail)({
             context,
             user
         });
     }
     try {
         return {
-            token: await (0, signin_1.signin)({
-                email,
+            token: await (0, signin_js_1.signin)({
+                username,
                 password
             }, { domain })
         };

package/dist-server/controllers/signup.js.map

@@ -1 +1 @@
-{"version":3,"file":"signup.js","sourceRoot":"","sources":["../../server/controllers/signup.ts"],"names":[],"mappings":";;AASA,wBAkDC;AA3DD,qCAA+B;AAC/B,iDAAqD;AAErD,wDAAyD;AACzD,qDAAgD;AAChD,+CAA2C;AAC3C,qCAAiC;AACjC,iDAAsD;AAE/C,KAAK,UAAU,MAAM,CAAC,KAAK,EAAE,qBAA+B;IACjE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;IAExD,6CAA6C;IAC7C,WAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;IAElD,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAA;IACtC,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAA,eAAK,EAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IACtE,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,IAAI,sBAAS,CAAC;YAClB,SAAS,EAAE,4BAAe;YAC1B,MAAM,EAAE;gBACN,IAAI;gBACJ,KAAK;aACN;SACF,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,WAAI,CAAC,YAAY,EAAE,CAAA;IAEhC,IAAI,IAAI,GAAG,MAAM,UAAU,CAAC,IAAI,+BAC9B,QAAQ,EAAE,MAAM,IACb,KAAK,KACR,IAAI,EACJ,QAAQ,EAAE,WAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,EACrC,iBAAiB,EAAE,IAAI,IAAI,EAAE,EAC7B,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAC/B,CAAA;IAEF,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,qBAAqB,EAAE,CAAC;QAC1B,OAAO,GAAG,MAAM,IAAA,oCAAqB,EAAC;YACpC,OAAO;YACP,IAAI;SACL,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,CAAC;QACH,OAAO;YACL,KAAK,EAAE,MAAM,IAAA,eAAM,EACjB;gBACE,KAAK;gBACL,QAAQ;aACT,EACD,EAAE,MAAM,EAAE,CACX;SACF,CAAA;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;IACxB,CAAC;AACH,CAAC","sourcesContent":["import { ILike } from 'typeorm'\nimport { getRepository } from '@things-factory/shell'\n\nimport { USER_DUPLICATED } from '../constants/error-code'\nimport { AuthError } from '../errors/auth-error'\nimport { User } from '../service/user/user'\nimport { signin } from './signin'\nimport { sendVerificationEmail } from './verification'\n\nexport async function signup(attrs, withEmailVerification?: Boolean) {\n  const { name, email, password, domain, context } = attrs\n\n  /* check if password is following the rule */\n  User.validatePasswordByRule(password, context.lng)\n\n  const repository = getRepository(User)\n  const duplicated = await repository.findOneBy({ email: ILike(email) })\n  if (duplicated) {\n    throw new AuthError({\n      errorCode: USER_DUPLICATED,\n      detail: {\n        name,\n        email\n      }\n    })\n  }\n\n  const salt = User.generateSalt()\n\n  var user = await repository.save({\n    userType: 'user',\n    ...attrs,\n    salt,\n    password: User.encode(password, salt),\n    passwordUpdatedAt: new Date(),\n    domains: domain ? [domain] : []\n  })\n\n  var succeed = false\n  if (withEmailVerification) {\n    succeed = await sendVerificationEmail({\n      context,\n      user\n    })\n  }\n\n  try {\n    return {\n      token: await signin(\n        {\n          email,\n          password\n        },\n        { domain }\n      )\n    }\n  } catch (e) {\n    return { token: null }\n  }\n}\n"]}
+{"version":3,"file":"signup.js","sourceRoot":"","sources":["../../server/controllers/signup.ts"],"names":[],"mappings":";;AASA,wBA8DC;AAvED,qCAA+B;AAC/B,iDAAqD;AAErD,8DAA4D;AAC5D,2DAAmD;AACnD,qDAA8C;AAC9C,2CAAoC;AACpC,uDAAyD;AAElD,KAAK,UAAU,MAAM,CAAC,KAAK,EAAE,qBAA+B;IACjE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;IAE3D,6CAA6C;IAC7C,cAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;IAElD,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,cAAI,CAAC,CAAA;IAEtC,IAAI,UAAU,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QACxC,KAAK,EAAE,EAAE,QAAQ,EAAE;QACnB,SAAS,EAAE,CAAC,SAAS,CAAC;KACvB,CAAC,CAAA;IAEF,IAAI,CAAC,UAAU,IAAI,4BAA4B,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/D,IAAI,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YAC9B,KAAK,EAAE,EAAE,KAAK,EAAE,IAAA,eAAK,EAAC,QAAQ,CAAC,EAAE;YACjC,SAAS,EAAE,CAAC,SAAS,CAAC;SACvB,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,IAAI,yBAAS,CAAC;YAClB,SAAS,EAAE,+BAAe;YAC1B,MAAM,EAAE;gBACN,IAAI;gBACJ,QAAQ;aACT;SACF,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,cAAI,CAAC,YAAY,EAAE,CAAA;IAEhC,IAAI,IAAI,GAAG,MAAM,UAAU,CAAC,IAAI,+BAC9B,QAAQ,EAAE,MAAM,IACb,KAAK,KACR,IAAI,EACJ,QAAQ,EAAE,cAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,EACrC,iBAAiB,EAAE,IAAI,IAAI,EAAE,EAC7B,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAC/B,CAAA;IAEF,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,qBAAqB,EAAE,CAAC;QAC1B,OAAO,GAAG,MAAM,IAAA,uCAAqB,EAAC;YACpC,OAAO;YACP,IAAI;SACL,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,CAAC;QACH,OAAO;YACL,KAAK,EAAE,MAAM,IAAA,kBAAM,EACjB;gBACE,QAAQ;gBACR,QAAQ;aACT,EACD,EAAE,MAAM,EAAE,CACX;SACF,CAAA;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;IACxB,CAAC;AACH,CAAC","sourcesContent":["import { ILike } from 'typeorm'\nimport { getRepository } from '@things-factory/shell'\n\nimport { USER_DUPLICATED } from '../constants/error-code.js'\nimport { AuthError } from '../errors/auth-error.js'\nimport { User } from '../service/user/user.js'\nimport { signin } from './signin.js'\nimport { sendVerificationEmail } from './verification.js'\n\nexport async function signup(attrs, withEmailVerification?: Boolean) {\n  const { name, username, password, domain, context } = attrs\n\n  /* check if password is following the rule */\n  User.validatePasswordByRule(password, context.lng)\n\n  const repository = getRepository(User)\n\n  var duplicated = await repository.findOne({\n    where: { username },\n    relations: ['domains']\n  })\n\n  if (!duplicated && /^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$/.test(username)) {\n    user = await repository.findOne({\n      where: { email: ILike(username) },\n      relations: ['domains']\n    })\n  }\n\n  if (duplicated) {\n    throw new AuthError({\n      errorCode: USER_DUPLICATED,\n      detail: {\n        name,\n        username\n      }\n    })\n  }\n\n  const salt = User.generateSalt()\n\n  var user = await repository.save({\n    userType: 'user',\n    ...attrs,\n    salt,\n    password: User.encode(password, salt),\n    passwordUpdatedAt: new Date(),\n    domains: domain ? [domain] : []\n  })\n\n  var succeed = false\n  if (withEmailVerification) {\n    succeed = await sendVerificationEmail({\n      context,\n      user\n    })\n  }\n\n  try {\n    return {\n      token: await signin(\n        {\n          username,\n          password\n        },\n        { domain }\n      )\n    }\n  } catch (e) {\n    return { token: null }\n  }\n}\n"]}

package/dist-server/controllers/unlock-user.js

@@ -5,21 +5,22 @@ exports.unlockUser = unlockUser;
 const url_1 = require("url");
 const email_base_1 = require("@things-factory/email-base");
 const shell_1 = require("@things-factory/shell");
-const user_1 = require("../service/user/user");
-const verification_token_1 = require("../service/verification-token/verification-token");
-const account_unlock_email_1 = require("../templates/account-unlock-email");
-const make_verification_token_1 = require("./utils/make-verification-token");
-const save_verification_token_1 = require("./utils/save-verification-token");
+const user_js_1 = require("../service/user/user.js");
+const verification_token_js_1 = require("../service/verification-token/verification-token.js");
+const account_unlock_email_js_1 = require("../templates/account-unlock-email.js");
+const make_verification_token_js_1 = require("./utils/make-verification-token.js");
+const save_verification_token_js_1 = require("./utils/save-verification-token.js");
 async function sendUnlockUserEmail({ user, context }) {
     try {
-        var token = (0, make_verification_token_1.makeVerificationToken)();
-        var verifaction = await (0, save_verification_token_1.saveVerificationToken)(user.id, token, verification_token_1.VerificationTokenType.UNLOCK);
+        var token = (0, make_verification_token_js_1.makeVerificationToken)();
+        var verifaction = await (0, save_verification_token_js_1.saveVerificationToken)(user.id, token, verification_token_js_1.VerificationTokenType.UNLOCK);
         if (verifaction) {
             var serviceUrl = new url_1.URL(`/auth/unlock-user?token=${token}`, context.header.referer);
             await (0, email_base_1.sendEmail)({
                 receiver: user.email,
                 subject: 'Your account is locked',
-                content: (0, account_unlock_email_1.getUnlockUserEmailForm)({
+                content: (0, account_unlock_email_js_1.getUnlockUserEmailForm)({
+                    username: user.username,
                     name: user.name,
                     resetUrl: serviceUrl
                 })
@@ -32,27 +33,27 @@ async function sendUnlockUserEmail({ user, context }) {
     }
 }
 async function unlockUser(token, password) {
-    var { userId } = await (0, shell_1.getRepository)(verification_token_1.VerificationToken).findOne({
+    var { userId } = await (0, shell_1.getRepository)(verification_token_js_1.VerificationToken).findOne({
         where: {
             token,
-            type: verification_token_1.VerificationTokenType.UNLOCK
+            type: verification_token_js_1.VerificationTokenType.UNLOCK
         }
     });
     if (!userId)
         return false;
-    var userInfo = await (0, shell_1.getRepository)(user_1.User).findOneBy({ id: userId });
+    var userInfo = await (0, shell_1.getRepository)(user_js_1.User).findOneBy({ id: userId });
     if (!userInfo)
         return false;
-    if (userInfo.status != user_1.UserStatus.LOCKED)
+    if (userInfo.status != user_js_1.UserStatus.LOCKED)
         return false;
-    userInfo.status = user_1.UserStatus.ACTIVATED;
-    userInfo.password = user_1.User.encode(password, userInfo.salt);
+    userInfo.status = user_js_1.UserStatus.ACTIVATED;
+    userInfo.password = user_js_1.User.encode(password, userInfo.salt);
     userInfo.failCount = 0;
-    await (0, shell_1.getRepository)(user_1.User).save(userInfo);
-    await (0, shell_1.getRepository)(verification_token_1.VerificationToken).delete({
+    await (0, shell_1.getRepository)(user_js_1.User).save(userInfo);
+    await (0, shell_1.getRepository)(verification_token_js_1.VerificationToken).delete({
         userId,
         token,
-        type: verification_token_1.VerificationTokenType.UNLOCK
+        type: verification_token_js_1.VerificationTokenType.UNLOCK
     });
     return true;
 }

package/dist-server/controllers/unlock-user.js.map

@@ -1 +1 @@
-{"version":3,"file":"unlock-user.js","sourceRoot":"","sources":["../../server/controllers/unlock-user.ts"],"names":[],"mappings":";;AAWA,kDAqBC;AAED,gCA0BC;AA5DD,6BAAyB;AAEzB,2DAAsD;AACtD,iDAAqD;AAErD,+CAAuD;AACvD,yFAA2G;AAC3G,4EAA0E;AAC1E,6EAAuE;AACvE,6EAAuE;AAEhE,KAAK,UAAU,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;IACzD,IAAI,CAAC;QACH,IAAI,KAAK,GAAG,IAAA,+CAAqB,GAAE,CAAA;QACnC,IAAI,WAAW,GAAG,MAAM,IAAA,+CAAqB,EAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,0CAAqB,CAAC,MAAM,CAAC,CAAA;QAE3F,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,UAAU,GAAG,IAAI,SAAG,CAAC,2BAA2B,KAAK,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACpF,MAAM,IAAA,sBAAS,EAAC;gBACd,QAAQ,EAAE,IAAI,CAAC,KAAK;gBACpB,OAAO,EAAE,wBAAwB;gBACjC,OAAO,EAAE,IAAA,6CAAsB,EAAC;oBAC9B,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,QAAQ,EAAE,UAAU;iBACrB,CAAC;aACH,CAAC,CAAA;YAEF,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,UAAU,CAAC,KAAK,EAAE,QAAQ;IAC9C,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAa,EAAC,sCAAiB,CAAC,CAAC,OAAO,CAAC;QAC9D,KAAK,EAAE;YACL,KAAK;YACL,IAAI,EAAE,0CAAqB,CAAC,MAAM;SACnC;KACF,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IAEzB,IAAI,QAAQ,GAAG,MAAM,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IAClE,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3B,IAAI,QAAQ,CAAC,MAAM,IAAI,iBAAU,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IAEtD,QAAQ,CAAC,MAAM,GAAG,iBAAU,CAAC,SAAS,CAAA;IACtC,QAAQ,CAAC,QAAQ,GAAG,WAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;IACxD,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAA;IAEtB,MAAM,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACxC,MAAM,IAAA,qBAAa,EAAC,sCAAiB,CAAC,CAAC,MAAM,CAAC;QAC5C,MAAM;QACN,KAAK;QACL,IAAI,EAAE,0CAAqB,CAAC,MAAM;KACnC,CAAC,CAAA;IAEF,OAAO,IAAI,CAAA;AACb,CAAC","sourcesContent":["import { URL } from 'url'\n\nimport { sendEmail } from '@things-factory/email-base'\nimport { getRepository } from '@things-factory/shell'\n\nimport { User, UserStatus } from '../service/user/user'\nimport { VerificationToken, VerificationTokenType } from '../service/verification-token/verification-token'\nimport { getUnlockUserEmailForm } from '../templates/account-unlock-email'\nimport { makeVerificationToken } from './utils/make-verification-token'\nimport { saveVerificationToken } from './utils/save-verification-token'\n\nexport async function sendUnlockUserEmail({ user, context }) {\n  try {\n    var token = makeVerificationToken()\n    var verifaction = await saveVerificationToken(user.id, token, VerificationTokenType.UNLOCK)\n\n    if (verifaction) {\n      var serviceUrl = new URL(`/auth/unlock-user?token=${token}`, context.header.referer)\n      await sendEmail({\n        receiver: user.email,\n        subject: 'Your account is locked',\n        content: getUnlockUserEmailForm({\n          name: user.name,\n          resetUrl: serviceUrl\n        })\n      })\n\n      return true\n    }\n  } catch (e) {\n    return false\n  }\n}\n\nexport async function unlockUser(token, password) {\n  var { userId } = await getRepository(VerificationToken).findOne({\n    where: {\n      token,\n      type: VerificationTokenType.UNLOCK\n    }\n  })\n\n  if (!userId) return false\n\n  var userInfo = await getRepository(User).findOneBy({ id: userId })\n  if (!userInfo) return false\n  if (userInfo.status != UserStatus.LOCKED) return false\n\n  userInfo.status = UserStatus.ACTIVATED\n  userInfo.password = User.encode(password, userInfo.salt)\n  userInfo.failCount = 0\n\n  await getRepository(User).save(userInfo)\n  await getRepository(VerificationToken).delete({\n    userId,\n    token,\n    type: VerificationTokenType.UNLOCK\n  })\n\n  return true\n}\n"]}
+{"version":3,"file":"unlock-user.js","sourceRoot":"","sources":["../../server/controllers/unlock-user.ts"],"names":[],"mappings":";;AAWA,kDAsBC;AAED,gCA0BC;AA7DD,6BAAyB;AAEzB,2DAAsD;AACtD,iDAAqD;AAErD,qDAA0D;AAC1D,+FAA8G;AAC9G,kFAA6E;AAC7E,mFAA0E;AAC1E,mFAA0E;AAEnE,KAAK,UAAU,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;IACzD,IAAI,CAAC;QACH,IAAI,KAAK,GAAG,IAAA,kDAAqB,GAAE,CAAA;QACnC,IAAI,WAAW,GAAG,MAAM,IAAA,kDAAqB,EAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,6CAAqB,CAAC,MAAM,CAAC,CAAA;QAE3F,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,UAAU,GAAG,IAAI,SAAG,CAAC,2BAA2B,KAAK,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACpF,MAAM,IAAA,sBAAS,EAAC;gBACd,QAAQ,EAAE,IAAI,CAAC,KAAK;gBACpB,OAAO,EAAE,wBAAwB;gBACjC,OAAO,EAAE,IAAA,gDAAsB,EAAC;oBAC9B,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,QAAQ,EAAE,UAAU;iBACrB,CAAC;aACH,CAAC,CAAA;YAEF,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,UAAU,CAAC,KAAK,EAAE,QAAQ;IAC9C,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAa,EAAC,yCAAiB,CAAC,CAAC,OAAO,CAAC;QAC9D,KAAK,EAAE;YACL,KAAK;YACL,IAAI,EAAE,6CAAqB,CAAC,MAAM;SACnC;KACF,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IAEzB,IAAI,QAAQ,GAAG,MAAM,IAAA,qBAAa,EAAC,cAAI,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IAClE,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3B,IAAI,QAAQ,CAAC,MAAM,IAAI,oBAAU,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IAEtD,QAAQ,CAAC,MAAM,GAAG,oBAAU,CAAC,SAAS,CAAA;IACtC,QAAQ,CAAC,QAAQ,GAAG,cAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;IACxD,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAA;IAEtB,MAAM,IAAA,qBAAa,EAAC,cAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACxC,MAAM,IAAA,qBAAa,EAAC,yCAAiB,CAAC,CAAC,MAAM,CAAC;QAC5C,MAAM;QACN,KAAK;QACL,IAAI,EAAE,6CAAqB,CAAC,MAAM;KACnC,CAAC,CAAA;IAEF,OAAO,IAAI,CAAA;AACb,CAAC","sourcesContent":["import { URL } from 'url'\n\nimport { sendEmail } from '@things-factory/email-base'\nimport { getRepository } from '@things-factory/shell'\n\nimport { User, UserStatus } from '../service/user/user.js'\nimport { VerificationToken, VerificationTokenType } from '../service/verification-token/verification-token.js'\nimport { getUnlockUserEmailForm } from '../templates/account-unlock-email.js'\nimport { makeVerificationToken } from './utils/make-verification-token.js'\nimport { saveVerificationToken } from './utils/save-verification-token.js'\n\nexport async function sendUnlockUserEmail({ user, context }) {\n  try {\n    var token = makeVerificationToken()\n    var verifaction = await saveVerificationToken(user.id, token, VerificationTokenType.UNLOCK)\n\n    if (verifaction) {\n      var serviceUrl = new URL(`/auth/unlock-user?token=${token}`, context.header.referer)\n      await sendEmail({\n        receiver: user.email,\n        subject: 'Your account is locked',\n        content: getUnlockUserEmailForm({\n          username: user.username,\n          name: user.name,\n          resetUrl: serviceUrl\n        })\n      })\n\n      return true\n    }\n  } catch (e) {\n    return false\n  }\n}\n\nexport async function unlockUser(token, password) {\n  var { userId } = await getRepository(VerificationToken).findOne({\n    where: {\n      token,\n      type: VerificationTokenType.UNLOCK\n    }\n  })\n\n  if (!userId) return false\n\n  var userInfo = await getRepository(User).findOneBy({ id: userId })\n  if (!userInfo) return false\n  if (userInfo.status != UserStatus.LOCKED) return false\n\n  userInfo.status = UserStatus.ACTIVATED\n  userInfo.password = User.encode(password, userInfo.salt)\n  userInfo.failCount = 0\n\n  await getRepository(User).save(userInfo)\n  await getRepository(VerificationToken).delete({\n    userId,\n    token,\n    type: VerificationTokenType.UNLOCK\n  })\n\n  return true\n}\n"]}

package/dist-server/controllers/utils/password-rule.js

@@ -7,8 +7,8 @@ exports.validatePasswordByRule = validatePasswordByRule;
 const tslib_1 = require("tslib");
 const i18next_1 = tslib_1.__importDefault(require("i18next"));
 const env_1 = require("@things-factory/env");
-const error_code_1 = require("../../constants/error-code");
-const auth_error_1 = require("../../errors/auth-error");
+const error_code_js_1 = require("../../constants/error-code.js");
+const auth_error_js_1 = require("../../errors/auth-error.js");
 const passwordConfig = env_1.config.get('password') || {
     lowerCase: true,
     upperCase: true,
@@ -77,8 +77,8 @@ function validatePasswordByRule(password, lng) {
         return;
     }
     const rule = generatePasswordPatternHelp(passwordConfig, lng);
-    throw new auth_error_1.AuthError({
-        errorCode: error_code_1.PASSWORD_PATTERN_NOT_MATCHED,
+    throw new auth_error_js_1.AuthError({
+        errorCode: error_code_js_1.PASSWORD_PATTERN_NOT_MATCHED,
         detail: {
             rule
         }

package/dist-server/controllers/utils/password-rule.js.map

@@ -1 +1 @@
-{"version":3,"file":"password-rule.js","sourceRoot":"","sources":["../../../server/controllers/utils/password-rule.ts"],"names":[],"mappings":"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","sourcesContent":["import i18next from 'i18next'\n\nimport { config } from '@things-factory/env'\n\nimport { PASSWORD_PATTERN_NOT_MATCHED } from '../../constants/error-code'\nimport { AuthError } from '../../errors/auth-error'\n\nconst passwordConfig = config.get('password') || {\n  lowerCase: true,\n  upperCase: true,\n  digit: true,\n  specialCharacter: true,\n  allowRepeat: false,\n  useTightPattern: true,\n  useLoosePattern: false,\n  tightCharacterLength: 8,\n  looseCharacterLength: 15\n}\n\nfunction generatePasswordPatternRegExp({\n  lowerCase = true,\n  upperCase = true,\n  digit = true,\n  specialCharacter = true,\n  allowRepeat = false,\n  useTightPattern = true,\n  useLoosePattern = false,\n  tightCharacterLength = 8,\n  looseCharacterLength = 15\n} = {}) {\n  var tightChecklist = useTightPattern\n    ? [\n        lowerCase ? '(?=.*[a-z])' : '', // has at least one lower case character\n        upperCase ? '(?=.*[A-Z])' : '', // has at least one upper case character\n        digit ? '(?=.*\\\\d)' : '', // has at least one digit\n        specialCharacter ? '(?=.*[!@#$%^&*()])' : '', // has at least one special character\n        !allowRepeat ? '(?!.*(.)\\\\1(?=\\\\1{1,}))' : '', // has not an repeated character more than twice\n        `.{${tightCharacterLength},}` // has a length of 8 and more\n      ]\n    : []\n\n  var looseChecklist = useLoosePattern\n    ? [\n        `.{${looseCharacterLength},}` // has a length of 15 and more\n      ]\n    : []\n\n  var checkList = [\n    '^', // from start\n    ...tightChecklist,\n    tightChecklist.length && looseChecklist.length ? '|' : '',\n    ...looseChecklist,\n    '$' //to the end\"\n  ]\n\n  return new RegExp(checkList.join(''))\n}\n\nexport function generatePasswordPatternHelp(\n  {\n    lowerCase = true,\n    upperCase = true,\n    digit = true,\n    specialCharacter = true,\n    allowRepeat = false,\n    useTightPattern = true,\n    useLoosePattern = false,\n    tightCharacterLength = 8,\n    looseCharacterLength = 15\n  } = {},\n  lng\n) {\n  lng = lng || 'en-US'\n  var descriptions = []\n\n  const t = i18next.getFixedT(lng, 'translations')\n\n  if (useLoosePattern) {\n    descriptions.push(`more than ${looseCharacterLength} characters`)\n  }\n\n  if (useTightPattern) {\n    !useLoosePattern &&\n      descriptions.push(\n        t('text.pattern_minimum_charaters', {\n          length: tightCharacterLength\n        })\n      )\n    lowerCase && descriptions.push(t('text.pattern_atleast_1_lowercase'))\n    upperCase && descriptions.push(t('text.pattern_atleast_1_uppercase'))\n    digit && descriptions.push(t('text.pattern_atleast_1_digit'))\n    specialCharacter && descriptions.push(t('text.pattern_atleast_1_special'))\n    !allowRepeat && descriptions.push(t('text.pattern_not_allowed'))\n  }\n\n  return descriptions.join(', ')\n}\n\nexport const passwordPattern = generatePasswordPatternRegExp(passwordConfig)\nexport function passwordHelp(lng) {\n  return generatePasswordPatternHelp(passwordConfig, lng)\n}\n\nexport function validatePasswordByRule(password, lng) {\n  if (!passwordPattern) {\n    return\n  }\n\n  if (passwordPattern.test(password)) {\n    return\n  }\n\n  const rule = generatePasswordPatternHelp(passwordConfig, lng)\n  throw new AuthError({\n    errorCode: PASSWORD_PATTERN_NOT_MATCHED,\n    detail: {\n      rule\n    }\n  })\n}\n"]}
+{"version":3,"file":"password-rule.js","sourceRoot":"","sources":["../../../server/controllers/utils/password-rule.ts"],"names":[],"mappings":"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","sourcesContent":["import i18next from 'i18next'\n\nimport { config } from '@things-factory/env'\n\nimport { PASSWORD_PATTERN_NOT_MATCHED } from '../../constants/error-code.js'\nimport { AuthError } from '../../errors/auth-error.js'\n\nconst passwordConfig = config.get('password') || {\n  lowerCase: true,\n  upperCase: true,\n  digit: true,\n  specialCharacter: true,\n  allowRepeat: false,\n  useTightPattern: true,\n  useLoosePattern: false,\n  tightCharacterLength: 8,\n  looseCharacterLength: 15\n}\n\nfunction generatePasswordPatternRegExp({\n  lowerCase = true,\n  upperCase = true,\n  digit = true,\n  specialCharacter = true,\n  allowRepeat = false,\n  useTightPattern = true,\n  useLoosePattern = false,\n  tightCharacterLength = 8,\n  looseCharacterLength = 15\n} = {}) {\n  var tightChecklist = useTightPattern\n    ? [\n        lowerCase ? '(?=.*[a-z])' : '', // has at least one lower case character\n        upperCase ? '(?=.*[A-Z])' : '', // has at least one upper case character\n        digit ? '(?=.*\\\\d)' : '', // has at least one digit\n        specialCharacter ? '(?=.*[!@#$%^&*()])' : '', // has at least one special character\n        !allowRepeat ? '(?!.*(.)\\\\1(?=\\\\1{1,}))' : '', // has not an repeated character more than twice\n        `.{${tightCharacterLength},}` // has a length of 8 and more\n      ]\n    : []\n\n  var looseChecklist = useLoosePattern\n    ? [\n        `.{${looseCharacterLength},}` // has a length of 15 and more\n      ]\n    : []\n\n  var checkList = [\n    '^', // from start\n    ...tightChecklist,\n    tightChecklist.length && looseChecklist.length ? '|' : '',\n    ...looseChecklist,\n    '$' //to the end\"\n  ]\n\n  return new RegExp(checkList.join(''))\n}\n\nexport function generatePasswordPatternHelp(\n  {\n    lowerCase = true,\n    upperCase = true,\n    digit = true,\n    specialCharacter = true,\n    allowRepeat = false,\n    useTightPattern = true,\n    useLoosePattern = false,\n    tightCharacterLength = 8,\n    looseCharacterLength = 15\n  } = {},\n  lng\n) {\n  lng = lng || 'en-US'\n  var descriptions = []\n\n  const t = i18next.getFixedT(lng, 'translations')\n\n  if (useLoosePattern) {\n    descriptions.push(`more than ${looseCharacterLength} characters`)\n  }\n\n  if (useTightPattern) {\n    !useLoosePattern &&\n      descriptions.push(\n        t('text.pattern_minimum_charaters', {\n          length: tightCharacterLength\n        })\n      )\n    lowerCase && descriptions.push(t('text.pattern_atleast_1_lowercase'))\n    upperCase && descriptions.push(t('text.pattern_atleast_1_uppercase'))\n    digit && descriptions.push(t('text.pattern_atleast_1_digit'))\n    specialCharacter && descriptions.push(t('text.pattern_atleast_1_special'))\n    !allowRepeat && descriptions.push(t('text.pattern_not_allowed'))\n  }\n\n  return descriptions.join(', ')\n}\n\nexport const passwordPattern = generatePasswordPatternRegExp(passwordConfig)\nexport function passwordHelp(lng) {\n  return generatePasswordPatternHelp(passwordConfig, lng)\n}\n\nexport function validatePasswordByRule(password, lng) {\n  if (!passwordPattern) {\n    return\n  }\n\n  if (passwordPattern.test(password)) {\n    return\n  }\n\n  const rule = generatePasswordPatternHelp(passwordConfig, lng)\n  throw new AuthError({\n    errorCode: PASSWORD_PATTERN_NOT_MATCHED,\n    detail: {\n      rule\n    }\n  })\n}\n"]}

package/dist-server/controllers/utils/save-invitation-token.d.ts

@@ -1,4 +1,4 @@
-import { Invitation } from '../../service/invitation/invitation';
+import { Invitation } from '../../service/invitation/invitation.js';
 export declare function saveInvitationToken(id: any, token: any): Promise<{
     id: any;
     token: any;

package/dist-server/controllers/utils/save-invitation-token.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveInvitationToken = saveInvitationToken;
 const shell_1 = require("@things-factory/shell");
-const invitation_1 = require("../../service/invitation/invitation");
+const invitation_js_1 = require("../../service/invitation/invitation.js");
 async function saveInvitationToken(id, token) {
-    return await (0, shell_1.getRepository)(invitation_1.Invitation).save({
+    return await (0, shell_1.getRepository)(invitation_js_1.Invitation).save({
         id,
         token
     });

package/dist-server/controllers/utils/save-invitation-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"save-invitation-token.js","sourceRoot":"","sources":["../../../server/controllers/utils/save-invitation-token.ts"],"names":[],"mappings":";;AAIA,kDAKC;AATD,iDAAqD;AAErD,oEAAgE;AAEzD,KAAK,UAAU,mBAAmB,CAAC,EAAE,EAAE,KAAK;IACjD,OAAO,MAAM,IAAA,qBAAa,EAAC,uBAAU,CAAC,CAAC,IAAI,CAAC;QAC1C,EAAE;QACF,KAAK;KACN,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { getRepository } from '@things-factory/shell'\n\nimport { Invitation } from '../../service/invitation/invitation'\n\nexport async function saveInvitationToken(id, token) {\n  return await getRepository(Invitation).save({\n    id,\n    token\n  })\n}\n"]}
+{"version":3,"file":"save-invitation-token.js","sourceRoot":"","sources":["../../../server/controllers/utils/save-invitation-token.ts"],"names":[],"mappings":";;AAIA,kDAKC;AATD,iDAAqD;AAErD,0EAAmE;AAE5D,KAAK,UAAU,mBAAmB,CAAC,EAAE,EAAE,KAAK;IACjD,OAAO,MAAM,IAAA,qBAAa,EAAC,0BAAU,CAAC,CAAC,IAAI,CAAC;QAC1C,EAAE;QACF,KAAK;KACN,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { getRepository } from '@things-factory/shell'\n\nimport { Invitation } from '../../service/invitation/invitation.js'\n\nexport async function saveInvitationToken(id, token) {\n  return await getRepository(Invitation).save({\n    id,\n    token\n  })\n}\n"]}

package/dist-server/controllers/utils/save-verification-token.d.ts

@@ -1,4 +1,4 @@
-import { VerificationToken, VerificationTokenType } from '../../service/verification-token/verification-token';
+import { VerificationToken, VerificationTokenType } from '../../service/verification-token/verification-token.js';
 export declare function saveVerificationToken(id: any, token: any, type?: VerificationTokenType): Promise<{
     userId: any;
     token: any;

package/dist-server/controllers/utils/save-verification-token.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveVerificationToken = saveVerificationToken;
 const shell_1 = require("@things-factory/shell");
-const verification_token_1 = require("../../service/verification-token/verification-token");
-async function saveVerificationToken(id, token, type = verification_token_1.VerificationTokenType.ACTIVATION) {
-    const verificationRepo = (0, shell_1.getRepository)(verification_token_1.VerificationToken);
+const verification_token_js_1 = require("../../service/verification-token/verification-token.js");
+async function saveVerificationToken(id, token, type = verification_token_js_1.VerificationTokenType.ACTIVATION) {
+    const verificationRepo = (0, shell_1.getRepository)(verification_token_js_1.VerificationToken);
     return await verificationRepo.save({
         userId: id,
         token,

package/dist-server/controllers/utils/save-verification-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"save-verification-token.js","sourceRoot":"","sources":["../../../server/controllers/utils/save-verification-token.ts"],"names":[],"mappings":";;AAIA,sDAOC;AAXD,iDAAqD;AAErD,4FAA8G;AAEvG,KAAK,UAAU,qBAAqB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,GAAG,0CAAqB,CAAC,UAAU;IAC5F,MAAM,gBAAgB,GAAG,IAAA,qBAAa,EAAC,sCAAiB,CAAC,CAAA;IACzD,OAAO,MAAM,gBAAgB,CAAC,IAAI,CAAC;QACjC,MAAM,EAAE,EAAE;QACV,KAAK;QACL,IAAI;KACL,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { getRepository } from '@things-factory/shell'\n\nimport { VerificationToken, VerificationTokenType } from '../../service/verification-token/verification-token'\n\nexport async function saveVerificationToken(id, token, type = VerificationTokenType.ACTIVATION) {\n  const verificationRepo = getRepository(VerificationToken)\n  return await verificationRepo.save({\n    userId: id,\n    token,\n    type\n  })\n}\n"]}
+{"version":3,"file":"save-verification-token.js","sourceRoot":"","sources":["../../../server/controllers/utils/save-verification-token.ts"],"names":[],"mappings":";;AAIA,sDAOC;AAXD,iDAAqD;AAErD,kGAAiH;AAE1G,KAAK,UAAU,qBAAqB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,GAAG,6CAAqB,CAAC,UAAU;IAC5F,MAAM,gBAAgB,GAAG,IAAA,qBAAa,EAAC,yCAAiB,CAAC,CAAA;IACzD,OAAO,MAAM,gBAAgB,CAAC,IAAI,CAAC;QACjC,MAAM,EAAE,EAAE;QACV,KAAK;QACL,IAAI;KACL,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { getRepository } from '@things-factory/shell'\n\nimport { VerificationToken, VerificationTokenType } from '../../service/verification-token/verification-token.js'\n\nexport async function saveVerificationToken(id, token, type = VerificationTokenType.ACTIVATION) {\n  const verificationRepo = getRepository(VerificationToken)\n  return await verificationRepo.save({\n    userId: id,\n    token,\n    type\n  })\n}\n"]}