@things-factory/contact 7.0.71 → 7.0.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/contact",
-  "version": "7.0.71",
+  "version": "7.0.73",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -32,9 +32,9 @@
     "@operato/i18n": "^7.0.0",
     "@operato/shell": "^7.0.0",
     "@operato/styles": "^7.0.0",
-    "@things-factory/attachment-base": "^7.0.71",
-    "@things-factory/auth-base": "^7.0.71",
-    "@things-factory/shell": "^7.0.70"
+    "@things-factory/attachment-base": "^7.0.72",
+    "@things-factory/auth-base": "^7.0.72",
+    "@things-factory/shell": "^7.0.72"
   },
-  "gitHead": "d242e4a4415764d0d389e9dff09d2ce3a8fc317f"
+  "gitHead": "5ce078745084f07a5df7d1ac9de56b2699a07a34"
 }

package/server/controllers/index.ts

@@ -0,0 +1 @@
+export * from './register-contact-as-system-user'

package/server/controllers/register-contact-as-system-user.ts

@@ -0,0 +1,88 @@
+import { ILike } from 'typeorm'
+import { Role, User, UserStatus } from '@things-factory/auth-base'
+import { getRepository } from '@things-factory/shell'
+import { config } from '@things-factory/env'
+import { Contact, ContactField } from '../service/contact/contact'
+
+const { defaultPassword } = config.get('password')
+
+export async function registerContactAsSystemUser(
+  { contactId, roleName }: { contactId: string; roleName?: string },
+  context: ResolverContext
+) {
+  const { domain, user, tx } = context.state
+
+  const contactRepository = getRepository(Contact, tx)
+
+  const contact = await contactRepository.findOne({
+    where: {
+      id: contactId,
+      domain: { id: domain.id }
+    }
+  })
+
+  if (!contact) {
+    throw new Error(context.t('error.contact-not-found', { contactId }))
+  }
+
+  const email = contact.getContactItem(ContactField.Email, 'work')
+
+  if (!email) {
+    throw new Error(context.t('error.contact-email-not-set', { contactId }))
+  }
+
+  const userRepository = getRepository(User, tx)
+  const existingUser = await userRepository.findOne({
+    where: { email: ILike(email) },
+    relations: ['domains', 'roles']
+  })
+
+  if (existingUser && !existingUser.domains.find(d => d.id === domain.id)) {
+    existingUser.domains = [...existingUser.domains, domain]
+  }
+
+  if (!existingUser && !defaultPassword) {
+    throw new Error(context.t('error.contact-initial-password-required'))
+  }
+
+  const salt = !existingUser && User.generateSalt()
+
+  const newUser: Partial<User> = existingUser
+    ? existingUser
+    : {
+        name: contact.name,
+        email,
+        userType: 'user',
+        domains: [domain],
+        status: UserStatus.ACTIVATED,
+        salt,
+        passwordUpdatedAt: new Date(),
+        password: User.encode(defaultPassword, salt),
+        updater: user,
+        creator: user
+      }
+
+  if (roleName) {
+    const roleRepository = getRepository(Role, tx)
+    const role = await roleRepository.findOne({
+      where: {
+        name: roleName,
+        domain: { id: domain.id }
+      }
+    })
+
+    if (!role) {
+      throw new Error(context.t('error.contact-role-not-found', { roleName }))
+    }
+
+    if (newUser.roles) {
+      if (!newUser.roles.find(role => role.name == roleName)) {
+        newUser.roles = [...newUser.roles, role]
+      }
+    } else {
+      newUser.roles = [role]
+    }
+  }
+
+  return await userRepository.save(newUser)
+}

package/server/index.ts

@@ -1,5 +1,2 @@
-export * from './migrations'
-export * from './middlewares'
+export * from './controllers'
 export * from './service'
-
-import './routes'

package/server/routes.ts

@@ -1,28 +0,0 @@
-const debug = require('debug')('things-factory:contact:routes')
-
-process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRouter) => {
-  /*
-   * can add global public routes to application (auth not required, tenancy not required)
-   *
-   * ex) routes.get('/path', async(context, next) => {})
-   * ex) routes.post('/path', async(context, next) => {})
-   */
-})
-
-process.on('bootstrap-module-global-private-route' as any, (app, globalPrivateRouter) => {
-  /*
-   * can add global private routes to application (auth required, tenancy not required)
-   */
-})
-
-process.on('bootstrap-module-domain-public-route' as any, (app, domainPublicRouter) => {
-  /*
-   * can add domain public routes to application (auth not required, tenancy required)
-   */
-})
-
-process.on('bootstrap-module-domain-private-route' as any, (app, domainPrivateRouter) => {
-  /*
-   * can add domain private routes to application (auth required, tenancy required)
-   */
-})

package/server/service/contact/contact-query.ts

@@ -1,4 +1,5 @@
 import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx } from 'type-graphql'
+import { GraphQLEmailAddress } from 'graphql-scalars'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { Attachment } from '@things-factory/attachment-base'
@@ -20,7 +21,7 @@ function getContactItems(contact: Contact) {
 function getContactItem(contact: Contact, type: String, label: String) {
   const { items } = contact
 
-  return items?.find(item => item.type === type && item.label === label)?.value || null
+  return items?.find(item => item.type === type && item.label === label)?.value
 }
 
 @Resolver(Contact)
@@ -69,22 +70,22 @@ export class ContactQuery {
     return { left, top, zoom, picture: attachment?.fullpath }
   }
 
-  @FieldResolver(type => String)
+  @FieldResolver(type => String, { nullable: true })
   async phone(@Root() contact: Contact): Promise<string> {
     return getContactItem(contact, ContactField.Phone, 'work')
   }
 
-  @FieldResolver(type => String)
+  @FieldResolver(type => GraphQLEmailAddress, { nullable: true })
   async email(@Root() contact: Contact): Promise<string> {
     return getContactItem(contact, ContactField.Email, 'work')
   }
 
-  @FieldResolver(type => String)
+  @FieldResolver(type => String, { nullable: true })
   async address(@Root() contact: Contact): Promise<string> {
     return getContactItem(contact, ContactField.Address, 'work')
   }
 
-  @FieldResolver(type => String)
+  @FieldResolver(type => String, { nullable: true })
   async department(@Root() contact: Contact): Promise<string> {
     return getContactItem(contact, ContactField.Department, 'work')
   }

package/server/service/contact/contact.ts

@@ -110,4 +110,8 @@ export class Contact {
 
   @RelationId((contact: Contact) => contact.updater)
   updaterId?: string
+
+  getContactItem(type: ContactField, label?: string) {
+    return (this.items || []).find(item => item.type === type && (!item.label || item.label === label))?.value
+  }
 }

package/translations/en.json

@@ -8,5 +8,9 @@
   "field.phone": "phone",
   "title.contact": "contact",
   "title.contact list": "contact list",
-  "title.edit": "edit"
+  "title.edit": "edit",
+  "error.contact-not-found": "Contact with ID {contactId} could not be found.",
+  "error.contact-email-not-set": "The contact with ID {contactId} does not have a work email set.",
+  "error.contact-initial-password-required": "An initial password or default password must be provided.",
+  "error.contact-role-not-found": "The role '{roleName}' could not be found in the domain."
 }

package/translations/ja.json

@@ -8,5 +8,9 @@
   "field.phone": "電話",
   "title.contact": "連絡先",
   "title.contact list": "連絡先リスト",
-  "title.edit": "編集"
+  "title.edit": "編集",
+  "error.contact-not-found": "ID {contactId} の連絡先が見つかりません。",
+  "error.contact-email-not-set": "ID {contactId} の連絡先には勤務用のメールアドレスが設定されていません。",
+  "error.contact-initial-password-required": "初期パスワードまたはデフォルトパスワードが提供される必要があります。",
+  "error.contact-role-not-found": "ドメイン内で役割'{roleName}'が見つかりませんでした。"
 }

package/translations/ko.json

@@ -8,5 +8,9 @@
   "field.phone": "전화",
   "title.contact": "연락처",
   "title.contact list": "연락처 목록",
-  "title.edit": "편집"
+  "title.edit": "편집",
+  "error.contact-not-found": "연락처({contactId})를 찾을 수 없습니다.",
+  "error.contact-email-not-set": "연락처({contactId})에 이메일(work) 정보가 없습니다.",
+  "error.contact-initial-password-required": "초기 비밀번호나 디폴트 비밀번호가 제공되어야 합니다.",
+  "error.contact-role-not-found": "'{name}'라는 이름의 역할이 정의되어 있지 않습니다."
 }

package/translations/ms.json

@@ -8,5 +8,9 @@
   "field.phone": "telefon",
   "title.contact": "kenalan",
   "title.contact list": "senarai kenalan",
-  "title.edit": "edit"
+  "title.edit": "edit",
+  "error.contact-not-found": "Kenalan dengan ID {contactId} tidak dapat ditemui.",
+  "error.contact-email-not-set": "Kenalan dengan ID {contactId} tidak mempunyai emel kerja yang ditetapkan.",
+  "error.contact-initial-password-required": "kata laluan awal atau kata laluan lalai mesti disediakan.",
+  "error.contact-role-not-found": "Peranan '{roleName}' tidak dapat ditemui dalam domain."
 }

package/translations/zh.json

@@ -8,5 +8,9 @@
   "field.phone": "电话号码",
   "title.contact": "接触",
   "title.contact list": "联系人列表",
-  "title.edit": "编辑"
+  "title.edit": "编辑",
+  "error.contact-not-found": "无法找到ID为{contactId}的联系人。",
+  "error.contact-email-not-set": "ID为{contactId}的联系人没有设置工作邮箱。",
+  "error.contact-initial-password-required": "必须提供初始密码或默认密码。",
+  "error.contact-role-not-found": "在域中找不到角色'{roleName}'。"
 }

package/dist-server/middlewares/index.d.ts

@@ -1 +0,0 @@
-export declare function initMiddlewares(app: any): void;

package/dist-server/middlewares/index.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initMiddlewares = initMiddlewares;
-function initMiddlewares(app) {
-    /* can add middlewares into app */
-}
-//# sourceMappingURL=index.js.map

package/dist-server/middlewares/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/middlewares/index.ts"],"names":[],"mappings":";;AAAA,0CAEC;AAFD,SAAgB,eAAe,CAAC,GAAG;IACjC,kCAAkC;AACpC,CAAC","sourcesContent":["export function initMiddlewares(app) {\n  /* can add middlewares into app */\n}\n"]}

package/dist-server/migrations/index.d.ts

@@ -1 +0,0 @@
-export declare var migrations: any[];

package/dist-server/migrations/index.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrations = void 0;
-const glob = require('glob');
-const path = require('path');
-exports.migrations = [];
-glob.sync(path.resolve(__dirname, '.', '**', '*.js')).forEach(function (file) {
-    if (file.indexOf('index.js') !== -1)
-        return;
-    exports.migrations = exports.migrations.concat(Object.values(require(path.resolve(file))) || []);
-});
-//# sourceMappingURL=index.js.map

package/dist-server/migrations/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/migrations/index.ts"],"names":[],"mappings":";;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAEjB,QAAA,UAAU,GAAG,EAAE,CAAA;AAE1B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,UAAS,IAAI;IACzE,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAAE,OAAM;IAC3C,kBAAU,GAAG,kBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;AAClF,CAAC,CAAC,CAAA","sourcesContent":["const glob = require('glob')\nconst path = require('path')\n\nexport var migrations = []\n\nglob.sync(path.resolve(__dirname, '.', '**', '*.js')).forEach(function(file) {\n  if (file.indexOf('index.js') !== -1) return\n  migrations = migrations.concat(Object.values(require(path.resolve(file))) || [])\n})\n"]}

package/server/middlewares/index.ts

@@ -1,3 +0,0 @@
-export function initMiddlewares(app) {
-  /* can add middlewares into app */
-}

package/server/migrations/index.ts

@@ -1,9 +0,0 @@
-const glob = require('glob')
-const path = require('path')
-
-export var migrations = []
-
-glob.sync(path.resolve(__dirname, '.', '**', '*.js')).forEach(function(file) {
-  if (file.indexOf('index.js') !== -1) return
-  migrations = migrations.concat(Object.values(require(path.resolve(file))) || [])
-})