npm - @things-factory/auth-base - Versions diffs - 8.0.0-beta.9 → 8.0.2 - Mend

@things-factory/auth-base 8.0.0-beta.9 → 8.0.2

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 (212) hide show

package/client/actions/auth.ts +24 -0
package/client/auth.ts +272 -0
package/client/bootstrap.ts +47 -0
package/client/directive/privileged.ts +28 -0
package/client/index.ts +3 -0
package/client/profiled.ts +83 -0
package/client/reducers/auth.ts +31 -0
package/dist-client/index.d.ts +0 -1
package/dist-client/index.js +0 -1
package/dist-client/index.js.map +1 -1
package/dist-client/tsconfig.tsbuildinfo +1 -1
package/dist-server/constants/error-code.d.ts +0 -2
package/dist-server/constants/error-code.js +1 -3
package/dist-server/constants/error-code.js.map +1 -1
package/dist-server/controllers/change-pwd.js +2 -2
package/dist-server/controllers/change-pwd.js.map +1 -1
package/dist-server/controllers/delete-user.js +12 -13
package/dist-server/controllers/delete-user.js.map +1 -1
package/dist-server/controllers/invitation.d.ts +1 -2
package/dist-server/controllers/invitation.js +5 -30
package/dist-server/controllers/invitation.js.map +1 -1
package/dist-server/controllers/profile.d.ts +3 -4
package/dist-server/controllers/profile.js +2 -20
package/dist-server/controllers/profile.js.map +1 -1
package/dist-server/controllers/signin.d.ts +1 -4
package/dist-server/controllers/signin.js +1 -17
package/dist-server/controllers/signin.js.map +1 -1
package/dist-server/controllers/signup.js +4 -13
package/dist-server/controllers/signup.js.map +1 -1
package/dist-server/controllers/unlock-user.js +0 -1
package/dist-server/controllers/unlock-user.js.map +1 -1
package/dist-server/controllers/verification.js +0 -1
package/dist-server/controllers/verification.js.map +1 -1
package/dist-server/middlewares/signin-middleware.js +4 -9
package/dist-server/middlewares/signin-middleware.js.map +1 -1
package/dist-server/middlewares/webauthn-middleware.js.map +1 -1
package/dist-server/migrations/1548206416130-SeedUser.js +1 -2
package/dist-server/migrations/1548206416130-SeedUser.js.map +1 -1
package/dist-server/router/auth-checkin-router.js +2 -8
package/dist-server/router/auth-checkin-router.js.map +1 -1
package/dist-server/router/auth-private-process-router.js +7 -12
package/dist-server/router/auth-private-process-router.js.map +1 -1
package/dist-server/router/auth-public-process-router.js +9 -20
package/dist-server/router/auth-public-process-router.js.map +1 -1
package/dist-server/router/auth-signin-router.js +3 -3
package/dist-server/router/auth-signin-router.js.map +1 -1
package/dist-server/router/webauthn-router.js +1 -51
package/dist-server/router/webauthn-router.js.map +1 -1
package/dist-server/service/invitation/invitation-mutation.d.ts +2 -3
package/dist-server/service/invitation/invitation-mutation.js +8 -20
package/dist-server/service/invitation/invitation-mutation.js.map +1 -1
package/dist-server/service/user/user-mutation.d.ts +9 -10
package/dist-server/service/user/user-mutation.js +54 -112
package/dist-server/service/user/user-mutation.js.map +1 -1
package/dist-server/service/user/user-types.d.ts +0 -1
package/dist-server/service/user/user-types.js +0 -4
package/dist-server/service/user/user-types.js.map +1 -1
package/dist-server/service/user/user.d.ts +0 -1
package/dist-server/service/user/user.js +14 -40
package/dist-server/service/user/user.js.map +1 -1
package/dist-server/templates/account-unlock-email.d.ts +1 -2
package/dist-server/templates/account-unlock-email.js +1 -1
package/dist-server/templates/account-unlock-email.js.map +1 -1
package/dist-server/templates/invitation-email.d.ts +1 -2
package/dist-server/templates/invitation-email.js +1 -1
package/dist-server/templates/invitation-email.js.map +1 -1
package/dist-server/templates/verification-email.d.ts +1 -2
package/dist-server/templates/verification-email.js +1 -1
package/dist-server/templates/verification-email.js.map +1 -1
package/dist-server/tsconfig.tsbuildinfo +1 -1
package/package.json +6 -6
package/server/constants/error-code.ts +20 -0
package/server/constants/error-message.ts +0 -0
package/server/constants/max-age.ts +1 -0
package/server/controllers/auth.ts +5 -0
package/server/controllers/change-pwd.ts +99 -0
package/server/controllers/checkin.ts +21 -0
package/server/controllers/delete-user.ts +68 -0
package/server/controllers/invitation.ts +132 -0
package/server/controllers/profile.ts +28 -0
package/server/controllers/reset-password.ts +126 -0
package/server/controllers/signin.ts +79 -0
package/server/controllers/signup.ts +60 -0
package/server/controllers/unlock-user.ts +61 -0
package/server/controllers/utils/make-invitation-token.ts +5 -0
package/server/controllers/utils/make-verification-token.ts +4 -0
package/server/controllers/utils/password-rule.ts +120 -0
package/server/controllers/utils/save-invitation-token.ts +10 -0
package/server/controllers/utils/save-verification-token.ts +12 -0
package/server/controllers/verification.ts +83 -0
package/server/errors/auth-error.ts +24 -0
package/server/errors/index.ts +2 -0
package/server/errors/user-domain-not-match-error.ts +29 -0
package/server/index.ts +37 -0
package/server/middlewares/authenticate-401-middleware.ts +114 -0
package/server/middlewares/domain-authenticate-middleware.ts +78 -0
package/server/middlewares/graphql-authenticate-middleware.ts +13 -0
package/server/middlewares/index.ts +67 -0
package/server/middlewares/jwt-authenticate-middleware.ts +84 -0
package/server/middlewares/signin-middleware.ts +55 -0
package/server/middlewares/webauthn-middleware.ts +127 -0
package/server/migrations/1548206416130-SeedUser.ts +59 -0
package/server/migrations/1566805283882-SeedPrivilege.ts +28 -0
package/server/migrations/index.ts +9 -0
package/server/router/auth-checkin-router.ts +107 -0
package/server/router/auth-private-process-router.ts +107 -0
package/server/router/auth-public-process-router.ts +302 -0
package/server/router/auth-signin-router.ts +55 -0
package/server/router/auth-signup-router.ts +95 -0
package/server/router/index.ts +9 -0
package/server/router/oauth2/index.ts +2 -0
package/server/router/oauth2/oauth2-authorize-router.ts +81 -0
package/server/router/oauth2/oauth2-router.ts +165 -0
package/server/router/oauth2/oauth2-server.ts +262 -0
package/server/router/oauth2/passport-oauth2-client-password.ts +87 -0
package/server/router/oauth2/passport-refresh-token.ts +87 -0
package/server/router/path-base-domain-router.ts +8 -0
package/server/router/site-root-router.ts +48 -0
package/server/router/webauthn-router.ts +87 -0
package/server/routes.ts +80 -0
package/server/service/app-binding/app-binding-mutation.ts +22 -0
package/server/service/app-binding/app-binding-query.ts +92 -0
package/server/service/app-binding/app-binding-types.ts +11 -0
package/server/service/app-binding/app-binding.ts +17 -0
package/server/service/app-binding/index.ts +4 -0
package/server/service/appliance/appliance-mutation.ts +113 -0
package/server/service/appliance/appliance-query.ts +76 -0
package/server/service/appliance/appliance-types.ts +56 -0
package/server/service/appliance/appliance.ts +133 -0
package/server/service/appliance/index.ts +6 -0
package/server/service/application/application-mutation.ts +104 -0
package/server/service/application/application-query.ts +98 -0
package/server/service/application/application-types.ts +76 -0
package/server/service/application/application.ts +216 -0
package/server/service/application/index.ts +6 -0
package/server/service/auth-provider/auth-provider-mutation.ts +159 -0
package/server/service/auth-provider/auth-provider-parameter-spec.ts +24 -0
package/server/service/auth-provider/auth-provider-query.ts +88 -0
package/server/service/auth-provider/auth-provider-type.ts +67 -0
package/server/service/auth-provider/auth-provider.ts +155 -0
package/server/service/auth-provider/index.ts +7 -0
package/server/service/domain-generator/domain-generator-mutation.ts +117 -0
package/server/service/domain-generator/domain-generator-types.ts +46 -0
package/server/service/domain-generator/index.ts +3 -0
package/server/service/granted-role/granted-role-mutation.ts +156 -0
package/server/service/granted-role/granted-role-query.ts +60 -0
package/server/service/granted-role/granted-role.ts +27 -0
package/server/service/granted-role/index.ts +6 -0
package/server/service/index.ts +90 -0
package/server/service/invitation/index.ts +6 -0
package/server/service/invitation/invitation-mutation.ts +63 -0
package/server/service/invitation/invitation-query.ts +33 -0
package/server/service/invitation/invitation-types.ts +11 -0
package/server/service/invitation/invitation.ts +63 -0
package/server/service/login-history/index.ts +5 -0
package/server/service/login-history/login-history-query.ts +51 -0
package/server/service/login-history/login-history-type.ts +12 -0
package/server/service/login-history/login-history.ts +45 -0
package/server/service/partner/index.ts +6 -0
package/server/service/partner/partner-mutation.ts +61 -0
package/server/service/partner/partner-query.ts +102 -0
package/server/service/partner/partner-types.ts +11 -0
package/server/service/partner/partner.ts +57 -0
package/server/service/password-history/index.ts +3 -0
package/server/service/password-history/password-history.ts +16 -0
package/server/service/privilege/index.ts +6 -0
package/server/service/privilege/privilege-directive.ts +77 -0
package/server/service/privilege/privilege-mutation.ts +92 -0
package/server/service/privilege/privilege-query.ts +94 -0
package/server/service/privilege/privilege-types.ts +60 -0
package/server/service/privilege/privilege.ts +102 -0
package/server/service/role/index.ts +6 -0
package/server/service/role/role-mutation.ts +109 -0
package/server/service/role/role-query.ts +155 -0
package/server/service/role/role-types.ts +81 -0
package/server/service/role/role.ts +72 -0
package/server/service/user/domain-query.ts +24 -0
package/server/service/user/index.ts +7 -0
package/server/service/user/user-mutation.ts +413 -0
package/server/service/user/user-query.ts +145 -0
package/server/service/user/user-types.ts +97 -0
package/server/service/user/user.ts +354 -0
package/server/service/users-auth-providers/index.ts +5 -0
package/server/service/users-auth-providers/users-auth-providers.ts +71 -0
package/server/service/verification-token/index.ts +3 -0
package/server/service/verification-token/verification-token.ts +60 -0
package/server/service/web-auth-credential/index.ts +3 -0
package/server/service/web-auth-credential/web-auth-credential.ts +67 -0
package/server/templates/account-unlock-email.ts +65 -0
package/server/templates/invitation-email.ts +66 -0
package/server/templates/reset-password-email.ts +65 -0
package/server/templates/verification-email.ts +66 -0
package/server/types.ts +21 -0
package/server/utils/accepts.ts +11 -0
package/server/utils/access-token-cookie.ts +61 -0
package/server/utils/check-permission.ts +52 -0
package/server/utils/check-user-belongs-domain.ts +19 -0
package/server/utils/check-user-has-role.ts +29 -0
package/server/utils/encrypt-state.ts +22 -0
package/server/utils/get-aes-256-key.ts +13 -0
package/server/utils/get-domain-from-hostname.ts +7 -0
package/server/utils/get-domain-users.ts +38 -0
package/server/utils/get-secret.ts +13 -0
package/server/utils/get-user-domains.ts +112 -0
package/translations/en.json +1 -5
package/translations/ja.json +1 -5
package/translations/ko.json +3 -6
package/translations/ms.json +1 -5
package/translations/zh.json +1 -5
package/dist-client/verify-webauthn.d.ts +0 -13
package/dist-client/verify-webauthn.js +0 -72
package/dist-client/verify-webauthn.js.map +0 -1

package/server/templates/reset-password-email.ts ADDED Viewed

@@ -0,0 +1,65 @@
+export function getResetPasswordEmailForm({ name, resetUrl }) {
+  return `
+  <html lang="en">
+    <head>
+      <meta charset="utf-8" />
+      <title>reset password</title>
+      <meta name="description" content="Password Reset" />
+      <meta name="author" content="hatiolab" />
+      <meta name="google" content="notranslate"/>
+    </head>
+    <body>
+      <div style="background-color:#f6f6f6">
+        <!--header begin-->
+        <div style="background-color:#fff;padding:0 10px;border-top: 2px solid #394e64;">
+          <a href="#" target="_blank"
+            ><img
+              src="http://www.hatiolab.com/assets/img/logo-operato.png"
+              style="max-height:50px"
+          /></a>
+        </div>
+        <!--header end-->
+        <!--title begin-->
+        <div
+          style="background-color:#22a6a7;padding:12px 10px 10px 10px;min-height:50px;"
+        >
+          <img
+            src="http://www.hatiolab.com/assets/img/icon-mail.png"
+            style="float:left;margin:0 10px 0 40px"
+          />
+          <span style="display:block;color:#fff;font-size:20px"
+            >Hi ${name}!</span
+          >
+          <span style="display:block;color:#fff;font-size:34px;font-weight:bold"
+            >Reset password</span
+          >
+        </div>
+        <!--title end-->
+        <!--body begin-->
+        <p style="padding:10px 20px;line-height:1.5;font-size:16px">
+          Click the button below to reset password.
+          <br />
+          <a
+            href="${resetUrl}"
+            style="display:inline-block;margin:10px 5px 5px 0;border-radius:7px;background-color:#22a6a7;padding:7px 15px;color:#fff;font-size:18px;text-decoration:none;text-transform:capitalize;"
+            >reset password</a
+          >
+        </p>
+        <!--body end-->
+        <!--footer begin-->
+        <div
+          style="background-color:#3d5874;padding:7px 20px 5px 20px;font-size:12px;color:#efefef"
+        >
+          © Hatio, Lab. Inc. All rights reserved.
+        </div>
+        <!--footer end-->
+      </div>
+    </body>
+  </html>
+  `
+}

package/server/templates/verification-email.ts ADDED Viewed

@@ -0,0 +1,66 @@
+export function getVerificationEmailForm({ name, verifyUrl }) {
+  return `
+  <html lang="en">
+    <head>
+      <meta charset="utf-8" />
+      <title>Verify your email</title>
+      <meta name="description" content="Email Verification" />
+      <meta name="author" content="hatiolab" />
+      <meta name="google" content="notranslate"/>
+    </head>
+    <body>
+      <div style="background-color:#f6f6f6">
+        <!--header begin-->
+        <div style="background-color:#fff;padding:0 10px;border-top: 2px solid #394e64;">
+          <a href="#" target="_blank"
+            ><img
+              src="http://www.hatiolab.com/assets/img/logo-operato.png"
+              style="max-height:50px"
+          /></a>
+        </div>
+        <!--header end-->
+        <!--title begin-->
+        <div
+          style="background-color:#22a6a7;padding:12px 10px 10px 10px;min-height:50px;"
+        >
+          <img
+            src="http://www.hatiolab.com/assets/img/icon-mail.png"
+            style="float:left;margin:0 10px 0 40px"
+          />
+          <span style="display:block;color:#fff;font-size:20px"
+            >Hi ${name}!</span
+          >
+          <span style="display:block;color:#fff;font-size:34px;font-weight:bold"
+            >Verify your email</span
+          >
+        </div>
+        <!--title end-->
+        <!--body begin-->
+        <p style="padding:10px 20px;line-height:1.5;font-size:16px">
+          You're almost ready to start enjoying Operato.
+          Simply click the button below to verify your email address.
+          <br />
+          <a
+            href="${verifyUrl}"
+            style="display:inline-block;margin:10px 5px 5px 0;border-radius:7px;background-color:#22a6a7;padding:7px 15px;color:#fff;font-size:18px;text-decoration:none;text-transform:capitalize;"
+            >Verify</a
+          >
+        </p>
+        <!--body end-->
+        <!--footer begin-->
+        <div
+          style="background-color:#3d5874;padding:7px 20px 5px 20px;font-size:12px;color:#efefef"
+        >
+          © Hatio, Lab. Inc. All rights reserved.
+        </div>
+        <!--footer end-->
+      </div>
+    </body>
+  </html>
+  `
+}

package/server/types.ts ADDED Viewed

@@ -0,0 +1,21 @@
+import { TFunction } from 'i18next'
+import { EntityManager } from 'typeorm'
+import { Domain } from '@things-factory/shell'
+import { User } from './service/user/user'
+declare global {
+  export type ResolverContext = {
+    state: IContextState
+    t?: TFunction
+    [key: string]: any
+  }
+  interface IContextState {
+    domain: Domain
+    user: User
+    tx?: EntityManager
+    [key: string]: any
+  }
+}

package/server/utils/accepts.ts ADDED Viewed

@@ -0,0 +1,11 @@
+export function accepts(header: any, accepts?) {
+  accepts = accepts || ['text/html', '*/*']
+  for (let i = 0; i < accepts.length; i++) {
+    if ((header || '').indexOf(accepts[i]) !== -1) {
+      return true
+    }
+  }
+  return false
+}

package/server/utils/access-token-cookie.ts ADDED Viewed

@@ -0,0 +1,61 @@
+import { getCookieDomainFromHostname } from '@things-factory/shell'
+import { config } from '@things-factory/env'
+import { MAX_AGE } from '../constants/max-age'
+const accessTokenCookieKey = config.get('accessTokenCookieKey', 'access_token')
+export function getAccessTokenCookie(context) {
+  return context?.cookies?.get(accessTokenCookieKey)
+}
+export function setAccessTokenCookie(context, token) {
+  const { secure } = context
+  var cookie = {
+    secure,
+    httpOnly: true,
+    maxAge: MAX_AGE,
+    sameSite: 'Lax'
+  }
+  const cookieDomain = getCookieDomainFromHostname(context.hostname)
+  if (cookieDomain) {
+    cookie['domain'] = cookieDomain
+  }
+  context.cookies.set(accessTokenCookieKey, token, cookie)
+}
+export function setSessionAccessToken(context) {
+  /* koa-session 을 사용하는 경우에는, cookie 직접 설정이 작동되지 않는다. 그런 경우에는 session에 설정해서 cookie를 변경한다. */
+  const { user } = context.state
+  context.session = {
+    id: user.id,
+    userType: user.type,
+    status: user.state
+  }
+}
+export function clearAccessTokenCookie(context) {
+  const { secure } = context
+  var cookie = {
+    secure,
+    httpOnly: true,
+    sameSite: 'Lax'
+  }
+  const cookieDomain = getCookieDomainFromHostname(context.hostname)
+  if (cookieDomain) {
+    cookie['domain'] = cookieDomain
+  }
+  context.cookies.set(accessTokenCookieKey, '', cookie)
+  /*
+   * TODO clear i18next cookie as well - need to support domain
+   * https://github.com/hatiolab/things-factory/issues/70
+   */
+  context.cookies.set('i18next', '', cookie)
+  context.session = null
+}

package/server/utils/check-permission.ts ADDED Viewed

@@ -0,0 +1,52 @@
+import { Domain } from '@things-factory/shell'
+import { PrivilegeObject } from '../service/privilege/privilege'
+import { User } from '../service/user/user'
+export async function checkPermission(
+  privilegeObject: PrivilegeObject,
+  user: User,
+  domain: Domain,
+  unsafeIP?: boolean,
+  prohibitedPrivileges?: { category: string; privilege: string }[]
+): Promise<boolean> {
+  if (!privilegeObject) {
+    return true
+  }
+  const { owner: domainOwnerGranted, super: superUserGranted, category, privilege } = privilegeObject
+  if (unsafeIP) {
+    if (privilege && category) {
+      // unsafeIP 상황에서는 ownership granted는 적용되지 않는다.
+      if ((prohibitedPrivileges || []).find(pp => pp.category == category && pp.privilege == privilege)) {
+        return false
+      }
+      return await User.hasPrivilege(privilege, category, domain, user)
+    }
+    // privilege, category가 설정되지 않은 경우에는 ownership granted가 설정되었다면 허가하지 않는다.
+    return !domainOwnerGranted && !superUserGranted
+  } else {
+    if (!privilege || !category) {
+      // privilege, category가 설정되지 않은 경우에는 ownership granted만을 적용한다.
+      return (
+        (domainOwnerGranted && (await process.domainOwnerGranted(domain, user))) ||
+        (superUserGranted && (await process.superUserGranted(domain, user)))
+      )
+    }
+    if (
+      (domainOwnerGranted && (await process.domainOwnerGranted(domain, user))) ||
+      (superUserGranted && (await process.superUserGranted(domain, user)))
+    ) {
+      return true
+    }
+    if ((prohibitedPrivileges || []).find(pp => pp.category == category && pp.privilege == privilege)) {
+      return false
+    }
+    return await User.hasPrivilege(privilege, category, domain, user)
+  }
+}

package/server/utils/check-user-belongs-domain.ts ADDED Viewed

@@ -0,0 +1,19 @@
+import { Domain, getRepository } from '@things-factory/shell'
+import { User } from '../service/user/user'
+/**
+ * @description Based on domain and user information,
+ * Find out whether the user belongs domain or user has partnership with domain
+ *
+ * @param domain
+ * @param user
+ */
+export async function checkUserBelongsDomain(domain: Domain, user: User): Promise<Boolean> {
+  if (!user.domains?.length) {
+    user = await getRepository(User).findOne({ where: { id: user.id }, relations: ['domains'] })
+  }
+  const { domains: userDomains }: User = user
+  return Boolean(userDomains.find((userDomain: Domain) => userDomain.id === domain.id))
+}

package/server/utils/check-user-has-role.ts ADDED Viewed

@@ -0,0 +1,29 @@
+import { Domain, getRepository } from '@things-factory/shell'
+import { User } from '../service/user/user'
+import { Role } from 'service'
+/**
+ * @description 사용자가 특정 도메인 또는 상위 도메인에서 특정 역할을 가지고 있는지 확인합니다.
+ *
+ * @param roleId 확인할 역할의 ID
+ * @param domain 역할을 확인할 도메인
+ * @param user 역할을 확인할 사용자
+ *
+ * @returns 사용자가 도메인 또는 상위 도메인에서 역할을 가지고 있는지 여부를 나타내는 boolean을 반환하는 Promise
+ */
+export async function checkUserHasRole(roleId: string, domain: Domain, user: User): Promise<Boolean> {
+  if (!roleId) {
+    return true
+  }
+  const me = await getRepository(User).findOne({
+    where: { id: user.id },
+    relations: ['roles']
+  })
+  return me.roles
+    .filter(role => role.domainId === domain.id || (domain.parentId && role.domainId === domain.parentId))
+    .map(role => role.id)
+    .includes(roleId)
+}

package/server/utils/encrypt-state.ts ADDED Viewed

@@ -0,0 +1,22 @@
+import crypto from 'crypto'
+/* only for short-term life state encryption */
+const KEY = crypto.randomBytes(32)
+export function encryptState(text: string) {
+  const iv = crypto.randomBytes(16)
+  const cipher = crypto.createCipheriv('aes-256-cbc', Buffer.from(KEY), iv)
+  const encrypted = cipher.update(text)
+  return iv.toString('hex') + ':' + Buffer.concat([encrypted, cipher.final()]).toString('hex')
+}
+export function decryptState(text: string) {
+  const textParts = text.split(':')
+  const iv = Buffer.from(textParts.shift(), 'hex')
+  const encryptedText = Buffer.from(textParts.join(':'), 'hex')
+  const decipher = crypto.createDecipheriv('aes-256-cbc', Buffer.from(KEY), iv)
+  const decrypted = decipher.update(encryptedText)
+  return Buffer.concat([decrypted, decipher.final()]).toString()
+}

package/server/utils/get-aes-256-key.ts ADDED Viewed

@@ -0,0 +1,13 @@
+import { config } from '@things-factory/env'
+var _AES_256_KEY = config.get('AES_256_KEY')
+if (!_AES_256_KEY) {
+  if (process.env.NODE_ENV == 'production') {
+    throw new TypeError('AES_256_KEY not configured.')
+  } else {
+    _AES_256_KEY = 'V6g5oHJZb7KcYzIyL6cM95XvIDouon5b'
+  }
+}
+export const AES_256_KEY = _AES_256_KEY

package/server/utils/get-domain-from-hostname.ts ADDED Viewed

@@ -0,0 +1,7 @@
+import { config } from '@things-factory/env'
+var subdomainOffset = config.get('subdomainOffset', 2)
+export function getDomainFromHostname(hostname) {
+  return hostname.split('.').slice(-subdomainOffset).join('.')
+}

package/server/utils/get-domain-users.ts ADDED Viewed

@@ -0,0 +1,38 @@
+import { EntityManager, Repository, SelectQueryBuilder } from 'typeorm'
+import { Domain, getRepository } from '@things-factory/shell'
+import { User } from '../service/user/user'
+export async function getDomainUsers(domain: Partial<Domain>, trxMgr?: EntityManager): Promise<User[]> {
+  const domainRepo: Repository<Domain> = trxMgr?.getRepository(Domain) || getRepository(Domain)
+  if (!domain.id) {
+    const foundDomain: Domain = await domainRepo.findOne({ where: { id: domain.id } })
+    if (!foundDomain) throw new Error(`Failed to find domain by passed condition, ${domain}`)
+    domain = foundDomain
+  }
+  const qb: SelectQueryBuilder<User> = buildDomainUsersQueryBuilder(domain.id)
+  return await qb.getMany()
+}
+export function buildDomainUsersQueryBuilder(
+  domainId: string,
+  alias: string = 'USER',
+  trxMgr?: EntityManager
+): SelectQueryBuilder<User> {
+  const userRepo: Repository<User> = trxMgr?.getRepository(User) || getRepository(User)
+  const qb: SelectQueryBuilder<User> = userRepo.createQueryBuilder(alias)
+  qb.select().andWhere(
+    `${alias}.id IN ${qb
+      .subQuery()
+      .select('USERS_DOMAINS.users_id')
+      .from('users_domains', 'USERS_DOMAINS')
+      .where('USERS_DOMAINS.domains_id = :domainId', { domainId })
+      .getQuery()}`
+  )
+  return qb
+}

package/server/utils/get-secret.ts ADDED Viewed

@@ -0,0 +1,13 @@
+import { config } from '@things-factory/env'
+var _SECRET = config.get('SECRET')
+if (!_SECRET) {
+  if (process.env.NODE_ENV == 'production') {
+    throw new TypeError('SECRET key not configured.')
+  } else {
+    _SECRET = '0xD58F835B69D207A76CC5F84a70a1D0d4C79dAC95'
+  }
+}
+export const SECRET = _SECRET

package/server/utils/get-user-domains.ts ADDED Viewed

@@ -0,0 +1,112 @@
+import { In } from 'typeorm'
+import { Domain, getRepository } from '@things-factory/shell'
+import { User } from '../service/user/user'
+export async function getUserDomains(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
+      })
+      .orWhere(qb => {
+        const subQuery = qb
+          .subQuery()
+          .select('DOMAIN.id')
+          .from(Domain, 'DOMAIN')
+          .where('DOMAIN.owner = :owner', { owner: user.id })
+          .getQuery()
+        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 }
+  })
+}
+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 }
+  })
+}
+export async function getDomainsWithPrivilege(
+  user: User,
+  privilege: string,
+  category: string
+): 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')
+          .leftJoin('ROLE.privileges', 'PRIVILEGE')
+          .where('USER.id = :userId', { userId: user.id })
+          .andWhere('PRIVILEGE.name = :privilege', { privilege })
+          .andWhere('PRIVILEGE.category = :category', { category })
+          .getQuery()
+        return 'DOMAIN.id IN ' + subQuery
+      })
+      .orWhere(qb => {
+        const subQuery = qb
+          .subQuery()
+          .select('DOMAIN.id')
+          .from(Domain, 'DOMAIN')
+          .where('DOMAIN.owner = :owner', { owner: user.id })
+          .getQuery()
+        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 }
+  })
+}
+export async function getDomainsAsOwner(user: User): Promise<Partial<Domain>[]> {
+  return (
+    await getRepository(Domain).find({
+      where: { owner: user.id }
+    })
+  ).map(domain => {
+    const { id, name, description, subdomain, extType, brandName, brandImage } = domain
+    return { id, name, description, subdomain, extType, brandName, brandImage }
+  })
+}

package/translations/en.json CHANGED Viewed

@@ -4,7 +4,6 @@
   "error.confirm password not matched": "new password and confirm password is not matched",
   "error.domain mismatch": "certificate is not for this domain",
   "error.domain not allowed": "user not allowed domain `{subdomain}`",
-  "error.email already exists": "email already used by another user",
   "error.failed to find x": "failed to find {x}",
   "error.password should be supported": "initial password or default password should be supported",
   "error.password should match the rule": "password should match following rule. ${rule}",
@@ -12,15 +11,13 @@
   "error.subdomain not found": "domain not found",
   "error.token or password is invalid": "token or password is invalid",
   "error.unavailable-domain": "unavailable domain",
-  "error.user credential not found": "user credential not found. You need to register device to use biometric authentication.",
   "error.user credential registeration failed": "user credential registration failed. It may be an already registered credential.",
   "error.user credential registration not allowed": "user credential registration failed. The registration timed out or was not allowed.",
-  "error.user duplicated.": "there is a user account using same email or user ID.",
+  "error.user duplicated": "user duplicated",
   "error.user not activated": "user is not activated",
   "error.user not found": "user not found",
   "error.user or verification token not found": "user or verification token not found",
   "error.user validation failed": "user validation failed",
-  "error.username already exists": "username already used by another user",
   "error.x is not a member of y": "{x} is not a member of {y}",
   "field.active": "active",
   "field.appliance_id": "appliance id",
@@ -59,7 +56,6 @@
   "text.signout successfully": "signout successfully",
   "text.user activated successfully": "user activated successfully",
   "text.user credential registered successfully": "device registration has been successfully completed. You can now use biometric authentication.",
-  "text.user inactivated successfully": "user inactivated successfully",
   "text.user registered successfully": "user registered successfully. find your email to activate account",
   "text.verification email sent": "verification email sent"
 }

package/translations/ja.json CHANGED Viewed

@@ -4,7 +4,6 @@
   "error.confirm password not matched": "新しいパスワードと確認パスワードが一致しません.",
   "error.domain mismatch": "証明書のドメインと現在のドメインが一致しません.",
   "error.domain not allowed": "'{subdomain}' 領域はこのユーザに許可されていません.",
-  "error.email already exists": "メールはすでに他のユーザーによって使用されています.",
   "error.failed to find x": "{x}が見つかりません.",
   "error.password should be supported": "初期パスワードまたはデフォルトパスワードがサポートされるべきです",
   "error.password should match the rule": "パスワードは次の規則を守らなければなりません. {rule}",
@@ -12,15 +11,13 @@
   "error.subdomain not found": "サブドメインが見つかりません.",
   "error.token or password is invalid": "トークンまたはパスワードが無効です.",
   "error.unavailable-domain": "使用できないドメインです.",
-  "error.user credential not found": "ユーザー資格情報が見つかりません. 生体認証を使用するにはデバイスを登録する必要があります.",
   "error.user credential registeration failed": "ユーザー資格情報の登録に失敗しました。既に登録されている資格情報の可能性があります。",
   "error.user credential registration not allowed": "ユーザー資格情報の登録に失敗しました。登録のタイムアウトまたは登録が許可されていません。",
-  "error.user duplicated.": "ユーザーが重複しています.",
+  "error.user duplicated": "同じメールで登録されたアカウントが存在します.",
   "error.user not activated": "ユーザーがアクティブ化されていません.",
   "error.user not found": "ユーザーが存在しません.",
   "error.user or verification token not found": "ユーザーまたは確認トークンが見つかりません.",
   "error.user validation failed": "ユーザー確認に失敗しました.",
-  "error.username already exists": "ユーザー名はすでに他のユーザーによって使用されています.",
   "error.x is not a member of y": "{x}は{y}のメンバーではありません.",
   "field.active": "アクティブ",
   "field.appliance_id": "器具ID",
@@ -59,7 +56,6 @@
   "text.signout successfully": "ログアウトに成功しました.",
   "text.user activated successfully": "ユーザーが正常に活性化されました.",
   "text.user credential registered successfully": "デバイスの登録が正常に完了しました。今後は生体認証を使用できます。",
-  "text.user inactivated successfully": "ユーザーが正常に非アクティブ化されました.",
   "text.user registered successfully": "ユーザーが正常に登録されました. 確認メールでアカウントを有効にしてください.",
   "text.verification email sent": "確認メールを送りました."
 }

package/translations/ko.json CHANGED Viewed

@@ -4,7 +4,6 @@
   "error.confirm password not matched": "새 비밀번호와 확인 비밀번호가 일치하지 않습니다.",
   "error.domain mismatch": "인증서의 도메인과 현재 도메인이 일치하지 않습니다.",
   "error.domain not allowed": "'{subdomain}' 영역은 이 사용자에게 허가되지 않았습니다.",
-  "error.email already exists": "이메일이 이미 사용되고 있습니다.",
   "error.failed to find x": "{x}을(를) 찾을 수 없습니다.",
   "error.password should be supported": "초기 비밀번호나 디폴트 비밀번호가 제공되어야 합니다.",
   "error.password should match the rule": "비밀번호는 다음 규칙을 지켜야 합니다. {rule}",
@@ -13,14 +12,13 @@
   "error.token or password is invalid": "토큰 또는 비밀번호가 유효하지 않습니다.",
   "error.unavailable-domain": "사용할 수 없는 도메인입니다.",
   "error.user credential not found": "사용자 자격 증명을 찾을 수 없습니다. 바이오메트릭 인증을 사용하기 위해서는 먼저 기기를 등록해야 합니다.",
-  "error.user credential registeration failed": "사용자 인증서 등록이 실패하였습니다. 이미 등록된 인증서일 수 있습니다.",
-  "error.user credential registration not allowed": "사용자 인증서 등록이 실패하였습니다. 등록 시간이 초과되었거나 등록이 허용되지 않았습니다.",
-  "error.user duplicated": "동일한 이메일이나 사용자아이디로 가입된 계정이 이미 존재합니다.",
+  "error.user duplicated": "동일한 이메일로 가입된 계정이 이미 존재합니다.",
   "error.user not activated": "사용자가 활성화되지 않았습니다.",
   "error.user not found": "사용자가 존재하지 않습니다.",
   "error.user or verification token not found": "사용자 또는 확인토큰을 찾을 수 없습니다.",
+  "error.user credential registeration failed": "사용자 인증서 등록이 실패하였습니다. 이미 등록된 인증서일 수 있습니다.",
+  "error.user credential registration not allowed": "사용자 인증서 등록이 실패하였습니다. 등록 시간이 초과되었거나 등록이 허용되지 않았습니다.",
   "error.user validation failed": "사용자 확인에 실패하였습니다.",
-  "error.username already exists": "사용자 아이디가 이미 사용되고 있습니다.",
   "error.x is not a member of y": "{x}은(는) {y}의 멤버가 아닙니다.",
   "field.active": "활성화",
   "field.appliance_id": "기구 아이디",
@@ -59,7 +57,6 @@
   "text.signout successfully": "성공적으로 로그아웃 하였습니다.",
   "text.user activated successfully": "사용자가 성공적으로 활성화되었습니다.",
   "text.user credential registered successfully": "기기 등록이 성공적으로 완료되었습니다. 이제 바이오메트릭 인증을 사용할 수 있습니다.",
-  "text.user inactivated successfully": "사용자가 성공적으로 비활성화되었습니다.",
   "text.user registered successfully": "사용자가 성공적으로 등록되었습니다. 확인 이메일을 통해서 계정을 활성화하시기 바랍니다.",
   "text.verification email sent": "확인 이메일을 보냈습니다."
 }