@things-factory/auth-base 9.0.0-beta.5 → 9.0.0-beta.52

package/dist-server/types.d.ts

@@ -1,7 +1,7 @@
 import { TFunction } from 'i18next';
 import { EntityManager } from 'typeorm';
 import { Domain } from '@things-factory/shell';
-import { User } from './service/user/user';
+import { User } from './service/user/user.js';
 declare global {
     export type ResolverContext = {
         state: IContextState;

package/dist-server/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../server/types.ts"],"names":[],"mappings":"","sourcesContent":["import { TFunction } from 'i18next'\nimport { EntityManager } from 'typeorm'\n\nimport { Domain } from '@things-factory/shell'\n\nimport { User } from './service/user/user'\n\ndeclare global {\n  export type ResolverContext = {\n    state: IContextState\n    t?: TFunction\n    [key: string]: any\n  }\n\n  interface IContextState {\n    domain: Domain\n    user: User\n    tx?: EntityManager\n    [key: string]: any\n  }\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../server/types.ts"],"names":[],"mappings":"","sourcesContent":["import { TFunction } from 'i18next'\nimport { EntityManager } from 'typeorm'\n\nimport { Domain } from '@things-factory/shell'\n\nimport { User } from './service/user/user.js'\n\ndeclare global {\n  export type ResolverContext = {\n    state: IContextState\n    t?: TFunction\n    [key: string]: any\n  }\n\n  interface IContextState {\n    domain: Domain\n    user: User\n    tx?: EntityManager\n    [key: string]: any\n  }\n}\n"]}

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

@@ -4,9 +4,8 @@ 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 max_age_js_1 = require("../constants/max-age.js");
 const accessTokenCookieKey = env_1.config.get('accessTokenCookieKey', 'access_token');
 function getAccessTokenCookie(context) {
     var _a;
@@ -17,13 +16,9 @@ function setAccessTokenCookie(context, token) {
     var cookie = {
         secure,
         httpOnly: true,
-        maxAge: max_age_1.MAX_AGE,
+        maxAge: max_age_js_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,wDAAiD;AAEjD,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,oBAAO;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.js'\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-permission.d.ts

@@ -1,6 +1,6 @@
 import { Domain } from '@things-factory/shell';
-import { PrivilegeObject } from '../service/privilege/privilege';
-import { User } from '../service/user/user';
+import { PrivilegeObject } from '../service/privilege/privilege.js';
+import { User } from '../service/user/user.js';
 export declare function checkPermission(privilegeObject: PrivilegeObject, user: User, domain: Domain, unsafeIP?: boolean, prohibitedPrivileges?: {
     category: string;
     privilege: string;

package/dist-server/utils/check-permission.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkPermission = checkPermission;
-const user_1 = require("../service/user/user");
+const user_js_1 = require("../service/user/user.js");
 async function checkPermission(privilegeObject, user, domain, unsafeIP, prohibitedPrivileges) {
     if (!privilegeObject) {
         return true;
@@ -13,7 +13,7 @@ async function checkPermission(privilegeObject, user, domain, unsafeIP, prohibit
             if ((prohibitedPrivileges || []).find(pp => pp.category == category && pp.privilege == privilege)) {
                 return false;
             }
-            return await user_1.User.hasPrivilege(privilege, category, domain, user);
+            return await user_js_1.User.hasPrivilege(privilege, category, domain, user);
         }
         // privilege, category가 설정되지 않은 경우에는 ownership granted가 설정되었다면 허가하지 않는다.
         return !domainOwnerGranted && !superUserGranted;
@@ -31,7 +31,7 @@ async function checkPermission(privilegeObject, user, domain, unsafeIP, prohibit
         if ((prohibitedPrivileges || []).find(pp => pp.category == category && pp.privilege == privilege)) {
             return false;
         }
-        return await user_1.User.hasPrivilege(privilege, category, domain, user);
+        return await user_js_1.User.hasPrivilege(privilege, category, domain, user);
     }
 }
 //# sourceMappingURL=check-permission.js.map

package/dist-server/utils/check-permission.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-permission.js","sourceRoot":"","sources":["../../server/utils/check-permission.ts"],"names":[],"mappings":";;AAIA,0CA+CC;AAjDD,+CAA2C;AAEpC,KAAK,UAAU,eAAe,CACnC,eAAgC,EAChC,IAAU,EACV,MAAc,EACd,QAAkB,EAClB,oBAAgE;IAEhE,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,eAAe,CAAA;IAEnG,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,SAAS,IAAI,QAAQ,EAAE,CAAC;YAC1B,8CAA8C;YAC9C,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,IAAI,QAAQ,IAAI,EAAE,CAAC,SAAS,IAAI,SAAS,CAAC,EAAE,CAAC;gBAClG,OAAO,KAAK,CAAA;YACd,CAAC;YAED,OAAO,MAAM,WAAI,CAAC,YAAY,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACnE,CAAC;QAED,wEAAwE;QACxE,OAAO,CAAC,kBAAkB,IAAI,CAAC,gBAAgB,CAAA;IACjD,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,8DAA8D;YAC9D,OAAO,CACL,CAAC,kBAAkB,IAAI,CAAC,MAAM,OAAO,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;gBACxE,CAAC,gBAAgB,IAAI,CAAC,MAAM,OAAO,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CACrE,CAAA;QACH,CAAC;QAED,IACE,CAAC,kBAAkB,IAAI,CAAC,MAAM,OAAO,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;YACxE,CAAC,gBAAgB,IAAI,CAAC,MAAM,OAAO,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EACpE,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,IAAI,QAAQ,IAAI,EAAE,CAAC,SAAS,IAAI,SAAS,CAAC,EAAE,CAAC;YAClG,OAAO,KAAK,CAAA;QACd,CAAC;QAED,OAAO,MAAM,WAAI,CAAC,YAAY,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACnE,CAAC;AACH,CAAC","sourcesContent":["import { Domain } from '@things-factory/shell'\nimport { PrivilegeObject } from '../service/privilege/privilege'\nimport { User } from '../service/user/user'\n\nexport async function checkPermission(\n  privilegeObject: PrivilegeObject,\n  user: User,\n  domain: Domain,\n  unsafeIP?: boolean,\n  prohibitedPrivileges?: { category: string; privilege: string }[]\n): Promise<boolean> {\n  if (!privilegeObject) {\n    return true\n  }\n\n  const { owner: domainOwnerGranted, super: superUserGranted, category, privilege } = privilegeObject\n\n  if (unsafeIP) {\n    if (privilege && category) {\n      // unsafeIP 상황에서는 ownership granted는 적용되지 않는다.\n      if ((prohibitedPrivileges || []).find(pp => pp.category == category && pp.privilege == privilege)) {\n        return false\n      }\n\n      return await User.hasPrivilege(privilege, category, domain, user)\n    }\n\n    // privilege, category가 설정되지 않은 경우에는 ownership granted가 설정되었다면 허가하지 않는다.\n    return !domainOwnerGranted && !superUserGranted\n  } else {\n    if (!privilege || !category) {\n      // privilege, category가 설정되지 않은 경우에는 ownership granted만을 적용한다.\n      return (\n        (domainOwnerGranted && (await process.domainOwnerGranted(domain, user))) ||\n        (superUserGranted && (await process.superUserGranted(domain, user)))\n      )\n    }\n\n    if (\n      (domainOwnerGranted && (await process.domainOwnerGranted(domain, user))) ||\n      (superUserGranted && (await process.superUserGranted(domain, user)))\n    ) {\n      return true\n    }\n\n    if ((prohibitedPrivileges || []).find(pp => pp.category == category && pp.privilege == privilege)) {\n      return false\n    }\n\n    return await User.hasPrivilege(privilege, category, domain, user)\n  }\n}\n"]}
+{"version":3,"file":"check-permission.js","sourceRoot":"","sources":["../../server/utils/check-permission.ts"],"names":[],"mappings":";;AAIA,0CA+CC;AAjDD,qDAA8C;AAEvC,KAAK,UAAU,eAAe,CACnC,eAAgC,EAChC,IAAU,EACV,MAAc,EACd,QAAkB,EAClB,oBAAgE;IAEhE,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,eAAe,CAAA;IAEnG,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,SAAS,IAAI,QAAQ,EAAE,CAAC;YAC1B,8CAA8C;YAC9C,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,IAAI,QAAQ,IAAI,EAAE,CAAC,SAAS,IAAI,SAAS,CAAC,EAAE,CAAC;gBAClG,OAAO,KAAK,CAAA;YACd,CAAC;YAED,OAAO,MAAM,cAAI,CAAC,YAAY,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACnE,CAAC;QAED,wEAAwE;QACxE,OAAO,CAAC,kBAAkB,IAAI,CAAC,gBAAgB,CAAA;IACjD,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,8DAA8D;YAC9D,OAAO,CACL,CAAC,kBAAkB,IAAI,CAAC,MAAM,OAAO,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;gBACxE,CAAC,gBAAgB,IAAI,CAAC,MAAM,OAAO,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CACrE,CAAA;QACH,CAAC;QAED,IACE,CAAC,kBAAkB,IAAI,CAAC,MAAM,OAAO,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;YACxE,CAAC,gBAAgB,IAAI,CAAC,MAAM,OAAO,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EACpE,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,IAAI,QAAQ,IAAI,EAAE,CAAC,SAAS,IAAI,SAAS,CAAC,EAAE,CAAC;YAClG,OAAO,KAAK,CAAA;QACd,CAAC;QAED,OAAO,MAAM,cAAI,CAAC,YAAY,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACnE,CAAC;AACH,CAAC","sourcesContent":["import { Domain } from '@things-factory/shell'\nimport { PrivilegeObject } from '../service/privilege/privilege.js'\nimport { User } from '../service/user/user.js'\n\nexport async function checkPermission(\n  privilegeObject: PrivilegeObject,\n  user: User,\n  domain: Domain,\n  unsafeIP?: boolean,\n  prohibitedPrivileges?: { category: string; privilege: string }[]\n): Promise<boolean> {\n  if (!privilegeObject) {\n    return true\n  }\n\n  const { owner: domainOwnerGranted, super: superUserGranted, category, privilege } = privilegeObject\n\n  if (unsafeIP) {\n    if (privilege && category) {\n      // unsafeIP 상황에서는 ownership granted는 적용되지 않는다.\n      if ((prohibitedPrivileges || []).find(pp => pp.category == category && pp.privilege == privilege)) {\n        return false\n      }\n\n      return await User.hasPrivilege(privilege, category, domain, user)\n    }\n\n    // privilege, category가 설정되지 않은 경우에는 ownership granted가 설정되었다면 허가하지 않는다.\n    return !domainOwnerGranted && !superUserGranted\n  } else {\n    if (!privilege || !category) {\n      // privilege, category가 설정되지 않은 경우에는 ownership granted만을 적용한다.\n      return (\n        (domainOwnerGranted && (await process.domainOwnerGranted(domain, user))) ||\n        (superUserGranted && (await process.superUserGranted(domain, user)))\n      )\n    }\n\n    if (\n      (domainOwnerGranted && (await process.domainOwnerGranted(domain, user))) ||\n      (superUserGranted && (await process.superUserGranted(domain, user)))\n    ) {\n      return true\n    }\n\n    if ((prohibitedPrivileges || []).find(pp => pp.category == category && pp.privilege == privilege)) {\n      return false\n    }\n\n    return await User.hasPrivilege(privilege, category, domain, user)\n  }\n}\n"]}

package/dist-server/utils/check-user-belongs-domain.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 Based on domain and user information,
  * Find out whether the user belongs domain or user has partnership with domain

package/dist-server/utils/check-user-belongs-domain.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkUserBelongsDomain = checkUserBelongsDomain;
 const shell_1 = require("@things-factory/shell");
-const user_1 = require("../service/user/user");
+const user_js_1 = require("../service/user/user.js");
 /**
  * @description Based on domain and user information,
  * Find out whether the user belongs domain or user has partnership with domain
@@ -13,7 +13,7 @@ const user_1 = require("../service/user/user");
 async function checkUserBelongsDomain(domain, user) {
     var _a;
     if (!((_a = user.domains) === null || _a === void 0 ? void 0 : _a.length)) {
-        user = await (0, shell_1.getRepository)(user_1.User).findOne({ where: { id: user.id }, relations: ['domains'] });
+        user = await (0, shell_1.getRepository)(user_js_1.User).findOne({ where: { id: user.id }, relations: ['domains'] });
     }
     const { domains: userDomains } = user;
     return Boolean(userDomains.find((userDomain) => userDomain.id === domain.id));

package/dist-server/utils/check-user-belongs-domain.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-user-belongs-domain.js","sourceRoot":"","sources":["../../server/utils/check-user-belongs-domain.ts"],"names":[],"mappings":";;AAWA,wDAOC;AAlBD,iDAA6D;AAE7D,+CAA2C;AAE3C;;;;;;GAMG;AACI,KAAK,UAAU,sBAAsB,CAAC,MAAc,EAAE,IAAU;;IACrE,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,CAAA,EAAE,CAAC;QAC1B,IAAI,GAAG,MAAM,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAC9F,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAS,IAAI,CAAA;IAC3C,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,UAAkB,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;AACvF,CAAC","sourcesContent":["import { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../service/user/user'\n\n/**\n * @description Based on domain and user information,\n * Find out whether the user belongs domain or user has partnership with domain\n *\n * @param domain\n * @param user\n */\nexport async function checkUserBelongsDomain(domain: Domain, user: User): Promise<Boolean> {\n  if (!user.domains?.length) {\n    user = await getRepository(User).findOne({ where: { id: user.id }, relations: ['domains'] })\n  }\n\n  const { domains: userDomains }: User = user\n  return Boolean(userDomains.find((userDomain: Domain) => userDomain.id === domain.id))\n}\n"]}
+{"version":3,"file":"check-user-belongs-domain.js","sourceRoot":"","sources":["../../server/utils/check-user-belongs-domain.ts"],"names":[],"mappings":";;AAWA,wDAOC;AAlBD,iDAA6D;AAE7D,qDAA8C;AAE9C;;;;;;GAMG;AACI,KAAK,UAAU,sBAAsB,CAAC,MAAc,EAAE,IAAU;;IACrE,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,CAAA,EAAE,CAAC;QAC1B,IAAI,GAAG,MAAM,IAAA,qBAAa,EAAC,cAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAC9F,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAS,IAAI,CAAA;IAC3C,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,UAAkB,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;AACvF,CAAC","sourcesContent":["import { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../service/user/user.js'\n\n/**\n * @description Based on domain and user information,\n * Find out whether the user belongs domain or user has partnership with domain\n *\n * @param domain\n * @param user\n */\nexport async function checkUserBelongsDomain(domain: Domain, user: User): Promise<Boolean> {\n  if (!user.domains?.length) {\n    user = await getRepository(User).findOne({ where: { id: user.id }, relations: ['domains'] })\n  }\n\n  const { domains: userDomains }: User = user\n  return Boolean(userDomains.find((userDomain: Domain) => userDomain.id === domain.id))\n}\n"]}

package/dist-server/utils/get-domain-users.d.ts

@@ -1,5 +1,5 @@
 import { EntityManager, SelectQueryBuilder } from 'typeorm';
 import { Domain } from '@things-factory/shell';
-import { User } from '../service/user/user';
+import { User } from '../service/user/user.js';
 export declare function getDomainUsers(domain: Partial<Domain>, trxMgr?: EntityManager): Promise<User[]>;
 export declare function buildDomainUsersQueryBuilder(domainId: string, alias?: string, trxMgr?: EntityManager): SelectQueryBuilder<User>;

package/dist-server/utils/get-domain-users.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDomainUsers = getDomainUsers;
 exports.buildDomainUsersQueryBuilder = buildDomainUsersQueryBuilder;
 const shell_1 = require("@things-factory/shell");
-const user_1 = require("../service/user/user");
+const user_js_1 = require("../service/user/user.js");
 async function getDomainUsers(domain, trxMgr) {
     const domainRepo = (trxMgr === null || trxMgr === void 0 ? void 0 : trxMgr.getRepository(shell_1.Domain)) || (0, shell_1.getRepository)(shell_1.Domain);
     if (!domain.id) {
@@ -16,7 +16,7 @@ async function getDomainUsers(domain, trxMgr) {
     return await qb.getMany();
 }
 function buildDomainUsersQueryBuilder(domainId, alias = 'USER', trxMgr) {
-    const userRepo = (trxMgr === null || trxMgr === void 0 ? void 0 : trxMgr.getRepository(user_1.User)) || (0, shell_1.getRepository)(user_1.User);
+    const userRepo = (trxMgr === null || trxMgr === void 0 ? void 0 : trxMgr.getRepository(user_js_1.User)) || (0, shell_1.getRepository)(user_js_1.User);
     const qb = userRepo.createQueryBuilder(alias);
     qb.select().andWhere(`${alias}.id IN ${qb
         .subQuery()

package/dist-server/utils/get-domain-users.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-domain-users.js","sourceRoot":"","sources":["../../server/utils/get-domain-users.ts"],"names":[],"mappings":";;AAMA,wCAYC;AAED,oEAiBC;AAnCD,iDAA6D;AAE7D,+CAA2C;AAEpC,KAAK,UAAU,cAAc,CAAC,MAAuB,EAAE,MAAsB;IAClF,MAAM,UAAU,GAAuB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,cAAM,CAAC,KAAI,IAAA,qBAAa,EAAC,cAAM,CAAC,CAAA;IAE7F,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,MAAM,WAAW,GAAW,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;QAClF,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,8CAA8C,MAAM,EAAE,CAAC,CAAA;QAEzF,MAAM,GAAG,WAAW,CAAA;IACtB,CAAC;IAED,MAAM,EAAE,GAA6B,4BAA4B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC5E,OAAO,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;AAC3B,CAAC;AAED,SAAgB,4BAA4B,CAC1C,QAAgB,EAChB,QAAgB,MAAM,EACtB,MAAsB;IAEtB,MAAM,QAAQ,GAAqB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,WAAI,CAAC,KAAI,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAA;IACrF,MAAM,EAAE,GAA6B,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;IACvE,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,CAClB,GAAG,KAAK,UAAU,EAAE;SACjB,QAAQ,EAAE;SACV,MAAM,CAAC,wBAAwB,CAAC;SAChC,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC;SACtC,KAAK,CAAC,sCAAsC,EAAE,EAAE,QAAQ,EAAE,CAAC;SAC3D,QAAQ,EAAE,EAAE,CAChB,CAAA;IAED,OAAO,EAAE,CAAA;AACX,CAAC","sourcesContent":["import { EntityManager, Repository, SelectQueryBuilder } from 'typeorm'\n\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../service/user/user'\n\nexport async function getDomainUsers(domain: Partial<Domain>, trxMgr?: EntityManager): Promise<User[]> {\n  const domainRepo: Repository<Domain> = trxMgr?.getRepository(Domain) || getRepository(Domain)\n\n  if (!domain.id) {\n    const foundDomain: Domain = await domainRepo.findOne({ where: { id: domain.id } })\n    if (!foundDomain) throw new Error(`Failed to find domain by passed condition, ${domain}`)\n\n    domain = foundDomain\n  }\n\n  const qb: SelectQueryBuilder<User> = buildDomainUsersQueryBuilder(domain.id)\n  return await qb.getMany()\n}\n\nexport function buildDomainUsersQueryBuilder(\n  domainId: string,\n  alias: string = 'USER',\n  trxMgr?: EntityManager\n): SelectQueryBuilder<User> {\n  const userRepo: Repository<User> = trxMgr?.getRepository(User) || getRepository(User)\n  const qb: SelectQueryBuilder<User> = userRepo.createQueryBuilder(alias)\n  qb.select().andWhere(\n    `${alias}.id IN ${qb\n      .subQuery()\n      .select('USERS_DOMAINS.users_id')\n      .from('users_domains', 'USERS_DOMAINS')\n      .where('USERS_DOMAINS.domains_id = :domainId', { domainId })\n      .getQuery()}`\n  )\n\n  return qb\n}\n"]}
+{"version":3,"file":"get-domain-users.js","sourceRoot":"","sources":["../../server/utils/get-domain-users.ts"],"names":[],"mappings":";;AAMA,wCAYC;AAED,oEAiBC;AAnCD,iDAA6D;AAE7D,qDAA8C;AAEvC,KAAK,UAAU,cAAc,CAAC,MAAuB,EAAE,MAAsB;IAClF,MAAM,UAAU,GAAuB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,cAAM,CAAC,KAAI,IAAA,qBAAa,EAAC,cAAM,CAAC,CAAA;IAE7F,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,MAAM,WAAW,GAAW,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;QAClF,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,8CAA8C,MAAM,EAAE,CAAC,CAAA;QAEzF,MAAM,GAAG,WAAW,CAAA;IACtB,CAAC;IAED,MAAM,EAAE,GAA6B,4BAA4B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC5E,OAAO,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;AAC3B,CAAC;AAED,SAAgB,4BAA4B,CAC1C,QAAgB,EAChB,QAAgB,MAAM,EACtB,MAAsB;IAEtB,MAAM,QAAQ,GAAqB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,cAAI,CAAC,KAAI,IAAA,qBAAa,EAAC,cAAI,CAAC,CAAA;IACrF,MAAM,EAAE,GAA6B,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;IACvE,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,CAClB,GAAG,KAAK,UAAU,EAAE;SACjB,QAAQ,EAAE;SACV,MAAM,CAAC,wBAAwB,CAAC;SAChC,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC;SACtC,KAAK,CAAC,sCAAsC,EAAE,EAAE,QAAQ,EAAE,CAAC;SAC3D,QAAQ,EAAE,EAAE,CAChB,CAAA;IAED,OAAO,EAAE,CAAA;AACX,CAAC","sourcesContent":["import { EntityManager, Repository, SelectQueryBuilder } from 'typeorm'\n\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../service/user/user.js'\n\nexport async function getDomainUsers(domain: Partial<Domain>, trxMgr?: EntityManager): Promise<User[]> {\n  const domainRepo: Repository<Domain> = trxMgr?.getRepository(Domain) || getRepository(Domain)\n\n  if (!domain.id) {\n    const foundDomain: Domain = await domainRepo.findOne({ where: { id: domain.id } })\n    if (!foundDomain) throw new Error(`Failed to find domain by passed condition, ${domain}`)\n\n    domain = foundDomain\n  }\n\n  const qb: SelectQueryBuilder<User> = buildDomainUsersQueryBuilder(domain.id)\n  return await qb.getMany()\n}\n\nexport function buildDomainUsersQueryBuilder(\n  domainId: string,\n  alias: string = 'USER',\n  trxMgr?: EntityManager\n): SelectQueryBuilder<User> {\n  const userRepo: Repository<User> = trxMgr?.getRepository(User) || getRepository(User)\n  const qb: SelectQueryBuilder<User> = userRepo.createQueryBuilder(alias)\n  qb.select().andWhere(\n    `${alias}.id IN ${qb\n      .subQuery()\n      .select('USERS_DOMAINS.users_id')\n      .from('users_domains', 'USERS_DOMAINS')\n      .where('USERS_DOMAINS.domains_id = :domainId', { domainId })\n      .getQuery()}`\n  )\n\n  return qb\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>[]>;
+import { User } from '../service/user/user.js';
+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) {
+const user_js_1 = require("../service/user/user.js");
+async function getUserDomains(user, extType) {
     return (await (0, shell_1.getRepository)(shell_1.Domain)
         .createQueryBuilder('DOMAIN')
         .where(qb => {
@@ -14,7 +13,7 @@ async function getUserDomains(user) {
             .subQuery()
             .distinct(true)
             .select('DOMAIN.id')
-            .from(user_1.User, 'USER')
+            .from(user_js_1.User, 'USER')
             .leftJoin('USER.roles', 'ROLE')
             .leftJoin('ROLE.domain', 'DOMAIN')
             .where('USER.id = :userId', { userId: user.id })
@@ -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')
@@ -64,7 +68,7 @@ async function getDomainsWithPrivilege(user, privilege, category) {
             .subQuery()
             .distinct(true)
             .select('DOMAIN.id')
-            .from(user_1.User, 'USER')
+            .from(user_js_1.User, 'USER')
             .leftJoin('USER.roles', 'ROLE')
             .leftJoin('ROLE.domain', 'DOMAIN')
             .leftJoin('ROLE.privileges', 'PRIVILEGE')

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.js'\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/helps/config/recaptcha.ja.md

@@ -0,0 +1,49 @@
+# reCAPTCHA
+
+reCAPTCHAは、ユーザーが人間かボットかを確認するために使用されます。
+
+Google Cloud Consoleでサービスアカウントを作成できます。
+サービスアカウントを作成するには、「IAM & Admin」セクションに移動し、
+「Service Accounts」を選択して「Create Service Account」をクリックします。
+必要な資格情報を生成するための指示に従ってください。
+
+## サービスアカウント情報
+
+- **type**: サービスアカウントのタイプ
+- **project_id**: プロジェクトID
+- **private_key_id**: プライベートキーID
+- **private_key**: プライベートキー
+- **client_email**: クライアントメール
+- **client_id**: クライアントID
+- **auth_uri**: 認証URI
+- **token_uri**: トークンURI
+- **auth_provider_x509_cert_url**: 認証プロバイダーx509証明書URL
+- **client_x509_cert_url**: クライアントx509証明書URL
+- **universe_domain**: ユニバースドメイン
+
+## サイトキー
+
+- **siteKey**: reCAPTCHAサイトキー
+
+## 設定例
+
+```javascript
+module.exports = {
+  recaptcha: {
+    serviceAccount: {
+      type: 'service_account',
+      project_id: '--',
+      private_key_id: '-----',
+      private_key: '-----BEGIN PRIVATE KEY-----\nXXXX==\n-----END PRIVATE KEY-----\n',
+      client_email: 'abc@xyz.com',
+      client_id: '----',
+      auth_uri: 'https://accounts.google.com/o/oauth2/auth',
+      token_uri: 'https://oauth2.googleapis.com/token',
+      auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs',
+      client_x509_cert_url: 'https://www.googleapis.com/robot/v1/metadata/x509/abc%40xyz.com',
+      universe_domain: 'googleapis.com'
+    },
+    siteKey: '6Ld1Dr4qAAAAAMJBYZheIOw8wQopz5NwraHAbCzt'
+  }
+}
+```

package/helps/config/recaptcha.ko.md

@@ -0,0 +1,49 @@
+# reCAPTCHA 설정 도움말
+
+reCAPTCHA는 사용자가 사람인지 봇인지 확인하는 데 사용됩니다.
+
+서비스 계정은 Google Cloud Console에서 생성할 수 있습니다.
+서비스 계정을 생성하려면 "IAM 및 관리자" 섹션으로 이동하여
+"서비스 계정"을 선택한 다음 "서비스 계정 만들기"를 클릭합니다.
+필요한 자격 증명을 생성하는 지침을 따르세요.
+
+## 서비스 계정 정보
+
+- **type**: 서비스 계정 유형
+- **project_id**: 프로젝트 ID
+- **private_key_id**: 개인 키 ID
+- **private_key**: 개인 키
+- **client_email**: 클라이언트 이메일
+- **client_id**: 클라이언트 ID
+- **auth_uri**: 인증 URI
+- **token_uri**: 토큰 URI
+- **auth_provider_x509_cert_url**: 인증 제공자 x509 인증서 URL
+- **client_x509_cert_url**: 클라이언트 x509 인증서 URL
+- **universe_domain**: 유니버스 도메인
+
+## 사이트 키
+
+- **siteKey**: reCAPTCHA 사이트 키
+
+## 설정 예시
+
+```javascript
+module.exports = {
+  recaptcha: {
+    serviceAccount: {
+      type: 'service_account',
+      project_id: '--',
+      private_key_id: '-----',
+      private_key: '-----BEGIN PRIVATE KEY-----\nXXXX==\n-----END PRIVATE KEY-----\n',
+      client_email: 'abc@xyz.com',
+      client_id: '----',
+      auth_uri: 'https://accounts.google.com/o/oauth2/auth',
+      token_uri: 'https://oauth2.googleapis.com/token',
+      auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs',
+      client_x509_cert_url: 'https://www.googleapis.com/robot/v1/metadata/x509/abc%40xyz.com',
+      universe_domain: 'googleapis.com'
+    },
+    siteKey: '6Ld1Dr4qAAAAAMJBYZheIOw8wQopz5NwraHAbCzt'
+  }
+}
+```

package/helps/config/recaptcha.md

@@ -0,0 +1,49 @@
+# reCAPTCHA
+
+reCAPTCHA is used to verify whether a user is human or a bot.
+
+A service account can be created in the Google Cloud Console.
+To create a service account, navigate to the "IAM & Admin" section,
+select "Service Accounts," and then click "Create Service Account."
+Follow the instructions to generate the necessary credentials.
+
+## Service Account Information
+
+- **type**: Service account type
+- **project_id**: Project ID
+- **private_key_id**: Private key ID
+- **private_key**: Private key
+- **client_email**: Client email
+- **client_id**: Client ID
+- **auth_uri**: Auth URI
+- **token_uri**: Token URI
+- **auth_provider_x509_cert_url**: Auth provider x509 cert URL
+- **client_x509_cert_url**: Client x509 cert URL
+- **universe_domain**: Universe domain
+
+## Site Key
+
+- **siteKey**: reCAPTCHA site key
+
+## Configuration Example
+
+```javascript
+module.exports = {
+  recaptcha: {
+    serviceAccount: {
+      type: 'service_account',
+      project_id: '--',
+      private_key_id: '-----',
+      private_key: '-----BEGIN PRIVATE KEY-----\nXXXX==\n-----END PRIVATE KEY-----\n',
+      client_email: 'abc@xyz.com',
+      client_id: '----',
+      auth_uri: 'https://accounts.google.com/o/oauth2/auth',
+      token_uri: 'https://oauth2.googleapis.com/token',
+      auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs',
+      client_x509_cert_url: 'https://www.googleapis.com/robot/v1/metadata/x509/abc%40xyz.com',
+      universe_domain: 'googleapis.com'
+    },
+    siteKey: '6Ld1Dr4qAAAAAMJBYZheIOw8wQopz5NwraHAbCzt'
+  }
+}
+```

package/helps/config/recaptcha.ms.md

@@ -0,0 +1,49 @@
+# reCAPTCHA
+
+reCAPTCHA digunakan untuk mengesahkan sama ada pengguna adalah manusia atau bot.
+
+Akaun perkhidmatan boleh dibuat di Google Cloud Console.
+Untuk membuat akaun perkhidmatan, navigasi ke bahagian "IAM & Admin",
+pilih "Service Accounts," dan kemudian klik "Create Service Account."
+Ikuti arahan untuk menjana kelayakan yang diperlukan.
+
+## Maklumat Akaun Perkhidmatan
+
+- **type**: Jenis akaun perkhidmatan
+- **project_id**: ID Projek
+- **private_key_id**: ID kunci peribadi
+- **private_key**: Kunci peribadi
+- **client_email**: E-mel pelanggan
+- **client_id**: ID pelanggan
+- **auth_uri**: URI pengesahan
+- **token_uri**: URI token
+- **auth_provider_x509_cert_url**: URL sijil x509 penyedia pengesahan
+- **client_x509_cert_url**: URL sijil x509 pelanggan
+- **universe_domain**: Domain alam semesta
+
+## Kunci Laman
+
+- **siteKey**: Kunci laman reCAPTCHA
+
+## Contoh Konfigurasi
+
+```javascript
+module.exports = {
+  recaptcha: {
+    serviceAccount: {
+      type: 'service_account',
+      project_id: '--',
+      private_key_id: '-----',
+      private_key: '-----BEGIN PRIVATE KEY-----\nXXXX==\n-----END PRIVATE KEY-----\n',
+      client_email: 'abc@xyz.com',
+      client_id: '----',
+      auth_uri: 'https://accounts.google.com/o/oauth2/auth',
+      token_uri: 'https://oauth2.googleapis.com/token',
+      auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs',
+      client_x509_cert_url: 'https://www.googleapis.com/robot/v1/metadata/x509/abc%40xyz.com',
+      universe_domain: 'googleapis.com'
+    },
+    siteKey: '6Ld1Dr4qAAAAAMJBYZheIOw8wQopz5NwraHAbCzt'
+  }
+}
+```

package/helps/config/recaptcha.zh.md

@@ -0,0 +1,49 @@
+# reCAPTCHA
+
+reCAPTCHA 用于验证用户是人类还是机器人。
+
+可以在 Google Cloud Console 中创建服务帐户。
+要创建服务帐户，请导航到“IAM 和管理”部分，
+选择“服务帐户”，然后点击“创建服务帐户”。
+按照说明生成必要的凭据。
+
+## 服务帐户信息
+
+- **type**: 服务帐户类型
+- **project_id**: 项目 ID
+- **private_key_id**: 私钥 ID
+- **private_key**: 私钥
+- **client_email**: 客户端电子邮件
+- **client_id**: 客户端 ID
+- **auth_uri**: 认证 URI
+- **token_uri**: 令牌 URI
+- **auth_provider_x509_cert_url**: 认证提供者 x509 证书 URL
+- **client_x509_cert_url**: 客户端 x509 证书 URL
+- **universe_domain**: 宇宙域
+
+## 网站密钥
+
+- **siteKey**: reCAPTCHA 网站密钥
+
+## 配置示例
+
+```javascript
+module.exports = {
+  recaptcha: {
+    serviceAccount: {
+      type: 'service_account',
+      project_id: '--',
+      private_key_id: '-----',
+      private_key: '-----BEGIN PRIVATE KEY-----\nXXXX==\n-----END PRIVATE KEY-----\n',
+      client_email: 'abc@xyz.com',
+      client_id: '----',
+      auth_uri: 'https://accounts.google.com/o/oauth2/auth',
+      token_uri: 'https://oauth2.googleapis.com/token',
+      auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs',
+      client_x509_cert_url: 'https://www.googleapis.com/robot/v1/metadata/x509/abc%40xyz.com',
+      universe_domain: 'googleapis.com'
+    },
+    siteKey: '6Ld1Dr4qAAAAAMJBYZheIOw8wQopz5NwraHAbCzt'
+  }
+}
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "9.0.0-beta.5",
+  "version": "9.0.0-beta.52",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -30,12 +30,13 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
+    "@google-cloud/recaptcha-enterprise": "^5.13.0",
     "@simplewebauthn/browser": "^13.0.0",
     "@simplewebauthn/server": "^13.0.0",
-    "@things-factory/email-base": "^9.0.0-beta.5",
-    "@things-factory/env": "^9.0.0-beta.5",
-    "@things-factory/shell": "^9.0.0-beta.5",
-    "@things-factory/utils": "^9.0.0-beta.0",
+    "@things-factory/email-base": "^9.0.0-beta.52",
+    "@things-factory/env": "^9.0.0-beta.52",
+    "@things-factory/shell": "^9.0.0-beta.52",
+    "@things-factory/utils": "^9.0.0-beta.38",
     "@types/webappsec-credential-management": "^0.6.9",
     "jsonwebtoken": "^9.0.0",
     "koa-passport": "^6.0.0",
@@ -46,5 +47,5 @@
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0"
   },
-  "gitHead": "f075f1bd00a9b902a677d44f1844bcbd9c85ea97"
+  "gitHead": "887b3f87ba9072dd8c76bad6f491443419728d38"
 }

package/dist-server/utils/get-domain-from-hostname.d.ts

@@ -1 +0,0 @@
-export declare function getDomainFromHostname(hostname: any): any;