@things-factory/auth-base 9.0.0-beta.8 → 9.0.2

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

@@ -4,13 +4,11 @@ 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_js_1 = require("../constants/max-age.js");
 const accessTokenCookieKey = env_1.config.get('accessTokenCookieKey', 'access_token');
 function getAccessTokenCookie(context) {
-    var _a;
-    return (_a = context === null || context === void 0 ? void 0 : context.cookies) === null || _a === void 0 ? void 0 : _a.get(accessTokenCookieKey);
+    return context?.cookies?.get(accessTokenCookieKey);
 }
 function setAccessTokenCookie(context, token) {
     const { secure } = context;
@@ -20,10 +18,6 @@ function setAccessTokenCookie(context, token) {
         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 +36,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,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,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.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  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,OAAO,EAAE,OAAO,EAAE,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-user-belongs-domain.js

@@ -11,8 +11,7 @@ const user_js_1 = require("../service/user/user.js");
  * @param user
  */
 async function checkUserBelongsDomain(domain, user) {
-    var _a;
-    if (!((_a = user.domains) === null || _a === void 0 ? void 0 : _a.length)) {
+    if (!user.domains?.length) {
         user = await (0, shell_1.getRepository)(user_js_1.User).findOne({ where: { id: user.id }, relations: ['domains'] });
     }
     const { domains: userDomains } = user;

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,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"]}
+{"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,IAAI,CAAC,OAAO,EAAE,MAAM,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.js

@@ -5,7 +5,7 @@ exports.buildDomainUsersQueryBuilder = buildDomainUsersQueryBuilder;
 const shell_1 = require("@things-factory/shell");
 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);
+    const domainRepo = trxMgr?.getRepository(shell_1.Domain) || (0, shell_1.getRepository)(shell_1.Domain);
     if (!domain.id) {
         const foundDomain = await domainRepo.findOne({ where: { id: domain.id } });
         if (!foundDomain)
@@ -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_js_1.User)) || (0, shell_1.getRepository)(user_js_1.User);
+    const userRepo = 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,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"]}
+{"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,MAAM,EAAE,aAAa,CAAC,cAAM,CAAC,IAAI,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,MAAM,EAAE,aAAa,CAAC,cAAI,CAAC,IAAI,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.js';
 export declare function getUserDomains(user: User): Promise<Partial<Domain>[]>;
-export declare function getRoleBasedDomains(user: User): 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,11 +1,12 @@
 "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 env_1 = require("@things-factory/env");
 const user_js_1 = require("../service/user/user.js");
+const domainTypes = env_1.config.get('domainTypes', []);
 async function getUserDomains(user) {
     return (await (0, shell_1.getRepository)(shell_1.Domain)
         .createQueryBuilder('DOMAIN')
@@ -31,31 +32,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_js_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(d => !d.extType || domainTypes.includes(d.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.js'\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 { Domain, getRepository } from '@things-factory/shell'\nimport { config } from '@things-factory/env'\n\nimport { User } from '../service/user/user.js'\n\nconst domainTypes = config.get('domainTypes', [])\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  )\n    .filter(d => !d.extType || domainTypes.includes(d.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": "9.0.0-beta.8",
+  "version": "9.0.2",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -33,10 +33,10 @@
     "@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.8",
-    "@things-factory/env": "^9.0.0-beta.5",
-    "@things-factory/shell": "^9.0.0-beta.8",
-    "@things-factory/utils": "^9.0.0-beta.0",
+    "@things-factory/email-base": "^9.0.0",
+    "@things-factory/env": "^9.0.0",
+    "@things-factory/shell": "^9.0.0",
+    "@things-factory/utils": "^9.0.0",
     "@types/webappsec-credential-management": "^0.6.9",
     "jsonwebtoken": "^9.0.0",
     "koa-passport": "^6.0.0",
@@ -47,5 +47,5 @@
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0"
   },
-  "gitHead": "2dd583833981e0615a1e64386971a0f80dd7b3a4"
+  "gitHead": "5cf452159e611eea93c23010706ecfc6543405ba"
 }

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

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

package/dist-server/utils/get-domain-from-hostname.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDomainFromHostname = getDomainFromHostname;
-const env_1 = require("@things-factory/env");
-var subdomainOffset = env_1.config.get('subdomainOffset', 2);
-function getDomainFromHostname(hostname) {
-    return hostname.split('.').slice(-subdomainOffset).join('.');
-}
-//# sourceMappingURL=get-domain-from-hostname.js.map

package/dist-server/utils/get-domain-from-hostname.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-domain-from-hostname.js","sourceRoot":"","sources":["../../server/utils/get-domain-from-hostname.ts"],"names":[],"mappings":";;AAIA,sDAEC;AAND,6CAA4C;AAE5C,IAAI,eAAe,GAAG,YAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;AAEtD,SAAgB,qBAAqB,CAAC,QAAQ;IAC5C,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC9D,CAAC","sourcesContent":["import { config } from '@things-factory/env'\n\nvar subdomainOffset = config.get('subdomainOffset', 2)\n\nexport function getDomainFromHostname(hostname) {\n  return hostname.split('.').slice(-subdomainOffset).join('.')\n}\n"]}