@things-factory/attachment-base 7.0.1-alpha.10 → 7.0.1-alpha.102

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/attachment-base",
-  "version": "7.0.1-alpha.10",
+  "version": "7.0.1-alpha.102",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -29,11 +29,11 @@
     "@aws-sdk/s3-presigned-post": "^3.46.0",
     "@azure/storage-blob": "^12.16.0",
     "@koa/multer": "^3.0.0",
-    "@things-factory/auth-base": "^7.0.1-alpha.10",
-    "@things-factory/env": "^7.0.1-alpha.0",
-    "@things-factory/shell": "^7.0.1-alpha.10",
+    "@things-factory/auth-base": "^7.0.1-alpha.102",
+    "@things-factory/env": "^7.0.1-alpha.71",
+    "@things-factory/shell": "^7.0.1-alpha.102",
     "mime": "^3.0.0",
     "multer": "^1.4.5-lts.1"
   },
-  "gitHead": "5adeb2a190f3c6eb5c5cbceac181a3d19fefda9b"
+  "gitHead": "2bce598261c2d7377ea008ee687358480a2869bc"
 }

package/server/service/attachment/attachment-mutation.ts

@@ -5,13 +5,15 @@ import promisesAll from 'promises-all'
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { In } from 'typeorm'
 
-import { logger } from '@things-factory/env'
+import { config, logger } from '@things-factory/env'
 import { getRepository } from '@things-factory/shell'
 
 import { STORAGE } from '../../attachment-const'
 import { Attachment } from './attachment'
 import { AttachmentPatch, NewAttachment, UploadURL } from './attachment-types'
 
+const allowedMimeTypes = config.get('fileUpload/mimeTypes', [])
+
 @Resolver(Attachment)
 export class AttachmentMutation {
   @Directive('@transaction')
@@ -106,8 +108,21 @@ export class AttachmentMutation {
 
 export async function createAttachment(_: any, { attachment }, context: ResolverContext): Promise<Attachment> {
   const { file, category, refType = '', refBy, description } = attachment
+  const { mimetype } = (await file) as FileUpload
+  
+  if(allowedMimeTypes instanceof Array && allowedMimeTypes.length > 0 && !allowedMimeTypes.includes('*/*')) {
+    const isAllowed = allowedMimeTypes.some(type => {
+      const [typeMain, typeSub] = type.split('/')
+      const [mimeMain, mimeSub] = mimetype.split('/')
+      return (typeMain === mimeMain && (typeSub === '*' || typeSub === mimeSub)) || (typeMain === '*' && typeSub === '*')
+    })
+
+    if(!isAllowed) {
+      throw Error(context.t(`error.not allowed file type for upload`, { mimetype }))
+    }
+  }
 
-  const { id, path, size, filename, mimetype, encoding, contents } = await STORAGE.uploadFile({ file, context })
+  const { id, path, size, filename, encoding, contents } = await STORAGE.uploadFile({ file, context })
   const { domain, user, tx } = context.state
 
   const repository = tx ? tx.getRepository(Attachment) : getRepository(Attachment)

package/translations/en.json

@@ -2,5 +2,6 @@
   "label.category": "category",
   "label.file": "file",
   "label.select file": "select file",
-  "label.ref_by": "Reference ID"
+  "label.ref_by": "Reference ID",
+  "error.not allowed file type for upload": "{mimetype} is not an allowed file type for upload."
 }

package/translations/ja.json

@@ -2,5 +2,6 @@
   "label.category": "カテゴリ",
   "label.file": "ファイル",
   "label.select file": "ファイル選択",
-  "label.ref_by": "参照 ID"
+  "label.ref_by": "参照 ID",
+  "error.not allowed file type for upload": "{mimetype}はアップロードが許可されていないファイルタイプです。"
 }

package/translations/ko.json

@@ -2,5 +2,6 @@
   "label.category": "카테고리",
   "label.file": "파일",
   "label.select file": "파일 선택",
-  "label.ref_by": "참조 ID"
+  "label.ref_by": "참조 ID",
+  "error.not allowed file type for upload": "{mimetype}은 업로드가 허가되지 않은 파일형식입니다."
 }

package/translations/ms.json

@@ -2,5 +2,6 @@
   "label.category": "kategori",
   "label.file": "fail",
   "label.select file": "pilih fail",
-  "label.ref_by": "rujukan ID"
+  "label.ref_by": "rujukan ID",
+  "error.not allowed file type for upload": "{mimetype} adalah jenis fail yang tidak dibenarkan untuk dimuat naik."
 }

package/translations/zh.json

@@ -2,5 +2,6 @@
   "label.category": "分类",
   "label.file": "文件",
   "label.select file": "选择文件",
-  "label.ref_by": "参考 ID"
+  "label.ref_by": "参考 ID",
+  "error.not allowed file type for upload": "{mimetype}是未经允许的上传文件类型。"
 }