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

package/dist-server/constants/error-code.js.map

@@ -1 +1 @@
-{"version":3,"file":"error-code.js","sourceRoot":"","sources":["../../server/constants/error-code.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG,gBAAgB,CAAA;AACjC,QAAA,oBAAoB,GAAG,sBAAsB,CAAA;AAC7C,QAAA,kBAAkB,GAAG,oBAAoB,CAAA;AACzC,QAAA,WAAW,GAAG,aAAa,CAAA;AAC3B,QAAA,YAAY,GAAG,cAAc,CAAA;AAC7B,QAAA,mBAAmB,GAAG,qBAAqB,CAAA;AAC3C,QAAA,kBAAkB,GAAG,oBAAoB,CAAA;AACzC,QAAA,kBAAkB,GAAG,oBAAoB,CAAA;AACzC,QAAA,0BAA0B,GAAG,4BAA4B,CAAA;AACzD,QAAA,aAAa,GAAG,eAAe,CAAA;AAC/B,QAAA,YAAY,GAAG,cAAc,CAAA;AAC7B,QAAA,kBAAkB,GAAG,qBAAqB,CAAA;AAC1C,QAAA,4BAA4B,GAAG,8BAA8B,CAAA;AAC7D,QAAA,4BAA4B,GAAG,gCAAgC,CAAA;AAC/D,QAAA,eAAe,GAAG,iBAAiB,CAAA;AACnC,QAAA,kBAAkB,GAAG,2BAA2B,CAAA;AAChD,QAAA,kBAAkB,GAAG,sCAAsC,CAAA;AAC3D,QAAA,yBAAyB,GAAG,2BAA2B,CAAA;AACvD,QAAA,yBAAyB,GAAG,2BAA2B,CAAA;AACvD,QAAA,UAAU,GAAG,YAAY,CAAA","sourcesContent":["export const USER_NOT_FOUND = 'user not found'\nexport const PASSWORD_NOT_MATCHED = 'password-not-matched'\nexport const USER_NOT_ACTIVATED = 'user not activated'\nexport const USER_LOCKED = 'user-locked'\nexport const USER_DELETED = 'user-deleted'\nexport const NO_AVAILABLE_DOMAIN = 'no-available-domain'\nexport const UNAVAILABLE_DOMAIN = 'unavailable-domain'\nexport const NO_SELECTED_DOMAIN = 'no-selected-domain'\nexport const REDIRECT_TO_DEFAULT_DOMAIN = 'redirect-to-default-domain'\nexport const TOKEN_INVALID = 'token-invalid'\nexport const AUTH_INVALID = 'auth-invalid'\nexport const SUBDOMAIN_NOTFOUND = 'subdomain not found'\nexport const CONFIRM_PASSWORD_NOT_MATCHED = 'confirm password not matched'\nexport const PASSWORD_PATTERN_NOT_MATCHED = 'password should match the rule'\nexport const USER_DUPLICATED = 'user duplicated'\nexport const PASSWORD_USED_PAST = 'password used in the past'\nexport const VERIFICATION_ERROR = 'user or verification token not found'\nexport const AUTHN_VERIFICATION_FAILED = 'authn verification failed'\nexport const USER_CREDENTIAL_NOT_FOUND = 'user credential not found'\nexport const AUTH_ERROR = 'auth error'\n"]}
+{"version":3,"file":"error-code.js","sourceRoot":"","sources":["../../server/constants/error-code.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG,gBAAgB,CAAA;AACjC,QAAA,oBAAoB,GAAG,sBAAsB,CAAA;AAC7C,QAAA,kBAAkB,GAAG,oBAAoB,CAAA;AACzC,QAAA,WAAW,GAAG,aAAa,CAAA;AAC3B,QAAA,YAAY,GAAG,cAAc,CAAA;AAC7B,QAAA,mBAAmB,GAAG,qBAAqB,CAAA;AAC3C,QAAA,kBAAkB,GAAG,oBAAoB,CAAA;AACzC,QAAA,kBAAkB,GAAG,oBAAoB,CAAA;AACzC,QAAA,0BAA0B,GAAG,4BAA4B,CAAA;AACzD,QAAA,aAAa,GAAG,eAAe,CAAA;AAC/B,QAAA,YAAY,GAAG,cAAc,CAAA;AAC7B,QAAA,kBAAkB,GAAG,qBAAqB,CAAA;AAC1C,QAAA,4BAA4B,GAAG,8BAA8B,CAAA;AAC7D,QAAA,4BAA4B,GAAG,gCAAgC,CAAA;AAC/D,QAAA,eAAe,GAAG,iBAAiB,CAAA;AACnC,QAAA,kBAAkB,GAAG,2BAA2B,CAAA;AAChD,QAAA,kBAAkB,GAAG,sCAAsC,CAAA;AAC3D,QAAA,yBAAyB,GAAG,2BAA2B,CAAA;AACvD,QAAA,yBAAyB,GAAG,2BAA2B,CAAA;AACvD,QAAA,oBAAoB,GAAG,sBAAsB,CAAA;AAC7C,QAAA,uBAAuB,GAAG,sBAAsB,CAAA;AAChD,QAAA,UAAU,GAAG,YAAY,CAAA","sourcesContent":["export const USER_NOT_FOUND = 'user not found'\nexport const PASSWORD_NOT_MATCHED = 'password-not-matched'\nexport const USER_NOT_ACTIVATED = 'user not activated'\nexport const USER_LOCKED = 'user-locked'\nexport const USER_DELETED = 'user-deleted'\nexport const NO_AVAILABLE_DOMAIN = 'no-available-domain'\nexport const UNAVAILABLE_DOMAIN = 'unavailable-domain'\nexport const NO_SELECTED_DOMAIN = 'no-selected-domain'\nexport const REDIRECT_TO_DEFAULT_DOMAIN = 'redirect-to-default-domain'\nexport const TOKEN_INVALID = 'token-invalid'\nexport const AUTH_INVALID = 'auth-invalid'\nexport const SUBDOMAIN_NOTFOUND = 'subdomain not found'\nexport const CONFIRM_PASSWORD_NOT_MATCHED = 'confirm password not matched'\nexport const PASSWORD_PATTERN_NOT_MATCHED = 'password should match the rule'\nexport const USER_DUPLICATED = 'user duplicated'\nexport const PASSWORD_USED_PAST = 'password used in the past'\nexport const VERIFICATION_ERROR = 'user or verification token not found'\nexport const AUTHN_VERIFICATION_FAILED = 'authn verification failed'\nexport const USER_CREDENTIAL_NOT_FOUND = 'user credential not found'\nexport const EMAIL_ALREADY_EXISTS = 'email already exists'\nexport const USERNAME_ALREADY_EXISTS = 'email already exists'\nexport const AUTH_ERROR = 'auth error'\n"]}

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

@@ -1,5 +1,5 @@
-export * from './change-pwd';
-export * from './signin';
-export * from './signup';
-export * from './verification';
-export * from './invitation';
+export * from './change-pwd.js';
+export * from './signin.js';
+export * from './signup.js';
+export * from './verification.js';
+export * from './invitation.js';

package/dist-server/controllers/auth.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./change-pwd"), exports);
-tslib_1.__exportStar(require("./signin"), exports);
-tslib_1.__exportStar(require("./signup"), exports);
-tslib_1.__exportStar(require("./verification"), exports);
-tslib_1.__exportStar(require("./invitation"), exports);
+tslib_1.__exportStar(require("./change-pwd.js"), exports);
+tslib_1.__exportStar(require("./signin.js"), exports);
+tslib_1.__exportStar(require("./signup.js"), exports);
+tslib_1.__exportStar(require("./verification.js"), exports);
+tslib_1.__exportStar(require("./invitation.js"), exports);
 //# sourceMappingURL=auth.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../server/controllers/auth.ts"],"names":[],"mappings":";;;AAAA,uDAA4B;AAC5B,mDAAwB;AACxB,mDAAwB;AACxB,yDAA8B;AAC9B,uDAA4B","sourcesContent":["export * from './change-pwd'\nexport * from './signin'\nexport * from './signup'\nexport * from './verification'\nexport * from './invitation'\n"]}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../server/controllers/auth.ts"],"names":[],"mappings":";;;AAAA,0DAA+B;AAC/B,sDAA2B;AAC3B,sDAA2B;AAC3B,4DAAiC;AACjC,0DAA+B","sourcesContent":["export * from './change-pwd.js'\nexport * from './signin.js'\nexport * from './signup.js'\nexport * from './verification.js'\nexport * from './invitation.js'\n"]}

package/dist-server/controllers/change-pwd.js

@@ -1,43 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.changePwd = changePwd;
-const typeorm_1 = require("typeorm");
 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 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 HISTORY_SIZE = env_1.config.get('password', { history: 0 }).history;
 async function changePwd(attrs, currentPass, newPass, confirmPass, context) {
     const { domain } = context.state;
     // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.
-    const repository = (0, shell_1.getRepository)(user_1.User);
-    const user = await repository.findOne({ where: { email: (0, typeorm_1.ILike)(attrs.email) } });
+    const repository = (0, shell_1.getRepository)(user_js_1.User);
+    const user = await repository.findOne({ where: { id: attrs.id } });
     if (!user) {
-        throw new auth_error_1.AuthError({
-            errorCode: error_code_1.USER_NOT_FOUND
+        throw new auth_error_js_1.AuthError({
+            errorCode: error_code_js_1.USER_NOT_FOUND
         });
     }
     if (newPass !== confirmPass) {
-        throw new auth_error_1.AuthError({
-            errorCode: error_code_1.CONFIRM_PASSWORD_NOT_MATCHED
+        throw new auth_error_js_1.AuthError({
+            errorCode: error_code_js_1.CONFIRM_PASSWORD_NOT_MATCHED
         });
     }
-    if (!user_1.User.verify(user.password, currentPass, user.salt)) {
-        throw new auth_error_1.AuthError({
-            errorCode: error_code_1.PASSWORD_NOT_MATCHED,
+    if (!user_js_1.User.verify(user.password, currentPass, user.salt)) {
+        throw new auth_error_js_1.AuthError({
+            errorCode: error_code_js_1.PASSWORD_NOT_MATCHED,
             detail: {
+                username: user.username,
                 email: user.email,
                 failCount: user.failCount
             }
         });
     }
     /* check if password is following the rule */
-    user_1.User.validatePasswordByRule(newPass, context === null || context === void 0 ? void 0 : context.lng);
-    user.password = user_1.User.encode(newPass, user.salt);
+    user_js_1.User.validatePasswordByRule(newPass, context === null || context === void 0 ? void 0 : context.lng);
+    user.password = user_js_1.User.encode(newPass, 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 {
@@ -51,11 +51,11 @@ async function changePwd(attrs, currentPass, newPass, confirmPass, 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, newPass, h.salt);
+                return user_js_1.User.verify(h.password, newPass, 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
                 });
             }
         }
@@ -69,7 +69,7 @@ async function changePwd(attrs, currentPass, newPass, confirmPass, 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/change-pwd.js.map

@@ -1 +1 @@
-{"version":3,"file":"change-pwd.js","sourceRoot":"","sources":["../../server/controllers/change-pwd.ts"],"names":[],"mappings":"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","sourcesContent":["import { ILike } from 'typeorm'\nimport { config } from '@things-factory/env'\nimport { getRepository } from '@things-factory/shell'\n\nimport {\n  CONFIRM_PASSWORD_NOT_MATCHED,\n  PASSWORD_NOT_MATCHED,\n  PASSWORD_USED_PAST,\n  USER_NOT_FOUND\n} from '../constants/error-code'\nimport { AuthError } from '../errors/auth-error'\nimport { PasswordHistory } from '../service/password-history/password-history'\nimport { User } from '../service/user/user'\n\nconst HISTORY_SIZE = config.get('password', { history: 0 }).history\n\nexport async function changePwd(attrs, currentPass, newPass, confirmPass, context) {\n  const { domain } = context.state\n\n  // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.\n  const repository = getRepository(User)\n  const user: User = await repository.findOne({ where: { email: ILike(attrs.email) } })\n\n  if (!user) {\n    throw new AuthError({\n      errorCode: USER_NOT_FOUND\n    })\n  }\n\n  if (newPass !== confirmPass) {\n    throw new AuthError({\n      errorCode: CONFIRM_PASSWORD_NOT_MATCHED\n    })\n  }\n\n  if (!User.verify(user.password, currentPass, user.salt)) {\n    throw new AuthError({\n      errorCode: PASSWORD_NOT_MATCHED,\n      detail: {\n        email: user.email,\n        failCount: user.failCount\n      }\n    })\n  }\n\n  /* check if password is following the rule */\n  User.validatePasswordByRule(newPass, context?.lng)\n\n  user.password = User.encode(newPass, 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, newPass, h.salt)\n      })\n\n      if (found) {\n        throw new AuthError({\n          errorCode: PASSWORD_USED_PAST\n        })\n      }\n    }\n  }\n\n  await repository.save({\n    ...user,\n    passwordUpdatedAt: new Date()\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  return await user.sign({ subdomain: domain.subdomain })\n}\n"]}
+{"version":3,"file":"change-pwd.js","sourceRoot":"","sources":["../../server/controllers/change-pwd.ts"],"names":[],"mappings":"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","sourcesContent":["import { config } from '@things-factory/env'\nimport { getRepository } from '@things-factory/shell'\n\nimport {\n  CONFIRM_PASSWORD_NOT_MATCHED,\n  PASSWORD_NOT_MATCHED,\n  PASSWORD_USED_PAST,\n  USER_NOT_FOUND\n} 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'\n\nconst HISTORY_SIZE = config.get('password', { history: 0 }).history\n\nexport async function changePwd(attrs, currentPass, newPass, confirmPass, context) {\n  const { domain } = context.state\n\n  // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.\n  const repository = getRepository(User)\n\n  const user: User = await repository.findOne({ where: { id: attrs.id } })\n\n  if (!user) {\n    throw new AuthError({\n      errorCode: USER_NOT_FOUND\n    })\n  }\n\n  if (newPass !== confirmPass) {\n    throw new AuthError({\n      errorCode: CONFIRM_PASSWORD_NOT_MATCHED\n    })\n  }\n\n  if (!User.verify(user.password, currentPass, user.salt)) {\n    throw new AuthError({\n      errorCode: PASSWORD_NOT_MATCHED,\n      detail: {\n        username: user.username,\n        email: user.email,\n        failCount: user.failCount\n      }\n    })\n  }\n\n  /* check if password is following the rule */\n  User.validatePasswordByRule(newPass, context?.lng)\n\n  user.password = User.encode(newPass, 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, newPass, h.salt)\n      })\n\n      if (found) {\n        throw new AuthError({\n          errorCode: PASSWORD_USED_PAST\n        })\n      }\n    }\n  }\n\n  await repository.save({\n    ...user,\n    passwordUpdatedAt: new Date()\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  return await user.sign({ subdomain: domain.subdomain })\n}\n"]}

package/dist-server/controllers/checkin.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkin = checkin;
 const shell_1 = require("@things-factory/shell");
-const user_1 = require("../service/user/user");
-const get_user_domains_1 = require("../utils/get-user-domains");
+const user_js_1 = require("../service/user/user.js");
+const get_user_domains_js_1 = require("../utils/get-user-domains.js");
 async function checkin({ userId, subdomain }) {
-    const userRepo = (0, shell_1.getRepository)(user_1.User);
+    const userRepo = (0, shell_1.getRepository)(user_js_1.User);
     const user = await userRepo.findOne({ where: { id: userId } });
-    const domains = await (0, get_user_domains_1.getUserDomains)(user);
+    const domains = await (0, get_user_domains_js_1.getUserDomains)(user);
     if (!(domains === null || domains === void 0 ? void 0 : domains.length)) {
         return false;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"checkin.js","sourceRoot":"","sources":["../../server/controllers/checkin.ts"],"names":[],"mappings":";;AAKA,0BAeC;AApBD,iDAA6D;AAE7D,+CAA2C;AAC3C,gEAA0D;AAEnD,KAAK,UAAU,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE;IACjD,MAAM,QAAQ,GAAG,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAA;IACpC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;IAC9D,MAAM,OAAO,GAAsB,MAAM,IAAA,iCAAc,EAAC,IAAI,CAAC,CAAA;IAE7D,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAA,EAAE,CAAC;QACrB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,IAAI,SAAS,CAAC,CAAA;IACpE,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAA;IACd,CAAC;IAED,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;AACvC,CAAC","sourcesContent":["import { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../service/user/user'\nimport { getUserDomains } from '../utils/get-user-domains'\n\nexport async function checkin({ userId, subdomain }) {\n  const userRepo = getRepository(User)\n  const user = await userRepo.findOne({ where: { id: userId } })\n  const domains: Partial<Domain>[] = await getUserDomains(user)\n\n  if (!domains?.length) {\n    return false\n  }\n\n  const domain = domains.find(domain => domain.subdomain == subdomain)\n  if (!domain) {\n    return false\n  }\n\n  return await user.sign({ subdomain })\n}\n"]}
+{"version":3,"file":"checkin.js","sourceRoot":"","sources":["../../server/controllers/checkin.ts"],"names":[],"mappings":";;AAKA,0BAeC;AApBD,iDAA6D;AAE7D,qDAA8C;AAC9C,sEAA6D;AAEtD,KAAK,UAAU,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE;IACjD,MAAM,QAAQ,GAAG,IAAA,qBAAa,EAAC,cAAI,CAAC,CAAA;IACpC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;IAC9D,MAAM,OAAO,GAAsB,MAAM,IAAA,oCAAc,EAAC,IAAI,CAAC,CAAA;IAE7D,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAA,EAAE,CAAC;QACrB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,IAAI,SAAS,CAAC,CAAA;IACpE,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAA;IACd,CAAC;IAED,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;AACvC,CAAC","sourcesContent":["import { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../service/user/user.js'\nimport { getUserDomains } from '../utils/get-user-domains.js'\n\nexport async function checkin({ userId, subdomain }) {\n  const userRepo = getRepository(User)\n  const user = await userRepo.findOne({ where: { id: userId } })\n  const domains: Partial<Domain>[] = await getUserDomains(user)\n\n  if (!domains?.length) {\n    return false\n  }\n\n  const domain = domains.find(domain => domain.subdomain == subdomain)\n  if (!domain) {\n    return false\n  }\n\n  return await user.sign({ subdomain })\n}\n"]}

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

@@ -3,45 +3,46 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteUser = deleteUser;
 exports.deleteUsers = deleteUsers;
 const typeorm_1 = require("typeorm");
-const user_1 = require("../service/user/user");
-const auth_error_1 = require("../errors/auth-error");
-const error_code_1 = require("../constants/error-code");
+const user_js_1 = require("../service/user/user.js");
+const auth_error_js_1 = require("../errors/auth-error.js");
+const error_code_js_1 = require("../constants/error-code.js");
 async function deleteUser(attrs, tx) {
     // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.
     // TODO 다른 도메인에도 포함되어있다면, domains-users 관게와 해당 도메인 관련 정보만 삭제해야 함.
-    const repository = tx === null || tx === void 0 ? void 0 : tx.getRepository(user_1.User);
-    const user = await repository.findOne({ where: { email: (0, typeorm_1.ILike)(attrs.email) } });
+    const repository = tx === null || tx === void 0 ? void 0 : tx.getRepository(user_js_1.User);
+    const { username } = attrs;
+    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: error_code_1.USER_NOT_FOUND
+        throw new auth_error_js_1.AuthError({
+            errorCode: error_code_js_1.USER_NOT_FOUND
         });
     }
-    user.status = user_1.UserStatus.DELETED;
+    user.status = user_js_1.UserStatus.DELETED;
     user.domains = [];
     await repository.save(user);
-    // repository api는 작동하지 않음.
-    // await txManager
-    //   .createQueryBuilder()
-    //   .delete()
-    //   .from('users_domains')
-    //   .where({
-    //     usersId: user.id
-    //   })
-    //   .execute()
 }
 async function deleteUsers(attrs, tx) {
     // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.
     // TODO 다른 도메인에도 포함되어있다면, domains-users 관게와 해당 도메인 관련 정보만 삭제해야 함.
-    const { emails } = attrs;
-    const repo = tx === null || tx === void 0 ? void 0 : tx.getRepository(user_1.User);
+    const { usernames } = attrs;
+    const repo = tx === null || tx === void 0 ? void 0 : tx.getRepository(user_js_1.User);
     const users = await repo.find({
         where: {
-            email: (0, typeorm_1.In)(emails)
+            username: (0, typeorm_1.In)(usernames)
         }
     });
     const userIds = [];
     users.forEach(user => {
-        user.status = user_1.UserStatus.DELETED;
+        user.status = user_js_1.UserStatus.DELETED;
         user.domains = [];
         userIds.push(user.id);
     });

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

@@ -1 +1 @@
-{"version":3,"file":"delete-user.js","sourceRoot":"","sources":["../../server/controllers/delete-user.ts"],"names":[],"mappings":";;AAKA,gCA0BC;AAED,kCAkCC;AAnED,qCAAkD;AAClD,+CAAuD;AACvD,qDAAgD;AAChD,wDAAwD;AAEjD,KAAK,UAAU,UAAU,CAAC,KAAK,EAAE,EAAkB;IACxD,qCAAqC;IACrC,iEAAiE;IAEjE,MAAM,UAAU,GAAG,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,WAAI,CAAC,CAAA;IAC1C,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAA,eAAK,EAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAA;IAC/E,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,sBAAS,CAAC;YAClB,SAAS,EAAE,2BAAc;SAC1B,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,CAAC,MAAM,GAAG,iBAAU,CAAC,OAAO,CAAA;IAChC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAA;IAEjB,MAAM,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAE3B,2BAA2B;IAC3B,kBAAkB;IAClB,0BAA0B;IAC1B,cAAc;IACd,2BAA2B;IAC3B,aAAa;IACb,uBAAuB;IACvB,OAAO;IACP,eAAe;AACjB,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,KAAK,EAAE,EAAkB;IACzD,qCAAqC;IACrC,iEAAiE;IAEjE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAA;IAExB,MAAM,IAAI,GAAG,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,WAAI,CAAC,CAAA;IAEpC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;QAC5B,KAAK,EAAE;YACL,KAAK,EAAE,IAAA,YAAE,EAAC,MAAM,CAAC;SAClB;KACF,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,EAAE,CAAA;IAClB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,IAAI,CAAC,MAAM,GAAG,iBAAU,CAAC,OAAO,CAAA;QAChC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAA;QAEjB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;IAEF,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAEtB,2BAA2B;IAC3B,kBAAkB;IAClB,0BAA0B;IAC1B,cAAc;IACd,2BAA2B;IAC3B,aAAa;IACb,2BAA2B;IAC3B,OAAO;IACP,eAAe;IACf,OAAO,IAAI,CAAA;AACb,CAAC","sourcesContent":["import { EntityManager, ILike, In } from 'typeorm'\nimport { User, UserStatus } from '../service/user/user'\nimport { AuthError } from '../errors/auth-error'\nimport { USER_NOT_FOUND } from '../constants/error-code'\n\nexport async function deleteUser(attrs, tx?: EntityManager) {\n  // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.\n  // TODO 다른 도메인에도 포함되어있다면, domains-users 관게와 해당 도메인 관련 정보만 삭제해야 함.\n\n  const repository = tx?.getRepository(User)\n  const user = await repository.findOne({ where: { email: ILike(attrs.email) } })\n  if (!user) {\n    throw new AuthError({\n      errorCode: USER_NOT_FOUND\n    })\n  }\n\n  user.status = UserStatus.DELETED\n  user.domains = []\n\n  await repository.save(user)\n\n  // repository api는 작동하지 않음.\n  // await txManager\n  //   .createQueryBuilder()\n  //   .delete()\n  //   .from('users_domains')\n  //   .where({\n  //     usersId: user.id\n  //   })\n  //   .execute()\n}\n\nexport async function deleteUsers(attrs, tx?: EntityManager) {\n  // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.\n  // TODO 다른 도메인에도 포함되어있다면, domains-users 관게와 해당 도메인 관련 정보만 삭제해야 함.\n\n  const { emails } = attrs\n\n  const repo = tx?.getRepository(User)\n\n  const users = await repo.find({\n    where: {\n      email: In(emails)\n    }\n  })\n\n  const userIds = []\n  users.forEach(user => {\n    user.status = UserStatus.DELETED\n    user.domains = []\n\n    userIds.push(user.id)\n  })\n\n  await repo.save(users)\n\n  // repository api는 작동하지 않음.\n  // await txManager\n  //   .createQueryBuilder()\n  //   .delete()\n  //   .from('users_domains')\n  //   .where({\n  //     usersId: In(userIds)\n  //   })\n  //   .execute()\n  return true\n}\n"]}
+{"version":3,"file":"delete-user.js","sourceRoot":"","sources":["../../server/controllers/delete-user.ts"],"names":[],"mappings":";;AAKA,gCA6BC;AAED,kCAkCC;AAtED,qCAAkD;AAClD,qDAA0D;AAC1D,2DAAmD;AACnD,8DAA2D;AAEpD,KAAK,UAAU,UAAU,CAAC,KAAK,EAAE,EAAkB;IACxD,qCAAqC;IACrC,iEAAiE;IAEjE,MAAM,UAAU,GAAG,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,cAAI,CAAC,CAAA;IAC1C,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;IAE1B,IAAI,IAAI,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAClC,KAAK,EAAE,EAAE,QAAQ,EAAE;QACnB,SAAS,EAAE,CAAC,SAAS,CAAC;KACvB,CAAC,CAAA;IAEF,IAAI,CAAC,IAAI,IAAI,4BAA4B,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzD,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,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,yBAAS,CAAC;YAClB,SAAS,EAAE,8BAAc;SAC1B,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,CAAC,MAAM,GAAG,oBAAU,CAAC,OAAO,CAAA;IAChC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAA;IAEjB,MAAM,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC7B,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,KAAK,EAAE,EAAkB;IACzD,qCAAqC;IACrC,iEAAiE;IAEjE,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAA;IAE3B,MAAM,IAAI,GAAG,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,cAAI,CAAC,CAAA;IAEpC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;QAC5B,KAAK,EAAE;YACL,QAAQ,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC;SACxB;KACF,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,EAAE,CAAA;IAClB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,IAAI,CAAC,MAAM,GAAG,oBAAU,CAAC,OAAO,CAAA;QAChC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAA;QAEjB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;IAEF,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAEtB,2BAA2B;IAC3B,kBAAkB;IAClB,0BAA0B;IAC1B,cAAc;IACd,2BAA2B;IAC3B,aAAa;IACb,2BAA2B;IAC3B,OAAO;IACP,eAAe;IACf,OAAO,IAAI,CAAA;AACb,CAAC","sourcesContent":["import { EntityManager, ILike, In } from 'typeorm'\nimport { User, UserStatus } from '../service/user/user.js'\nimport { AuthError } from '../errors/auth-error.js'\nimport { USER_NOT_FOUND } from '../constants/error-code.js'\n\nexport async function deleteUser(attrs, tx?: EntityManager) {\n  // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.\n  // TODO 다른 도메인에도 포함되어있다면, domains-users 관게와 해당 도메인 관련 정보만 삭제해야 함.\n\n  const repository = tx?.getRepository(User)\n  const { username } = attrs\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: { email: ILike(username) },\n      relations: ['domains']\n    })\n  }\n\n  if (!user) {\n    throw new AuthError({\n      errorCode: USER_NOT_FOUND\n    })\n  }\n\n  user.status = UserStatus.DELETED\n  user.domains = []\n\n  await repository.save(user)\n}\n\nexport async function deleteUsers(attrs, tx?: EntityManager) {\n  // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.\n  // TODO 다른 도메인에도 포함되어있다면, domains-users 관게와 해당 도메인 관련 정보만 삭제해야 함.\n\n  const { usernames } = attrs\n\n  const repo = tx?.getRepository(User)\n\n  const users = await repo.find({\n    where: {\n      username: In(usernames)\n    }\n  })\n\n  const userIds = []\n  users.forEach(user => {\n    user.status = UserStatus.DELETED\n    user.domains = []\n\n    userIds.push(user.id)\n  })\n\n  await repo.save(users)\n\n  // repository api는 작동하지 않음.\n  // await txManager\n  //   .createQueryBuilder()\n  //   .delete()\n  //   .from('users_domains')\n  //   .where({\n  //     usersId: In(userIds)\n  //   })\n  //   .execute()\n  return true\n}\n"]}

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

@@ -1,7 +1,8 @@
 export declare function invite(attrs: any, withEmailInvitation?: Boolean): Promise<boolean>;
 export declare function acceptInvitation(token: any): Promise<boolean>;
-export declare function sendInvitationEmail({ invitation, context }: {
+export declare function sendInvitationEmail({ invitation, user, context }: {
     invitation: any;
+    user: any;
     context: any;
 }): Promise<boolean>;
 export declare function resendInvitationEmail({ email, reference, type }: {

package/dist-server/controllers/invitation.js

@@ -8,14 +8,24 @@ const typeorm_1 = require("typeorm");
 const url_1 = require("url");
 const email_base_1 = require("@things-factory/email-base");
 const shell_1 = require("@things-factory/shell");
-const invitation_1 = require("../service/invitation/invitation");
-const user_1 = require("../service/user/user");
-const invitation_email_1 = require("../templates/invitation-email");
-const make_invitation_token_1 = require("./utils/make-invitation-token");
-const save_invitation_token_1 = require("./utils/save-invitation-token");
+const invitation_js_1 = require("../service/invitation/invitation.js");
+const user_js_1 = require("../service/user/user.js");
+const invitation_email_js_1 = require("../templates/invitation-email.js");
+const make_invitation_token_js_1 = require("./utils/make-invitation-token.js");
+const save_invitation_token_js_1 = require("./utils/save-invitation-token.js");
 async function invite(attrs, withEmailInvitation) {
-    const { email, reference, type, context } = attrs;
-    var user = await (0, shell_1.getRepository)(user_1.User).findOne({ where: { email: (0, typeorm_1.ILike)(email) }, relations: ['domains'] });
+    const { username, reference, type, context } = 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']
+        });
+    }
     var domains = user.domains;
     // TODO reference should not be a domain.id (security reason)
     if (user) {
@@ -26,13 +36,15 @@ async function invite(attrs, withEmailInvitation) {
         }
     }
     if (withEmailInvitation) {
-        var invitation = await (0, shell_1.getRepository)(invitation_1.Invitation).findOneBy({
+        const email = user.email;
+        // TODO 초대장의 유효기간을 설정할 수 있어야 함.
+        var invitation = await (0, shell_1.getRepository)(invitation_js_1.Invitation).findOneBy({
             email: (0, typeorm_1.ILike)(email),
             reference,
             type
         });
         if (!invitation) {
-            invitation = await (0, shell_1.getRepository)(invitation_1.Invitation).save({
+            invitation = await (0, shell_1.getRepository)(invitation_js_1.Invitation).save({
                 email,
                 reference,
                 type
@@ -40,26 +52,27 @@ async function invite(attrs, withEmailInvitation) {
         }
         return await sendInvitationEmail({
             invitation,
+            user,
             context
         });
     }
     if (user) {
         user.domains = [...domains, await (0, shell_1.getRepository)(shell_1.Domain).findOneBy({ id: reference })];
-        await (0, shell_1.getRepository)(user_1.User).save(user);
+        await (0, shell_1.getRepository)(user_js_1.User).save(user);
     }
     else {
         // TODO need to signup
     }
 }
 async function acceptInvitation(token) {
-    var invitation = await (0, shell_1.getRepository)(invitation_1.Invitation).findOneBy({
+    var invitation = await (0, shell_1.getRepository)(invitation_js_1.Invitation).findOneBy({
         token
     });
     if (!invitation) {
         throw new Error(`not found invitation.`);
     }
     var { email, reference, type } = invitation;
-    var user = await (0, shell_1.getRepository)(user_1.User).findOne({ where: { email: (0, typeorm_1.ILike)(email) }, relations: ['domains'] });
+    var user = await (0, shell_1.getRepository)(user_js_1.User).findOne({ where: { email: (0, typeorm_1.ILike)(email) }, relations: ['domains'] });
     if (user) {
         var domains = user.domains;
         const domain = domains.find(domain => domain.id == reference);
@@ -68,24 +81,25 @@ async function acceptInvitation(token) {
             throw new Error(msg);
         }
         user.domains = [...domains, await (0, shell_1.getRepository)(shell_1.Domain).findOneBy({ id: reference })];
-        await (0, shell_1.getRepository)(user_1.User).save(user);
-        await (0, shell_1.getRepository)(invitation_1.Invitation).delete(invitation.id);
+        await (0, shell_1.getRepository)(user_js_1.User).save(user);
+        await (0, shell_1.getRepository)(invitation_js_1.Invitation).delete(invitation.id);
     }
     else {
         // TODO goto signup
     }
     return true;
 }
-async function sendInvitationEmail({ invitation, context }) {
+async function sendInvitationEmail({ invitation, user, context }) {
     try {
-        var token = (0, make_invitation_token_1.makeInvitationToken)();
-        var verifaction = await (0, save_invitation_token_1.saveInvitationToken)(invitation.id, token);
+        var token = (0, make_invitation_token_js_1.makeInvitationToken)();
+        var verifaction = await (0, save_invitation_token_js_1.saveInvitationToken)(invitation.id, token);
         if (verifaction) {
             var serviceUrl = new url_1.URL(`/auth/accept/${token}`, context.header.referer);
             await (0, email_base_1.sendEmail)({
                 receiver: invitation.email,
                 subject: 'Invitation',
-                content: (0, invitation_email_1.getInvitationEmailForm)({
+                content: (0, invitation_email_js_1.getInvitationEmailForm)({
+                    username: user.username,
                     email: invitation.email,
                     acceptUrl: serviceUrl
                 })
@@ -98,15 +112,26 @@ async function sendInvitationEmail({ invitation, context }) {
     }
 }
 async function resendInvitationEmail({ email, reference, type }, context) {
-    var invitation = await (0, shell_1.getRepository)(invitation_1.Invitation).findOneBy({
+    var invitation = await (0, shell_1.getRepository)(invitation_js_1.Invitation).findOneBy({
         email: (0, typeorm_1.ILike)(email),
         reference,
         type
     });
-    if (!invitation)
-        return false;
+    if (!invitation) {
+        throw new Error(`not found invitation.`);
+    }
+    var user = await (0, shell_1.getRepository)(user_js_1.User).findOne({
+        where: {
+            email: (0, typeorm_1.ILike)(email),
+            status: user_js_1.UserStatus.ACTIVATED
+        }
+    });
+    if (!user) {
+        throw new Error(`user not found: ${email}`);
+    }
     return await sendInvitationEmail({
         invitation,
+        user,
         context
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"invitation.js","sourceRoot":"","sources":["../../server/controllers/invitation.ts"],"names":[],"mappings":";;AAYA,wBA4CC;AAED,4CA+BC;AAED,kDAsBC;AAED,sDAgBC;AAnID,qCAA+B;AAC/B,6BAAyB;AAEzB,2DAAsD;AACtD,iDAA6D;AAE7D,iEAA6D;AAC7D,+CAA2C;AAC3C,oEAAsE;AACtE,yEAAmE;AACnE,yEAAmE;AAE5D,KAAK,UAAU,MAAM,CAAC,KAAK,EAAE,mBAA6B;IAC/D,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;IAEjD,IAAI,IAAI,GAAG,MAAM,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAA,eAAK,EAAC,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IACxG,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;IAE1B,6DAA6D;IAE7D,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,SAAS,CAAC,CAAA;QAE7D,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,GAAG,GAAG,gCAAgC,IAAI,GAAG,CAAA;YACnD,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;QACtB,CAAC;IACH,CAAC;IAED,IAAI,mBAAmB,EAAE,CAAC;QACxB,IAAI,UAAU,GAAG,MAAM,IAAA,qBAAa,EAAC,uBAAU,CAAC,CAAC,SAAS,CAAC;YACzD,KAAK,EAAE,IAAA,eAAK,EAAC,KAAK,CAAC;YACnB,SAAS;YACT,IAAI;SACL,CAAC,CAAA;QAEF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,UAAU,GAAG,MAAM,IAAA,qBAAa,EAAC,uBAAU,CAAC,CAAC,IAAI,CAAC;gBAChD,KAAK;gBACL,SAAS;gBACT,IAAI;aACL,CAAC,CAAA;QACJ,CAAC;QAED,OAAO,MAAM,mBAAmB,CAAC;YAC/B,UAAU;YACV,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,CAAC,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,MAAM,IAAA,qBAAa,EAAC,cAAM,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;QACrF,MAAM,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACtC,CAAC;SAAM,CAAC;QACN,sBAAsB;IACxB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,KAAK;IAC1C,IAAI,UAAU,GAAG,MAAM,IAAA,qBAAa,EAAC,uBAAU,CAAC,CAAC,SAAS,CAAC;QACzD,KAAK;KACN,CAAC,CAAA;IAEF,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;IAC1C,CAAC;IAED,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,UAAU,CAAA;IAE3C,IAAI,IAAI,GAAG,MAAM,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAA,eAAK,EAAC,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAExG,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,SAAS,CAAC,CAAA;QAE7D,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,GAAG,GAAG,gCAAgC,IAAI,GAAG,CAAA;YACnD,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;QACtB,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,MAAM,IAAA,qBAAa,EAAC,cAAM,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;QACrF,MAAM,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEpC,MAAM,IAAA,qBAAa,EAAC,uBAAU,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;IACvD,CAAC;SAAM,CAAC;QACN,mBAAmB;IACrB,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE;IAC/D,IAAI,CAAC;QACH,IAAI,KAAK,GAAG,IAAA,2CAAmB,GAAE,CAAA;QACjC,IAAI,WAAW,GAAG,MAAM,IAAA,2CAAmB,EAAC,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;QAEjE,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,UAAU,GAAG,IAAI,SAAG,CAAC,gBAAgB,KAAK,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YAEzE,MAAM,IAAA,sBAAS,EAAC;gBACd,QAAQ,EAAE,UAAU,CAAC,KAAK;gBAC1B,OAAO,EAAE,YAAY;gBACrB,OAAO,EAAE,IAAA,yCAAsB,EAAC;oBAC9B,KAAK,EAAE,UAAU,CAAC,KAAK;oBACvB,SAAS,EAAE,UAAU;iBACtB,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,qBAAqB,CACzC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAsD,EAC9E,OAAO;IAEP,IAAI,UAAU,GAAG,MAAM,IAAA,qBAAa,EAAC,uBAAU,CAAC,CAAC,SAAS,CAAC;QACzD,KAAK,EAAE,IAAA,eAAK,EAAC,KAAK,CAAC;QACnB,SAAS;QACT,IAAI;KACL,CAAC,CAAA;IAEF,IAAI,CAAC,UAAU;QAAE,OAAO,KAAK,CAAA;IAE7B,OAAO,MAAM,mBAAmB,CAAC;QAC/B,UAAU;QACV,OAAO;KACR,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { ILike } from 'typeorm'\nimport { URL } from 'url'\n\nimport { sendEmail } from '@things-factory/email-base'\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { Invitation } from '../service/invitation/invitation'\nimport { User } from '../service/user/user'\nimport { getInvitationEmailForm } from '../templates/invitation-email'\nimport { makeInvitationToken } from './utils/make-invitation-token'\nimport { saveInvitationToken } from './utils/save-invitation-token'\n\nexport async function invite(attrs, withEmailInvitation?: Boolean) {\n  const { email, reference, type, context } = attrs\n\n  var user = await getRepository(User).findOne({ where: { email: ILike(email) }, relations: ['domains'] })\n  var domains = user.domains\n\n  // TODO reference should not be a domain.id (security reason)\n\n  if (user) {\n    const domain = domains.find(domain => domain.id == reference)\n\n    if (domain) {\n      const msg = `user already a member of the ${type}.`\n      throw new Error(msg)\n    }\n  }\n\n  if (withEmailInvitation) {\n    var invitation = await getRepository(Invitation).findOneBy({\n      email: ILike(email),\n      reference,\n      type\n    })\n\n    if (!invitation) {\n      invitation = await getRepository(Invitation).save({\n        email,\n        reference,\n        type\n      })\n    }\n\n    return await sendInvitationEmail({\n      invitation,\n      context\n    })\n  }\n\n  if (user) {\n    user.domains = [...domains, await getRepository(Domain).findOneBy({ id: reference })]\n    await getRepository(User).save(user)\n  } else {\n    // TODO need to signup\n  }\n}\n\nexport async function acceptInvitation(token) {\n  var invitation = await getRepository(Invitation).findOneBy({\n    token\n  })\n\n  if (!invitation) {\n    throw new Error(`not found invitation.`)\n  }\n\n  var { email, reference, type } = invitation\n\n  var user = await getRepository(User).findOne({ where: { email: ILike(email) }, relations: ['domains'] })\n\n  if (user) {\n    var domains = user.domains\n    const domain = domains.find(domain => domain.id == reference)\n\n    if (domain) {\n      const msg = `user already a member of the ${type}.`\n      throw new Error(msg)\n    }\n\n    user.domains = [...domains, await getRepository(Domain).findOneBy({ id: reference })]\n    await getRepository(User).save(user)\n\n    await getRepository(Invitation).delete(invitation.id)\n  } else {\n    // TODO goto signup\n  }\n\n  return true\n}\n\nexport async function sendInvitationEmail({ invitation, context }) {\n  try {\n    var token = makeInvitationToken()\n    var verifaction = await saveInvitationToken(invitation.id, token)\n\n    if (verifaction) {\n      var serviceUrl = new URL(`/auth/accept/${token}`, context.header.referer)\n\n      await sendEmail({\n        receiver: invitation.email,\n        subject: 'Invitation',\n        content: getInvitationEmailForm({\n          email: invitation.email,\n          acceptUrl: serviceUrl\n        })\n      })\n\n      return true\n    }\n  } catch (e) {\n    return false\n  }\n}\n\nexport async function resendInvitationEmail(\n  { email, reference, type }: { email: string; reference: string; type: string },\n  context\n) {\n  var invitation = await getRepository(Invitation).findOneBy({\n    email: ILike(email),\n    reference,\n    type\n  })\n\n  if (!invitation) return false\n\n  return await sendInvitationEmail({\n    invitation,\n    context\n  })\n}\n"]}
+{"version":3,"file":"invitation.js","sourceRoot":"","sources":["../../server/controllers/invitation.ts"],"names":[],"mappings":"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","sourcesContent":["import { ILike } from 'typeorm'\nimport { URL } from 'url'\n\nimport { sendEmail } from '@things-factory/email-base'\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { Invitation } from '../service/invitation/invitation.js'\nimport { User, UserStatus } from '../service/user/user.js'\nimport { getInvitationEmailForm } from '../templates/invitation-email.js'\nimport { makeInvitationToken } from './utils/make-invitation-token.js'\nimport { saveInvitationToken } from './utils/save-invitation-token.js'\n\nexport async function invite(attrs, withEmailInvitation?: Boolean) {\n  const { username, reference, type, context } = attrs\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: { email: ILike(username) },\n      relations: ['domains']\n    })\n  }\n\n  var domains = user.domains\n\n  // TODO reference should not be a domain.id (security reason)\n\n  if (user) {\n    const domain = domains.find(domain => domain.id == reference)\n\n    if (domain) {\n      const msg = `user already a member of the ${type}.`\n      throw new Error(msg)\n    }\n  }\n\n  if (withEmailInvitation) {\n    const email = user.email\n\n    // TODO 초대장의 유효기간을 설정할 수 있어야 함.\n    var invitation = await getRepository(Invitation).findOneBy({\n      email: ILike(email),\n      reference,\n      type\n    })\n\n    if (!invitation) {\n      invitation = await getRepository(Invitation).save({\n        email,\n        reference,\n        type\n      })\n    }\n\n    return await sendInvitationEmail({\n      invitation,\n      user,\n      context\n    })\n  }\n\n  if (user) {\n    user.domains = [...domains, await getRepository(Domain).findOneBy({ id: reference })]\n    await getRepository(User).save(user)\n  } else {\n    // TODO need to signup\n  }\n}\n\nexport async function acceptInvitation(token) {\n  var invitation = await getRepository(Invitation).findOneBy({\n    token\n  })\n\n  if (!invitation) {\n    throw new Error(`not found invitation.`)\n  }\n\n  var { email, reference, type } = invitation\n\n  var user = await getRepository(User).findOne({ where: { email: ILike(email) }, relations: ['domains'] })\n\n  if (user) {\n    var domains = user.domains\n    const domain = domains.find(domain => domain.id == reference)\n\n    if (domain) {\n      const msg = `user already a member of the ${type}.`\n      throw new Error(msg)\n    }\n\n    user.domains = [...domains, await getRepository(Domain).findOneBy({ id: reference })]\n    await getRepository(User).save(user)\n\n    await getRepository(Invitation).delete(invitation.id)\n  } else {\n    // TODO goto signup\n  }\n\n  return true\n}\n\nexport async function sendInvitationEmail({ invitation, user, context }) {\n  try {\n    var token = makeInvitationToken()\n    var verifaction = await saveInvitationToken(invitation.id, token)\n\n    if (verifaction) {\n      var serviceUrl = new URL(`/auth/accept/${token}`, context.header.referer)\n\n      await sendEmail({\n        receiver: invitation.email,\n        subject: 'Invitation',\n        content: getInvitationEmailForm({\n          username: user.username,\n          email: invitation.email,\n          acceptUrl: serviceUrl\n        })\n      })\n\n      return true\n    }\n  } catch (e) {\n    return false\n  }\n}\n\nexport async function resendInvitationEmail(\n  { email, reference, type }: { email: string; reference: string; type: string },\n  context\n) {\n  var invitation = await getRepository(Invitation).findOneBy({\n    email: ILike(email),\n    reference,\n    type\n  })\n\n  if (!invitation) {\n    throw new Error(`not found invitation.`)\n  }\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  return await sendInvitationEmail({\n    invitation,\n    user,\n    context\n  })\n}\n"]}

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

@@ -1,25 +1,26 @@
-import { User } from '../service/user/user';
+import { User } from '../service/user/user.js';
 export declare function updateProfile({ id }: {
     id: any;
 }, newProfiles: any): Promise<{
-    id: string;
+    username: string;
     name: string;
+    email: string;
+    locale: string;
+    id: string;
     description: string;
     domains?: import("@things-factory/shell").Domain[];
-    email: string;
     password: string;
-    roles?: import("..").Role[];
+    roles?: import("../index.js").Role[];
     userType: string;
     reference: string;
     salt: string;
-    locale: string;
     ssoId: string;
-    status: import("../service/user/user").UserStatus;
+    status: import("../service/user/user.js").UserStatus;
     failCount: number;
     passwordUpdatedAt: Date;
     owner: boolean;
-    credentials: import("..").WebAuthCredential[];
-    usersAuthProviders: import("..").UsersAuthProviders[];
+    credentials: import("../index.js").WebAuthCredential[];
+    usersAuthProviders: import("../index.js").UsersAuthProviders[];
     creator: User;
     creatorId: string;
     updater: User;

package/dist-server/controllers/profile.js

@@ -1,25 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProfile = updateProfile;
+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 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");
 async function updateProfile({ id }, newProfiles) {
-    const repository = (0, shell_1.getRepository)(user_1.User);
+    const repository = (0, shell_1.getRepository)(user_js_1.User);
     const user = await repository.findOneBy({ id });
     if (!user) {
-        throw new auth_error_1.AuthError({
-            errorCode: error_code_1.USER_NOT_FOUND
+        throw new auth_error_js_1.AuthError({
+            errorCode: error_code_js_1.USER_NOT_FOUND
         });
     }
-    /* only 'name', 'email' and 'locale' attributes can be changed */
-    var allowed = ['name', 'email', 'locale']
+    /* only 'username', 'name', 'email' and 'locale' attributes can be changed */
+    var allowed = ['username', 'name', 'email', 'locale']
         .filter(attr => attr in newProfiles)
         .reduce((sum, attr) => {
         sum[attr] = newProfiles[attr];
         return sum;
     }, {});
+    /* check if email and username is unique */
+    if ('email' in allowed) {
+        var found = await repository.findOne({ where: { email: (0, typeorm_1.ILike)(allowed.email) } });
+        if (found && found.id != id) {
+            throw new auth_error_js_1.AuthError({
+                errorCode: auth_error_js_1.AuthError.ERROR_CODES.EMAIL_ALREADY_EXISTS
+            });
+        }
+    }
+    if ('username' in allowed) {
+        var found = await repository.findOne({ where: { username: allowed.username } });
+        if (found && found.id != id) {
+            throw new auth_error_js_1.AuthError({
+                errorCode: auth_error_js_1.AuthError.ERROR_CODES.USERNAME_ALREADY_EXISTS
+            });
+        }
+    }
     return await repository.save(Object.assign(Object.assign({}, user), allowed));
 }
 //# sourceMappingURL=profile.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../server/controllers/profile.ts"],"names":[],"mappings":";;AAMA,sCAqBC;AA3BD,iDAAqD;AAErD,wDAAwD;AACxD,qDAAgD;AAChD,+CAA2C;AAEpC,KAAK,UAAU,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW;IACrD,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAA;IACtC,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IAC/C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,sBAAS,CAAC;YAClB,SAAS,EAAE,2BAAc;SAC1B,CAAC,CAAA;IACJ,CAAC;IAED,iEAAiE;IACjE,IAAI,OAAO,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;SACtC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,WAAW,CAAC;SACnC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACpB,GAAG,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;QAC7B,OAAO,GAAG,CAAA;IACZ,CAAC,EAAE,EAAE,CAAC,CAAA;IAER,OAAO,MAAM,UAAU,CAAC,IAAI,iCACvB,IAAI,GACJ,OAAO,EACV,CAAA;AACJ,CAAC","sourcesContent":["import { getRepository } from '@things-factory/shell'\n\nimport { USER_NOT_FOUND } from '../constants/error-code'\nimport { AuthError } from '../errors/auth-error'\nimport { User } from '../service/user/user'\n\nexport async function updateProfile({ id }, newProfiles) {\n  const repository = getRepository(User)\n  const user = await repository.findOneBy({ id })\n  if (!user) {\n    throw new AuthError({\n      errorCode: USER_NOT_FOUND\n    })\n  }\n\n  /* only 'name', 'email' and 'locale' attributes can be changed */\n  var allowed = ['name', 'email', 'locale']\n    .filter(attr => attr in newProfiles)\n    .reduce((sum, attr) => {\n      sum[attr] = newProfiles[attr]\n      return sum\n    }, {})\n\n  return await repository.save({\n    ...user,\n    ...allowed\n  })\n}\n"]}
+{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../server/controllers/profile.ts"],"names":[],"mappings":";;AAQA,sCA8CC;AAtDD,qCAA+B;AAE/B,iDAAqD;AAErD,8DAA2D;AAC3D,2DAAmD;AACnD,qDAA8C;AAEvC,KAAK,UAAU,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW;IACrD,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,cAAI,CAAC,CAAA;IACtC,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IAC/C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,yBAAS,CAAC;YAClB,SAAS,EAAE,8BAAc;SAC1B,CAAC,CAAA;IACJ,CAAC;IAED,6EAA6E;IAC7E,IAAI,OAAO,GAKP,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;SACxC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,WAAW,CAAC;SACnC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACpB,GAAG,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;QAC7B,OAAO,GAAG,CAAA;IACZ,CAAC,EAAE,EAAE,CAAC,CAAA;IAER,2CAA2C;IAC3C,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;QACvB,IAAI,KAAK,GAAS,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAA,eAAK,EAAC,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAA;QAEtF,IAAI,KAAK,IAAI,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;YAC5B,MAAM,IAAI,yBAAS,CAAC;gBAClB,SAAS,EAAE,yBAAS,CAAC,WAAW,CAAC,oBAAoB;aACtD,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,IAAI,UAAU,IAAI,OAAO,EAAE,CAAC;QAC1B,IAAI,KAAK,GAAS,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QACrF,IAAI,KAAK,IAAI,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;YAC5B,MAAM,IAAI,yBAAS,CAAC;gBAClB,SAAS,EAAE,yBAAS,CAAC,WAAW,CAAC,uBAAuB;aACzD,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,OAAO,MAAM,UAAU,CAAC,IAAI,iCACvB,IAAI,GACJ,OAAO,EACV,CAAA;AACJ,CAAC","sourcesContent":["import { ILike } from 'typeorm'\n\nimport { getRepository } from '@things-factory/shell'\n\nimport { USER_NOT_FOUND } from '../constants/error-code.js'\nimport { AuthError } from '../errors/auth-error.js'\nimport { User } from '../service/user/user.js'\n\nexport async function updateProfile({ id }, newProfiles) {\n  const repository = getRepository(User)\n  const user = await repository.findOneBy({ id })\n  if (!user) {\n    throw new AuthError({\n      errorCode: USER_NOT_FOUND\n    })\n  }\n\n  /* only 'username', 'name', 'email' and 'locale' attributes can be changed */\n  var allowed: {\n    username?: string\n    name?: string\n    email?: string\n    locale?: string\n  } = ['username', 'name', 'email', 'locale']\n    .filter(attr => attr in newProfiles)\n    .reduce((sum, attr) => {\n      sum[attr] = newProfiles[attr]\n      return sum\n    }, {})\n\n  /* check if email and username is unique */\n  if ('email' in allowed) {\n    var found: User = await repository.findOne({ where: { email: ILike(allowed.email) } })\n\n    if (found && found.id != id) {\n      throw new AuthError({\n        errorCode: AuthError.ERROR_CODES.EMAIL_ALREADY_EXISTS\n      })\n    }\n  }\n\n  if ('username' in allowed) {\n    var found: User = await repository.findOne({ where: { username: allowed.username } })\n    if (found && found.id != id) {\n      throw new AuthError({\n        errorCode: AuthError.ERROR_CODES.USERNAME_ALREADY_EXISTS\n      })\n    }\n  }\n\n  return await repository.save({\n    ...user,\n    ...allowed\n  })\n}\n"]}