@things-factory/auth-base 8.0.5 → 8.0.13

package/dist-server/utils/access-token-cookie.js

@@ -4,7 +4,6 @@ exports.getAccessTokenCookie = getAccessTokenCookie;
 exports.setAccessTokenCookie = setAccessTokenCookie;
 exports.setSessionAccessToken = setSessionAccessToken;
 exports.clearAccessTokenCookie = clearAccessTokenCookie;
-const shell_1 = require("@things-factory/shell");
 const env_1 = require("@things-factory/env");
 const max_age_1 = require("../constants/max-age");
 const accessTokenCookieKey = env_1.config.get('accessTokenCookieKey', 'access_token');
@@ -20,10 +19,6 @@ function setAccessTokenCookie(context, token) {
         maxAge: max_age_1.MAX_AGE,
         sameSite: 'Lax'
     };
-    const cookieDomain = (0, shell_1.getCookieDomainFromHostname)(context.hostname);
-    if (cookieDomain) {
-        cookie['domain'] = cookieDomain;
-    }
     context.cookies.set(accessTokenCookieKey, token, cookie);
 }
 function setSessionAccessToken(context) {
@@ -42,10 +37,6 @@ function clearAccessTokenCookie(context) {
         httpOnly: true,
         sameSite: 'Lax'
     };
-    const cookieDomain = (0, shell_1.getCookieDomainFromHostname)(context.hostname);
-    if (cookieDomain) {
-        cookie['domain'] = cookieDomain;
-    }
     context.cookies.set(accessTokenCookieKey, '', cookie);
     /*
      * TODO clear i18next cookie as well - need to support domain

package/dist-server/utils/access-token-cookie.js.map

@@ -1 +1 @@
-{"version":3,"file":"access-token-cookie.js","sourceRoot":"","sources":["../../server/utils/access-token-cookie.ts"],"names":[],"mappings":";;AAMA,oDAEC;AAED,oDAgBC;AAED,sDASC;AAED,wDAqBC;AA5DD,iDAAmE;AACnE,6CAA4C;AAC5C,kDAA8C;AAE9C,MAAM,oBAAoB,GAAG,YAAM,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,CAAC,CAAA;AAE/E,SAAgB,oBAAoB,CAAC,OAAO;;IAC1C,OAAO,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,GAAG,CAAC,oBAAoB,CAAC,CAAA;AACpD,CAAC;AAED,SAAgB,oBAAoB,CAAC,OAAO,EAAE,KAAK;IACjD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAE1B,IAAI,MAAM,GAAG;QACX,MAAM;QACN,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,iBAAO;QACf,QAAQ,EAAE,KAAK;KAChB,CAAA;IAED,MAAM,YAAY,GAAG,IAAA,mCAA2B,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAClE,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAA;IACjC,CAAC;IAED,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;AAC1D,CAAC;AAED,SAAgB,qBAAqB,CAAC,OAAO;IAC3C,0FAA0F;IAC1F,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE9B,OAAO,CAAC,OAAO,GAAG;QAChB,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,QAAQ,EAAE,IAAI,CAAC,IAAI;QACnB,MAAM,EAAE,IAAI,CAAC,KAAK;KACnB,CAAA;AACH,CAAC;AAED,SAAgB,sBAAsB,CAAC,OAAO;IAC5C,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAE1B,IAAI,MAAM,GAAG;QACX,MAAM;QACN,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,KAAK;KAChB,CAAA;IAED,MAAM,YAAY,GAAG,IAAA,mCAA2B,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAClE,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAA;IACjC,CAAC;IAED,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IACrD;;;OAGG;IACH,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IAC1C,OAAO,CAAC,OAAO,GAAG,IAAI,CAAA;AACxB,CAAC","sourcesContent":["import { getCookieDomainFromHostname } from '@things-factory/shell'\nimport { config } from '@things-factory/env'\nimport { MAX_AGE } from '../constants/max-age'\n\nconst accessTokenCookieKey = config.get('accessTokenCookieKey', 'access_token')\n\nexport function getAccessTokenCookie(context) {\n  return context?.cookies?.get(accessTokenCookieKey)\n}\n\nexport function setAccessTokenCookie(context, token) {\n  const { secure } = context\n\n  var cookie = {\n    secure,\n    httpOnly: true,\n    maxAge: MAX_AGE,\n    sameSite: 'Lax'\n  }\n\n  const cookieDomain = getCookieDomainFromHostname(context.hostname)\n  if (cookieDomain) {\n    cookie['domain'] = cookieDomain\n  }\n\n  context.cookies.set(accessTokenCookieKey, token, cookie)\n}\n\nexport function setSessionAccessToken(context) {\n  /* koa-session 을 사용하는 경우에는, cookie 직접 설정이 작동되지 않는다. 그런 경우에는 session에 설정해서 cookie를 변경한다. */\n  const { user } = context.state\n\n  context.session = {\n    id: user.id,\n    userType: user.type,\n    status: user.state\n  }\n}\n\nexport function clearAccessTokenCookie(context) {\n  const { secure } = context\n\n  var cookie = {\n    secure,\n    httpOnly: true,\n    sameSite: 'Lax'\n  }\n\n  const cookieDomain = getCookieDomainFromHostname(context.hostname)\n  if (cookieDomain) {\n    cookie['domain'] = cookieDomain\n  }\n\n  context.cookies.set(accessTokenCookieKey, '', cookie)\n  /*\n   * TODO clear i18next cookie as well - need to support domain\n   * https://github.com/hatiolab/things-factory/issues/70\n   */\n  context.cookies.set('i18next', '', cookie)\n  context.session = null\n}\n"]}
+{"version":3,"file":"access-token-cookie.js","sourceRoot":"","sources":["../../server/utils/access-token-cookie.ts"],"names":[],"mappings":";;AAKA,oDAEC;AAED,oDAWC;AAED,sDASC;AAED,wDAgBC;AAjDD,6CAA4C;AAC5C,kDAA8C;AAE9C,MAAM,oBAAoB,GAAG,YAAM,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,CAAC,CAAA;AAE/E,SAAgB,oBAAoB,CAAC,OAAO;;IAC1C,OAAO,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,GAAG,CAAC,oBAAoB,CAAC,CAAA;AACpD,CAAC;AAED,SAAgB,oBAAoB,CAAC,OAAO,EAAE,KAAK;IACjD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAE1B,IAAI,MAAM,GAAG;QACX,MAAM;QACN,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,iBAAO;QACf,QAAQ,EAAE,KAAK;KAChB,CAAA;IAED,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;AAC1D,CAAC;AAED,SAAgB,qBAAqB,CAAC,OAAO;IAC3C,0FAA0F;IAC1F,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE9B,OAAO,CAAC,OAAO,GAAG;QAChB,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,QAAQ,EAAE,IAAI,CAAC,IAAI;QACnB,MAAM,EAAE,IAAI,CAAC,KAAK;KACnB,CAAA;AACH,CAAC;AAED,SAAgB,sBAAsB,CAAC,OAAO;IAC5C,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAE1B,IAAI,MAAM,GAAG;QACX,MAAM;QACN,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,KAAK;KAChB,CAAA;IAED,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IACrD;;;OAGG;IACH,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IAC1C,OAAO,CAAC,OAAO,GAAG,IAAI,CAAA;AACxB,CAAC","sourcesContent":["import { config } from '@things-factory/env'\nimport { MAX_AGE } from '../constants/max-age'\n\nconst accessTokenCookieKey = config.get('accessTokenCookieKey', 'access_token')\n\nexport function getAccessTokenCookie(context) {\n  return context?.cookies?.get(accessTokenCookieKey)\n}\n\nexport function setAccessTokenCookie(context, token) {\n  const { secure } = context\n\n  var cookie = {\n    secure,\n    httpOnly: true,\n    maxAge: MAX_AGE,\n    sameSite: 'Lax'\n  }\n\n  context.cookies.set(accessTokenCookieKey, token, cookie)\n}\n\nexport function setSessionAccessToken(context) {\n  /* koa-session 을 사용하는 경우에는, cookie 직접 설정이 작동되지 않는다. 그런 경우에는 session에 설정해서 cookie를 변경한다. */\n  const { user } = context.state\n\n  context.session = {\n    id: user.id,\n    userType: user.type,\n    status: user.state\n  }\n}\n\nexport function clearAccessTokenCookie(context) {\n  const { secure } = context\n\n  var cookie = {\n    secure,\n    httpOnly: true,\n    sameSite: 'Lax'\n  }\n\n  context.cookies.set(accessTokenCookieKey, '', cookie)\n  /*\n   * TODO clear i18next cookie as well - need to support domain\n   * https://github.com/hatiolab/things-factory/issues/70\n   */\n  context.cookies.set('i18next', '', cookie)\n  context.session = null\n}\n"]}

package/dist-server/utils/check-user-has-role.d.ts

@@ -1,5 +1,5 @@
 import { Domain } from '@things-factory/shell';
-import { User } from '../service/user/user';
+import { User } from '../service/user/user.js';
 /**
  * @description 사용자가 특정 도메인 또는 상위 도메인에서 특정 역할을 가지고 있는지 확인합니다.
  *

package/dist-server/utils/check-user-has-role.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkUserHasRole = checkUserHasRole;
 const shell_1 = require("@things-factory/shell");
-const user_1 = require("../service/user/user");
+const user_js_1 = require("../service/user/user.js");
 /**
  * @description 사용자가 특정 도메인 또는 상위 도메인에서 특정 역할을 가지고 있는지 확인합니다.
  *
@@ -16,7 +16,7 @@ async function checkUserHasRole(roleId, domain, user) {
     if (!roleId) {
         return true;
     }
-    const me = await (0, shell_1.getRepository)(user_1.User).findOne({
+    const me = await (0, shell_1.getRepository)(user_js_1.User).findOne({
         where: { id: user.id },
         relations: ['roles']
     });

package/dist-server/utils/check-user-has-role.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-user-has-role.js","sourceRoot":"","sources":["../../server/utils/check-user-has-role.ts"],"names":[],"mappings":";;AAcA,4CAcC;AA5BD,iDAA6D;AAE7D,+CAA2C;AAG3C;;;;;;;;GAQG;AACI,KAAK,UAAU,gBAAgB,CAAC,MAAc,EAAE,MAAc,EAAE,IAAU;IAC/E,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAC,OAAO,CAAC;QAC3C,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE;QACtB,SAAS,EAAE,CAAC,OAAO,CAAC;KACrB,CAAC,CAAA;IAEF,OAAO,EAAE,CAAC,KAAK;SACZ,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC;SACrG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;SACpB,QAAQ,CAAC,MAAM,CAAC,CAAA;AACrB,CAAC","sourcesContent":["import { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../service/user/user'\nimport { Role } from 'service'\n\n/**\n * @description 사용자가 특정 도메인 또는 상위 도메인에서 특정 역할을 가지고 있는지 확인합니다.\n *\n * @param roleId 확인할 역할의 ID\n * @param domain 역할을 확인할 도메인\n * @param user 역할을 확인할 사용자\n *\n * @returns 사용자가 도메인 또는 상위 도메인에서 역할을 가지고 있는지 여부를 나타내는 boolean을 반환하는 Promise\n */\nexport async function checkUserHasRole(roleId: string, domain: Domain, user: User): Promise<Boolean> {\n  if (!roleId) {\n    return true\n  }\n\n  const me = await getRepository(User).findOne({\n    where: { id: user.id },\n    relations: ['roles']\n  })\n\n  return me.roles\n    .filter(role => role.domainId === domain.id || (domain.parentId && role.domainId === domain.parentId))\n    .map(role => role.id)\n    .includes(roleId)\n}\n"]}
+{"version":3,"file":"check-user-has-role.js","sourceRoot":"","sources":["../../server/utils/check-user-has-role.ts"],"names":[],"mappings":";;AAcA,4CAcC;AA5BD,iDAA6D;AAE7D,qDAA8C;AAG9C;;;;;;;;GAQG;AACI,KAAK,UAAU,gBAAgB,CAAC,MAAc,EAAE,MAAc,EAAE,IAAU;IAC/E,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAa,EAAC,cAAI,CAAC,CAAC,OAAO,CAAC;QAC3C,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE;QACtB,SAAS,EAAE,CAAC,OAAO,CAAC;KACrB,CAAC,CAAA;IAEF,OAAO,EAAE,CAAC,KAAK;SACZ,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC;SACrG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;SACpB,QAAQ,CAAC,MAAM,CAAC,CAAA;AACrB,CAAC","sourcesContent":["import { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../service/user/user.js'\nimport { Role } from '../service/role/role.js'\n\n/**\n * @description 사용자가 특정 도메인 또는 상위 도메인에서 특정 역할을 가지고 있는지 확인합니다.\n *\n * @param roleId 확인할 역할의 ID\n * @param domain 역할을 확인할 도메인\n * @param user 역할을 확인할 사용자\n *\n * @returns 사용자가 도메인 또는 상위 도메인에서 역할을 가지고 있는지 여부를 나타내는 boolean을 반환하는 Promise\n */\nexport async function checkUserHasRole(roleId: string, domain: Domain, user: User): Promise<Boolean> {\n  if (!roleId) {\n    return true\n  }\n\n  const me = await getRepository(User).findOne({\n    where: { id: user.id },\n    relations: ['roles']\n  })\n\n  return me.roles\n    .filter(role => role.domainId === domain.id || (domain.parentId && role.domainId === domain.parentId))\n    .map(role => role.id)\n    .includes(roleId)\n}\n"]}

package/dist-server/utils/get-user-domains.d.ts

@@ -1,6 +1,5 @@
 import { Domain } from '@things-factory/shell';
 import { User } from '../service/user/user';
-export declare function getUserDomains(user: User): Promise<Partial<Domain>[]>;
-export declare function getRoleBasedDomains(user: User): Promise<Partial<Domain>[]>;
+export declare function getUserDomains(user: User, extType?: string): Promise<Partial<Domain>[]>;
 export declare function getDomainsWithPrivilege(user: User, privilege: string, category: string): Promise<Partial<Domain>[]>;
 export declare function getDomainsAsOwner(user: User): Promise<Partial<Domain>[]>;

package/dist-server/utils/get-user-domains.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserDomains = getUserDomains;
-exports.getRoleBasedDomains = getRoleBasedDomains;
 exports.getDomainsWithPrivilege = getDomainsWithPrivilege;
 exports.getDomainsAsOwner = getDomainsAsOwner;
 const shell_1 = require("@things-factory/shell");
 const user_1 = require("../service/user/user");
-async function getUserDomains(user) {
+async function getUserDomains(user, extType) {
     return (await (0, shell_1.getRepository)(shell_1.Domain)
         .createQueryBuilder('DOMAIN')
         .where(qb => {
@@ -31,31 +30,36 @@ async function getUserDomains(user) {
         return 'DOMAIN.id IN ' + subQuery;
     })
         .orderBy('DOMAIN.name', 'ASC')
-        .getMany()).map(domain => {
-        const { id, name, description, subdomain, extType, brandName, brandImage } = domain;
-        return { id, name, description, subdomain, extType, brandName, brandImage };
-    });
-}
-async function getRoleBasedDomains(user) {
-    return (await (0, shell_1.getRepository)(shell_1.Domain)
-        .createQueryBuilder('DOMAIN')
-        .where(qb => {
-        const subQuery = qb
-            .subQuery()
-            .distinct(true)
-            .select('DOMAIN.id')
-            .from(user_1.User, 'USER')
-            .leftJoin('USER.roles', 'ROLE')
-            .leftJoin('ROLE.domain', 'DOMAIN')
-            .where('USER.id = :userId', { userId: user.id })
-            .getQuery();
-        return 'DOMAIN.id IN ' + subQuery;
-    })
-        .getMany()).map(domain => {
+        .getMany())
+        .filter(domain => !extType || domain.extType == extType)
+        .map(domain => {
         const { id, name, description, subdomain, extType, brandName, brandImage } = domain;
+        /* do not remove id column for result */
         return { id, name, description, subdomain, extType, brandName, brandImage };
     });
 }
+// export async function getRoleBasedDomains(user: User): Promise<Partial<Domain>[]> {
+//   return (
+//     await getRepository(Domain)
+//       .createQueryBuilder('DOMAIN')
+//       .where(qb => {
+//         const subQuery = qb
+//           .subQuery()
+//           .distinct(true)
+//           .select('DOMAIN.id')
+//           .from(User, 'USER')
+//           .leftJoin('USER.roles', 'ROLE')
+//           .leftJoin('ROLE.domain', 'DOMAIN')
+//           .where('USER.id = :userId', { userId: user.id })
+//           .getQuery()
+//         return 'DOMAIN.id IN ' + subQuery
+//       })
+//       .getMany()
+//   ).map(domain => {
+//     const { id, name, description, subdomain, extType, brandName, brandImage } = domain
+//     return { id, name, description, subdomain, extType, brandName, brandImage }
+//   })
+// }
 async function getDomainsWithPrivilege(user, privilege, category) {
     return (await (0, shell_1.getRepository)(shell_1.Domain)
         .createQueryBuilder('DOMAIN')

package/dist-server/utils/get-user-domains.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-user-domains.js","sourceRoot":"","sources":["../../server/utils/get-user-domains.ts"],"names":[],"mappings":"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","sourcesContent":["import { In } from 'typeorm'\n\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../service/user/user'\n\nexport async function getUserDomains(user: User): Promise<Partial<Domain>[]> {\n  return (\n    await getRepository(Domain)\n      .createQueryBuilder('DOMAIN')\n      .where(qb => {\n        const subQuery = qb\n          .subQuery()\n          .distinct(true)\n          .select('DOMAIN.id')\n          .from(User, 'USER')\n          .leftJoin('USER.roles', 'ROLE')\n          .leftJoin('ROLE.domain', 'DOMAIN')\n          .where('USER.id = :userId', { userId: user.id })\n          .getQuery()\n        return 'DOMAIN.id IN ' + subQuery\n      })\n      .orWhere(qb => {\n        const subQuery = qb\n          .subQuery()\n          .select('DOMAIN.id')\n          .from(Domain, 'DOMAIN')\n          .where('DOMAIN.owner = :owner', { owner: user.id })\n          .getQuery()\n        return 'DOMAIN.id IN ' + subQuery\n      })\n      .orderBy('DOMAIN.name', 'ASC')\n      .getMany()\n  ).map(domain => {\n    const { id, name, description, subdomain, extType, brandName, brandImage } = domain\n    return { id, name, description, subdomain, extType, brandName, brandImage }\n  })\n}\n\nexport async function getRoleBasedDomains(user: User): Promise<Partial<Domain>[]> {\n  return (\n    await getRepository(Domain)\n      .createQueryBuilder('DOMAIN')\n      .where(qb => {\n        const subQuery = qb\n          .subQuery()\n          .distinct(true)\n          .select('DOMAIN.id')\n          .from(User, 'USER')\n          .leftJoin('USER.roles', 'ROLE')\n          .leftJoin('ROLE.domain', 'DOMAIN')\n          .where('USER.id = :userId', { userId: user.id })\n          .getQuery()\n        return 'DOMAIN.id IN ' + subQuery\n      })\n      .getMany()\n  ).map(domain => {\n    const { id, name, description, subdomain, extType, brandName, brandImage } = domain\n    return { id, name, description, subdomain, extType, brandName, brandImage }\n  })\n}\n\nexport async function getDomainsWithPrivilege(\n  user: User,\n  privilege: string,\n  category: string\n): Promise<Partial<Domain>[]> {\n  return (\n    await getRepository(Domain)\n      .createQueryBuilder('DOMAIN')\n      .where(qb => {\n        const subQuery = qb\n          .subQuery()\n          .distinct(true)\n          .select('DOMAIN.id')\n          .from(User, 'USER')\n          .leftJoin('USER.roles', 'ROLE')\n          .leftJoin('ROLE.domain', 'DOMAIN')\n          .leftJoin('ROLE.privileges', 'PRIVILEGE')\n          .where('USER.id = :userId', { userId: user.id })\n          .andWhere('PRIVILEGE.name = :privilege', { privilege })\n          .andWhere('PRIVILEGE.category = :category', { category })\n          .getQuery()\n        return 'DOMAIN.id IN ' + subQuery\n      })\n      .orWhere(qb => {\n        const subQuery = qb\n          .subQuery()\n          .select('DOMAIN.id')\n          .from(Domain, 'DOMAIN')\n          .where('DOMAIN.owner = :owner', { owner: user.id })\n          .getQuery()\n        return 'DOMAIN.id IN ' + subQuery\n      })\n      .orderBy('DOMAIN.name', 'ASC')\n      .getMany()\n  ).map(domain => {\n    const { id, name, description, subdomain, extType, brandName, brandImage } = domain\n    return { id, name, description, subdomain, extType, brandName, brandImage }\n  })\n}\n\nexport async function getDomainsAsOwner(user: User): Promise<Partial<Domain>[]> {\n  return (\n    await getRepository(Domain).find({\n      where: { owner: user.id }\n    })\n  ).map(domain => {\n    const { id, name, description, subdomain, extType, brandName, brandImage } = domain\n    return { id, name, description, subdomain, extType, brandName, brandImage }\n  })\n}\n"]}
+{"version":3,"file":"get-user-domains.js","sourceRoot":"","sources":["../../server/utils/get-user-domains.ts"],"names":[],"mappings":"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","sourcesContent":["import { In } from 'typeorm'\n\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../service/user/user'\n\nexport async function getUserDomains(user: User, extType?: string): Promise<Partial<Domain>[]> {\n  return (\n    await getRepository(Domain)\n      .createQueryBuilder('DOMAIN')\n      .where(qb => {\n        const subQuery = qb\n          .subQuery()\n          .distinct(true)\n          .select('DOMAIN.id')\n          .from(User, 'USER')\n          .leftJoin('USER.roles', 'ROLE')\n          .leftJoin('ROLE.domain', 'DOMAIN')\n          .where('USER.id = :userId', { userId: user.id })\n          .getQuery()\n        return 'DOMAIN.id IN ' + subQuery\n      })\n      .orWhere(qb => {\n        const subQuery = qb\n          .subQuery()\n          .select('DOMAIN.id')\n          .from(Domain, 'DOMAIN')\n          .where('DOMAIN.owner = :owner', { owner: user.id })\n          .getQuery()\n        return 'DOMAIN.id IN ' + subQuery\n      })\n      .orderBy('DOMAIN.name', 'ASC')\n      .getMany()\n  )\n    .filter(domain => !extType || domain.extType == extType)\n    .map(domain => {\n      const { id, name, description, subdomain, extType, brandName, brandImage } = domain\n      /* do not remove id column for result */\n      return { id, name, description, subdomain, extType, brandName, brandImage }\n    })\n}\n\n// export async function getRoleBasedDomains(user: User): Promise<Partial<Domain>[]> {\n//   return (\n//     await getRepository(Domain)\n//       .createQueryBuilder('DOMAIN')\n//       .where(qb => {\n//         const subQuery = qb\n//           .subQuery()\n//           .distinct(true)\n//           .select('DOMAIN.id')\n//           .from(User, 'USER')\n//           .leftJoin('USER.roles', 'ROLE')\n//           .leftJoin('ROLE.domain', 'DOMAIN')\n//           .where('USER.id = :userId', { userId: user.id })\n//           .getQuery()\n//         return 'DOMAIN.id IN ' + subQuery\n//       })\n//       .getMany()\n//   ).map(domain => {\n//     const { id, name, description, subdomain, extType, brandName, brandImage } = domain\n//     return { id, name, description, subdomain, extType, brandName, brandImage }\n//   })\n// }\n\nexport async function getDomainsWithPrivilege(\n  user: User,\n  privilege: string,\n  category: string\n): Promise<Partial<Domain>[]> {\n  return (\n    await getRepository(Domain)\n      .createQueryBuilder('DOMAIN')\n      .where(qb => {\n        const subQuery = qb\n          .subQuery()\n          .distinct(true)\n          .select('DOMAIN.id')\n          .from(User, 'USER')\n          .leftJoin('USER.roles', 'ROLE')\n          .leftJoin('ROLE.domain', 'DOMAIN')\n          .leftJoin('ROLE.privileges', 'PRIVILEGE')\n          .where('USER.id = :userId', { userId: user.id })\n          .andWhere('PRIVILEGE.name = :privilege', { privilege })\n          .andWhere('PRIVILEGE.category = :category', { category })\n          .getQuery()\n        return 'DOMAIN.id IN ' + subQuery\n      })\n      .orWhere(qb => {\n        const subQuery = qb\n          .subQuery()\n          .select('DOMAIN.id')\n          .from(Domain, 'DOMAIN')\n          .where('DOMAIN.owner = :owner', { owner: user.id })\n          .getQuery()\n        return 'DOMAIN.id IN ' + subQuery\n      })\n      .orderBy('DOMAIN.name', 'ASC')\n      .getMany()\n  ).map(domain => {\n    const { id, name, description, subdomain, extType, brandName, brandImage } = domain\n    return { id, name, description, subdomain, extType, brandName, brandImage }\n  })\n}\n\nexport async function getDomainsAsOwner(user: User): Promise<Partial<Domain>[]> {\n  return (\n    await getRepository(Domain).find({\n      where: { owner: user.id }\n    })\n  ).map(domain => {\n    const { id, name, description, subdomain, extType, brandName, brandImage } = domain\n    return { id, name, description, subdomain, extType, brandName, brandImage }\n  })\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "8.0.5",
+  "version": "8.0.13",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -30,13 +30,13 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@simplewebauthn/browser": "^10.0.0",
-    "@simplewebauthn/server": "^10.0.0",
-    "@things-factory/email-base": "^8.0.2",
-    "@things-factory/env": "^8.0.2",
-    "@things-factory/shell": "^8.0.2",
-    "@things-factory/utils": "^8.0.0",
-    "@types/webappsec-credential-management": "^0.6.8",
+    "@simplewebauthn/browser": "^13.0.0",
+    "@simplewebauthn/server": "^13.0.0",
+    "@things-factory/email-base": "^8.0.13",
+    "@things-factory/env": "^8.0.8",
+    "@things-factory/shell": "^8.0.13",
+    "@things-factory/utils": "^8.0.8",
+    "@types/webappsec-credential-management": "^0.6.9",
     "jsonwebtoken": "^9.0.0",
     "koa-passport": "^6.0.0",
     "koa-session": "^6.4.0",
@@ -46,5 +46,5 @@
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0"
   },
-  "gitHead": "9ab6fca18eeb58b9d2f3411661508a39d0ab6aee"
+  "gitHead": "66c1356c18b5c9a21e8280460eb40020f7ea2b37"
 }

package/server/constants/error-code.ts

@@ -17,4 +17,6 @@ export const PASSWORD_USED_PAST = 'password used in the past'
 export const VERIFICATION_ERROR = 'user or verification token not found'
 export const AUTHN_VERIFICATION_FAILED = 'authn verification failed'
 export const USER_CREDENTIAL_NOT_FOUND = 'user credential not found'
+export const EMAIL_ALREADY_EXISTS = 'email already exists'
+export const USERNAME_ALREADY_EXISTS = 'email already exists'
 export const AUTH_ERROR = 'auth error'

package/server/controllers/change-pwd.ts

@@ -1,4 +1,3 @@
-import { ILike } from 'typeorm'
 import { config } from '@things-factory/env'
 import { getRepository } from '@things-factory/shell'
 
@@ -19,7 +18,8 @@ export async function changePwd(attrs, currentPass, newPass, confirmPass, contex
 
   // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.
   const repository = getRepository(User)
-  const user: User = await repository.findOne({ where: { email: ILike(attrs.email) } })
+
+  const user: User = await repository.findOne({ where: { id: attrs.id } })
 
   if (!user) {
     throw new AuthError({
@@ -37,6 +37,7 @@ export async function changePwd(attrs, currentPass, newPass, confirmPass, contex
     throw new AuthError({
       errorCode: PASSWORD_NOT_MATCHED,
       detail: {
+        username: user.username,
         email: user.email,
         failCount: user.failCount
       }

package/server/controllers/delete-user.ts

@@ -8,7 +8,20 @@ export async function deleteUser(attrs, tx?: EntityManager) {
   // TODO 다른 도메인에도 포함되어있다면, domains-users 관게와 해당 도메인 관련 정보만 삭제해야 함.
 
   const repository = tx?.getRepository(User)
-  const user = await repository.findOne({ where: { email: ILike(attrs.email) } })
+  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: ILike(username) },
+      relations: ['domains']
+    })
+  }
+
   if (!user) {
     throw new AuthError({
       errorCode: USER_NOT_FOUND
@@ -19,29 +32,19 @@ export async function deleteUser(attrs, tx?: EntityManager) {
   user.domains = []
 
   await repository.save(user)
-
-  // repository api는 작동하지 않음.
-  // await txManager
-  //   .createQueryBuilder()
-  //   .delete()
-  //   .from('users_domains')
-  //   .where({
-  //     usersId: user.id
-  //   })
-  //   .execute()
 }
 
 export async function deleteUsers(attrs, tx?: EntityManager) {
   // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.
   // TODO 다른 도메인에도 포함되어있다면, domains-users 관게와 해당 도메인 관련 정보만 삭제해야 함.
 
-  const { emails } = attrs
+  const { usernames } = attrs
 
   const repo = tx?.getRepository(User)
 
   const users = await repo.find({
     where: {
-      email: In(emails)
+      username: In(usernames)
     }
   })
 

package/server/controllers/invitation.ts

@@ -5,15 +5,27 @@ import { sendEmail } from '@things-factory/email-base'
 import { Domain, getRepository } from '@things-factory/shell'
 
 import { Invitation } from '../service/invitation/invitation'
-import { User } from '../service/user/user'
+import { User, UserStatus } from '../service/user/user'
 import { getInvitationEmailForm } from '../templates/invitation-email'
 import { makeInvitationToken } from './utils/make-invitation-token'
 import { saveInvitationToken } from './utils/save-invitation-token'
 
 export async function invite(attrs, withEmailInvitation?: Boolean) {
-  const { email, reference, type, context } = attrs
+  const { username, reference, type, context } = attrs
+  const repository = getRepository(User)
+
+  var user = await repository.findOne({
+    where: { username },
+    relations: ['domains']
+  })
+
+  if (!user && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+    user = await repository.findOne({
+      where: { email: ILike(username) },
+      relations: ['domains']
+    })
+  }
 
-  var user = await getRepository(User).findOne({ where: { email: ILike(email) }, relations: ['domains'] })
   var domains = user.domains
 
   // TODO reference should not be a domain.id (security reason)
@@ -28,6 +40,9 @@ export async function invite(attrs, withEmailInvitation?: Boolean) {
   }
 
   if (withEmailInvitation) {
+    const email = user.email
+
+    // TODO 초대장의 유효기간을 설정할 수 있어야 함.
     var invitation = await getRepository(Invitation).findOneBy({
       email: ILike(email),
       reference,
@@ -44,6 +59,7 @@ export async function invite(attrs, withEmailInvitation?: Boolean) {
 
     return await sendInvitationEmail({
       invitation,
+      user,
       context
     })
   }
@@ -89,7 +105,7 @@ export async function acceptInvitation(token) {
   return true
 }
 
-export async function sendInvitationEmail({ invitation, context }) {
+export async function sendInvitationEmail({ invitation, user, context }) {
   try {
     var token = makeInvitationToken()
     var verifaction = await saveInvitationToken(invitation.id, token)
@@ -101,6 +117,7 @@ export async function sendInvitationEmail({ invitation, context }) {
         receiver: invitation.email,
         subject: 'Invitation',
         content: getInvitationEmailForm({
+          username: user.username,
           email: invitation.email,
           acceptUrl: serviceUrl
         })
@@ -123,10 +140,24 @@ export async function resendInvitationEmail(
     type
   })
 
-  if (!invitation) return false
+  if (!invitation) {
+    throw new Error(`not found invitation.`)
+  }
+
+  var user = await getRepository(User).findOne({
+    where: {
+      email: ILike(email),
+      status: UserStatus.ACTIVATED
+    }
+  })
+
+  if (!user) {
+    throw new Error(`user not found: ${email}`)
+  }
 
   return await sendInvitationEmail({
     invitation,
+    user,
     context
   })
 }

package/server/controllers/profile.ts

@@ -1,3 +1,5 @@
+import { ILike } from 'typeorm'
+
 import { getRepository } from '@things-factory/shell'
 
 import { USER_NOT_FOUND } from '../constants/error-code'
@@ -13,14 +15,39 @@ export async function updateProfile({ id }, newProfiles) {
     })
   }
 
-  /* 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?: string
+    name?: string
+    email?: string
+    locale?: string
+  } = ['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: User = await repository.findOne({ where: { email: ILike(allowed.email) } })
+
+    if (found && found.id != id) {
+      throw new AuthError({
+        errorCode: AuthError.ERROR_CODES.EMAIL_ALREADY_EXISTS
+      })
+    }
+  }
+
+  if ('username' in allowed) {
+    var found: User = await repository.findOne({ where: { username: allowed.username } })
+    if (found && found.id != id) {
+      throw new AuthError({
+        errorCode: AuthError.ERROR_CODES.USERNAME_ALREADY_EXISTS
+      })
+    }
+  }
+
   return await repository.save({
     ...user,
     ...allowed

package/server/controllers/signin.ts

@@ -5,11 +5,26 @@ import { sendUnlockUserEmail } from '../controllers/unlock-user'
 import { AuthError } from '../errors/auth-error'
 import { User, UserStatus } from '../service/user/user'
 
-export async function signin(attrs, context?) {
+export async function signin(attrs: { username: string; password: string }, context?) {
   const { domain } = context?.state || {}
+  const { username } = attrs
 
   const repository = getRepository(User)
-  const user = await repository.findOne({ where: { email: ILike(attrs.email) }, relations: ['domains'] })
+
+  var user = await repository.findOne({
+    where: { username },
+    relations: ['domains']
+  })
+
+  if (!user && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+    user = await repository.findOne({
+      where: {
+        email: ILike(username)
+      },
+      relations: ['domains']
+    })
+  }
+
   if (!user)
     throw new AuthError({
       errorCode: AuthError.ERROR_CODES.USER_NOT_FOUND
@@ -29,6 +44,7 @@ export async function signin(attrs, context?) {
     throw new AuthError({
       errorCode: AuthError.ERROR_CODES.USER_LOCKED,
       detail: {
+        username: user.username,
         email: user.email
       }
     })
@@ -46,6 +62,7 @@ export async function signin(attrs, context?) {
       throw new AuthError({
         errorCode: AuthError.ERROR_CODES.USER_LOCKED,
         detail: {
+          username: user.username,
           email: user.email
         }
       })
@@ -53,6 +70,7 @@ export async function signin(attrs, context?) {
     throw new AuthError({
       errorCode: AuthError.ERROR_CODES.PASSWORD_NOT_MATCHED,
       detail: {
+        username: user.username,
         email: user.email,
         failCount: user.failCount
       }
@@ -66,6 +84,7 @@ export async function signin(attrs, context?) {
     throw new AuthError({
       errorCode: AuthError.ERROR_CODES.USER_NOT_ACTIVATED,
       detail: {
+        username: user.username,
         email: user.email
       }
     })

package/server/controllers/signup.ts

@@ -8,19 +8,31 @@ import { signin } from './signin'
 import { sendVerificationEmail } from './verification'
 
 export async function signup(attrs, withEmailVerification?: Boolean) {
-  const { name, email, password, domain, context } = attrs
+  const { name, username, password, domain, context } = attrs
 
   /* check if password is following the rule */
   User.validatePasswordByRule(password, context.lng)
 
   const repository = getRepository(User)
-  const duplicated = await repository.findOneBy({ email: ILike(email) })
+
+  var duplicated = await repository.findOne({
+    where: { username },
+    relations: ['domains']
+  })
+
+  if (!duplicated && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(username)) {
+    user = await repository.findOne({
+      where: { email: ILike(username) },
+      relations: ['domains']
+    })
+  }
+
   if (duplicated) {
     throw new AuthError({
       errorCode: USER_DUPLICATED,
       detail: {
         name,
-        email
+        username
       }
     })
   }
@@ -48,7 +60,7 @@ export async function signup(attrs, withEmailVerification?: Boolean) {
     return {
       token: await signin(
         {
-          email,
+          username,
           password
         },
         { domain }

package/server/controllers/unlock-user.ts

@@ -20,6 +20,7 @@ export async function sendUnlockUserEmail({ user, context }) {
         receiver: user.email,
         subject: 'Your account is locked',
         content: getUnlockUserEmailForm({
+          username: user.username,
           name: user.name,
           resetUrl: serviceUrl
         })

package/server/controllers/verification.ts

@@ -21,6 +21,7 @@ export async function sendVerificationEmail({ user, context }) {
         receiver: user.email,
         subject: 'Verify your email',
         content: getVerificationEmailForm({
+          username: user.username,
           name: user.name,
           verifyUrl: serviceUrl
         })

package/server/middlewares/domain-authenticate-middleware.ts

@@ -1,14 +1,9 @@
-import { config } from '@things-factory/env'
 import { Domain, getRepository } from '@things-factory/shell'
 
 import { AuthError } from '../errors/auth-error'
 import { User } from '../service/user/user'
 import { getUserDomains } from '../utils/get-user-domains'
 
-const useVirtualHostBasedDomain = !!config.get('useVirtualHostBasedDomain')
-const fixed = config.get('subdomain')
-const subdomainOffset = config.getNumber('subdomainOffset', 2)
-
 declare global {
   namespace NodeJS {
     interface Process {

package/server/middlewares/signin-middleware.ts

@@ -7,17 +7,18 @@ passport.use(
   'signin',
   new localStrategy(
     {
-      usernameField: 'email',
-      passwordField: 'password'
+      usernameField: 'username',
+      passwordField: 'password',
+      passReqToCallback: true
     },
-    async (email, password, done) => {
+    async (req, username, password, done) => {
       try {
         const {
           user: userInfo,
           token,
           domains
         } = await signin({
-          email,
+          username,
           password
         })