@things-factory/auth-base 9.0.0-beta.76 → 9.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (135) hide show
  1. package/dist-client/auth.js +2 -4
  2. package/dist-client/auth.js.map +1 -1
  3. package/dist-client/reducers/auth.js +9 -2
  4. package/dist-client/reducers/auth.js.map +1 -1
  5. package/dist-client/tsconfig.tsbuildinfo +1 -1
  6. package/dist-server/controllers/change-pwd.js +5 -2
  7. package/dist-server/controllers/change-pwd.js.map +1 -1
  8. package/dist-server/controllers/checkin.js +1 -1
  9. package/dist-server/controllers/checkin.js.map +1 -1
  10. package/dist-server/controllers/delete-user.js +2 -2
  11. package/dist-server/controllers/delete-user.js.map +1 -1
  12. package/dist-server/controllers/profile.js +4 -1
  13. package/dist-server/controllers/profile.js.map +1 -1
  14. package/dist-server/controllers/reset-password.js +5 -2
  15. package/dist-server/controllers/reset-password.js.map +1 -1
  16. package/dist-server/controllers/signin.js +2 -2
  17. package/dist-server/controllers/signin.js.map +1 -1
  18. package/dist-server/controllers/signup.js +8 -1
  19. package/dist-server/controllers/signup.js.map +1 -1
  20. package/dist-server/errors/auth-error.js +3 -1
  21. package/dist-server/errors/auth-error.js.map +1 -1
  22. package/dist-server/middlewares/authenticate-401-middleware.js +22 -9
  23. package/dist-server/middlewares/authenticate-401-middleware.js.map +1 -1
  24. package/dist-server/middlewares/domain-authenticate-middleware.js +1 -1
  25. package/dist-server/middlewares/domain-authenticate-middleware.js.map +1 -1
  26. package/dist-server/middlewares/jwt-authenticate-middleware.js +1 -1
  27. package/dist-server/middlewares/jwt-authenticate-middleware.js.map +1 -1
  28. package/dist-server/migrations/1548206416130-SeedUser.js +11 -3
  29. package/dist-server/migrations/1548206416130-SeedUser.js.map +1 -1
  30. package/dist-server/router/auth-signup-router.js +5 -2
  31. package/dist-server/router/auth-signup-router.js.map +1 -1
  32. package/dist-server/router/oauth2/oauth2-authorize-router.js +5 -2
  33. package/dist-server/router/oauth2/oauth2-authorize-router.js.map +1 -1
  34. package/dist-server/router/oauth2/oauth2-router.js +1 -2
  35. package/dist-server/router/oauth2/oauth2-router.js.map +1 -1
  36. package/dist-server/router/oauth2/oauth2-server.js +21 -3
  37. package/dist-server/router/oauth2/oauth2-server.js.map +1 -1
  38. package/dist-server/router/site-root-router.js +1 -1
  39. package/dist-server/router/site-root-router.js.map +1 -1
  40. package/dist-server/router/webauthn-router.js +1 -1
  41. package/dist-server/router/webauthn-router.js.map +1 -1
  42. package/dist-server/service/app-binding/app-binding-types.js +3 -3
  43. package/dist-server/service/app-binding/app-binding-types.js.map +1 -1
  44. package/dist-server/service/app-binding/app-binding.js +6 -4
  45. package/dist-server/service/app-binding/app-binding.js.map +1 -1
  46. package/dist-server/service/appliance/appliance-mutation.js +20 -4
  47. package/dist-server/service/appliance/appliance-mutation.js.map +1 -1
  48. package/dist-server/service/appliance/appliance-types.js +18 -18
  49. package/dist-server/service/appliance/appliance-types.js.map +1 -1
  50. package/dist-server/service/appliance/appliance.js +22 -18
  51. package/dist-server/service/appliance/appliance.js.map +1 -1
  52. package/dist-server/service/application/application-mutation.js +22 -4
  53. package/dist-server/service/application/application-mutation.js.map +1 -1
  54. package/dist-server/service/application/application-types.js +24 -24
  55. package/dist-server/service/application/application-types.js.map +1 -1
  56. package/dist-server/service/application/application.d.ts +6 -6
  57. package/dist-server/service/application/application.js +22 -22
  58. package/dist-server/service/application/application.js.map +1 -1
  59. package/dist-server/service/auth-provider/auth-provider-mutation.js +29 -7
  60. package/dist-server/service/auth-provider/auth-provider-mutation.js.map +1 -1
  61. package/dist-server/service/auth-provider/auth-provider-parameter-spec.js +12 -7
  62. package/dist-server/service/auth-provider/auth-provider-parameter-spec.js.map +1 -1
  63. package/dist-server/service/auth-provider/auth-provider-type.js +24 -21
  64. package/dist-server/service/auth-provider/auth-provider-type.js.map +1 -1
  65. package/dist-server/service/auth-provider/auth-provider.js +35 -25
  66. package/dist-server/service/auth-provider/auth-provider.js.map +1 -1
  67. package/dist-server/service/domain-generator/domain-generator-mutation.js +1 -2
  68. package/dist-server/service/domain-generator/domain-generator-mutation.js.map +1 -1
  69. package/dist-server/service/domain-generator/domain-generator-types.js +17 -14
  70. package/dist-server/service/domain-generator/domain-generator-types.js.map +1 -1
  71. package/dist-server/service/domain-link/domain-link-mutation.js +23 -6
  72. package/dist-server/service/domain-link/domain-link-mutation.js.map +1 -1
  73. package/dist-server/service/domain-link/domain-link-types.js +13 -13
  74. package/dist-server/service/domain-link/domain-link-types.js.map +1 -1
  75. package/dist-server/service/domain-link/domain-link.d.ts +2 -2
  76. package/dist-server/service/domain-link/domain-link.js +11 -11
  77. package/dist-server/service/domain-link/domain-link.js.map +1 -1
  78. package/dist-server/service/granted-role/granted-role-mutation.js +7 -7
  79. package/dist-server/service/granted-role/granted-role-mutation.js.map +1 -1
  80. package/dist-server/service/granted-role/granted-role.js +4 -4
  81. package/dist-server/service/granted-role/granted-role.js.map +1 -1
  82. package/dist-server/service/invitation/invitation-mutation.js +6 -2
  83. package/dist-server/service/invitation/invitation-mutation.js.map +1 -1
  84. package/dist-server/service/invitation/invitation-types.js +3 -3
  85. package/dist-server/service/invitation/invitation-types.js.map +1 -1
  86. package/dist-server/service/invitation/invitation.js +10 -10
  87. package/dist-server/service/invitation/invitation.js.map +1 -1
  88. package/dist-server/service/login-history/login-history-type.js +3 -3
  89. package/dist-server/service/login-history/login-history-type.js.map +1 -1
  90. package/dist-server/service/login-history/login-history.js +6 -6
  91. package/dist-server/service/login-history/login-history.js.map +1 -1
  92. package/dist-server/service/partner/partner-types.js +3 -3
  93. package/dist-server/service/partner/partner-types.js.map +1 -1
  94. package/dist-server/service/partner/partner.js +8 -8
  95. package/dist-server/service/partner/partner.js.map +1 -1
  96. package/dist-server/service/password-history/password-history.js +3 -3
  97. package/dist-server/service/password-history/password-history.js.map +1 -1
  98. package/dist-server/service/privilege/privilege-directive.js +1 -2
  99. package/dist-server/service/privilege/privilege-directive.js.map +1 -1
  100. package/dist-server/service/privilege/privilege-mutation.js +11 -2
  101. package/dist-server/service/privilege/privilege-mutation.js.map +1 -1
  102. package/dist-server/service/privilege/privilege.js +20 -20
  103. package/dist-server/service/privilege/privilege.js.map +1 -1
  104. package/dist-server/service/role/role-mutation.js +12 -2
  105. package/dist-server/service/role/role-mutation.js.map +1 -1
  106. package/dist-server/service/role/role-query.js +1 -1
  107. package/dist-server/service/role/role-query.js.map +1 -1
  108. package/dist-server/service/role/role-types.js +29 -29
  109. package/dist-server/service/role/role-types.js.map +1 -1
  110. package/dist-server/service/role/role.js +11 -11
  111. package/dist-server/service/role/role.js.map +1 -1
  112. package/dist-server/service/user/user-mutation.js +89 -41
  113. package/dist-server/service/user/user-mutation.js.map +1 -1
  114. package/dist-server/service/user/user-query.js +16 -10
  115. package/dist-server/service/user/user-query.js.map +1 -1
  116. package/dist-server/service/user/user-types.js +33 -32
  117. package/dist-server/service/user/user-types.js.map +1 -1
  118. package/dist-server/service/user/user.d.ts +5 -5
  119. package/dist-server/service/user/user.js +25 -22
  120. package/dist-server/service/user/user.js.map +1 -1
  121. package/dist-server/service/users-auth-providers/users-auth-providers.js +11 -8
  122. package/dist-server/service/users-auth-providers/users-auth-providers.js.map +1 -1
  123. package/dist-server/service/verification-token/verification-token.d.ts +3 -3
  124. package/dist-server/service/verification-token/verification-token.js +8 -8
  125. package/dist-server/service/verification-token/verification-token.js.map +1 -1
  126. package/dist-server/service/web-auth-credential/web-auth-credential.js +11 -10
  127. package/dist-server/service/web-auth-credential/web-auth-credential.js.map +1 -1
  128. package/dist-server/tsconfig.tsbuildinfo +1 -1
  129. package/dist-server/utils/access-token-cookie.js +1 -2
  130. package/dist-server/utils/access-token-cookie.js.map +1 -1
  131. package/dist-server/utils/check-user-belongs-domain.js +1 -2
  132. package/dist-server/utils/check-user-belongs-domain.js.map +1 -1
  133. package/dist-server/utils/get-domain-users.js +2 -2
  134. package/dist-server/utils/get-domain-users.js.map +1 -1
  135. package/package.json +6 -6
@@ -8,8 +8,7 @@ const env_1 = require("@things-factory/env");
8
8
  const max_age_js_1 = require("../constants/max-age.js");
9
9
  const accessTokenCookieKey = env_1.config.get('accessTokenCookieKey', 'access_token');
10
10
  function getAccessTokenCookie(context) {
11
- var _a;
12
- return (_a = context === null || context === void 0 ? void 0 : context.cookies) === null || _a === void 0 ? void 0 : _a.get(accessTokenCookieKey);
11
+ return context?.cookies?.get(accessTokenCookieKey);
13
12
  }
14
13
  function setAccessTokenCookie(context, token) {
15
14
  const { secure } = context;
@@ -1 +1 @@
1
- {"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"]}
1
+ {"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"]}
@@ -11,8 +11,7 @@ const user_js_1 = require("../service/user/user.js");
11
11
  * @param user
12
12
  */
13
13
  async function checkUserBelongsDomain(domain, user) {
14
- var _a;
15
- if (!((_a = user.domains) === null || _a === void 0 ? void 0 : _a.length)) {
14
+ if (!user.domains?.length) {
16
15
  user = await (0, shell_1.getRepository)(user_js_1.User).findOne({ where: { id: user.id }, relations: ['domains'] });
17
16
  }
18
17
  const { domains: userDomains } = user;
@@ -1 +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"]}
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,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"]}
@@ -5,7 +5,7 @@ exports.buildDomainUsersQueryBuilder = buildDomainUsersQueryBuilder;
5
5
  const shell_1 = require("@things-factory/shell");
6
6
  const user_js_1 = require("../service/user/user.js");
7
7
  async function getDomainUsers(domain, trxMgr) {
8
- const domainRepo = (trxMgr === null || trxMgr === void 0 ? void 0 : trxMgr.getRepository(shell_1.Domain)) || (0, shell_1.getRepository)(shell_1.Domain);
8
+ const domainRepo = trxMgr?.getRepository(shell_1.Domain) || (0, shell_1.getRepository)(shell_1.Domain);
9
9
  if (!domain.id) {
10
10
  const foundDomain = await domainRepo.findOne({ where: { id: domain.id } });
11
11
  if (!foundDomain)
@@ -16,7 +16,7 @@ async function getDomainUsers(domain, trxMgr) {
16
16
  return await qb.getMany();
17
17
  }
18
18
  function buildDomainUsersQueryBuilder(domainId, alias = 'USER', trxMgr) {
19
- const userRepo = (trxMgr === null || trxMgr === void 0 ? void 0 : trxMgr.getRepository(user_js_1.User)) || (0, shell_1.getRepository)(user_js_1.User);
19
+ const userRepo = trxMgr?.getRepository(user_js_1.User) || (0, shell_1.getRepository)(user_js_1.User);
20
20
  const qb = userRepo.createQueryBuilder(alias);
21
21
  qb.select().andWhere(`${alias}.id IN ${qb
22
22
  .subQuery()
@@ -1 +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"]}
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,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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/auth-base",
3
- "version": "9.0.0-beta.76",
3
+ "version": "9.0.0",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "dist-client/index.js",
6
6
  "things-factory": true,
@@ -33,10 +33,10 @@
33
33
  "@google-cloud/recaptcha-enterprise": "^5.13.0",
34
34
  "@simplewebauthn/browser": "^13.0.0",
35
35
  "@simplewebauthn/server": "^13.0.0",
36
- "@things-factory/email-base": "^9.0.0-beta.71",
37
- "@things-factory/env": "^9.0.0-beta.71",
38
- "@things-factory/shell": "^9.0.0-beta.71",
39
- "@things-factory/utils": "^9.0.0-beta.71",
36
+ "@things-factory/email-base": "^9.0.0",
37
+ "@things-factory/env": "^9.0.0",
38
+ "@things-factory/shell": "^9.0.0",
39
+ "@things-factory/utils": "^9.0.0",
40
40
  "@types/webappsec-credential-management": "^0.6.9",
41
41
  "jsonwebtoken": "^9.0.0",
42
42
  "koa-passport": "^6.0.0",
@@ -47,5 +47,5 @@
47
47
  "passport-jwt": "^4.0.0",
48
48
  "passport-local": "^1.0.0"
49
49
  },
50
- "gitHead": "6bb7b465e1b7dca24c78c7e4fbbaa24afc3bc7e7"
50
+ "gitHead": "d6b5293b3ad571461b4282f19bc89288bdab2acc"
51
51
  }