@things-factory/attachment-base 7.0.0-alpha.8 → 7.0.0

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

@@ -0,0 +1 @@
+export * from './upload-awb';

package/dist-server/util/upload-awb.d.ts

@@ -0,0 +1,2 @@
+import '../awb-storage-s3';
+export declare function uploadAwb(param: any): Promise<any>;

package/dist-server/util/upload-awb.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadAwb = void 0;
+exports.uploadAwb = uploadAwb;
 require("../awb-storage-s3");
 const attachment_const_1 = require("../attachment-const");
 async function uploadAwb(param) {
@@ -8,5 +8,4 @@ async function uploadAwb(param) {
     let result = await attachment_const_1.AWBSTORAGE.uploadFile({ stream: content, filename: title });
     return result;
 }
-exports.uploadAwb = uploadAwb;
 //# sourceMappingURL=upload-awb.js.map

package/dist-server/util/upload-awb.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-awb.js","sourceRoot":"","sources":["../../server/util/upload-awb.ts"],"names":[],"mappings":";;;AAAA,6BAA0B;AAE1B,0DAAgD;AAEzC,KAAK,UAAU,SAAS,CAAC,KAAU;IACxC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;IAEhC,IAAI,MAAM,GAAG,MAAM,6BAAU,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAA;IAE9E,OAAO,MAAM,CAAA;AACf,CAAC;AAND,8BAMC","sourcesContent":["import '../awb-storage-s3'\n\nimport { AWBSTORAGE } from '../attachment-const'\n\nexport async function uploadAwb(param: any) {\n  const { content, title } = param\n\n  let result = await AWBSTORAGE.uploadFile({ stream: content, filename: title })\n\n  return result\n}\n"]}
+{"version":3,"file":"upload-awb.js","sourceRoot":"","sources":["../../server/util/upload-awb.ts"],"names":[],"mappings":";;AAIA,8BAMC;AAVD,6BAA0B;AAE1B,0DAAgD;AAEzC,KAAK,UAAU,SAAS,CAAC,KAAU;IACxC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;IAEhC,IAAI,MAAM,GAAG,MAAM,6BAAU,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAA;IAE9E,OAAO,MAAM,CAAA;AACf,CAAC","sourcesContent":["import '../awb-storage-s3'\n\nimport { AWBSTORAGE } from '../attachment-const'\n\nexport async function uploadAwb(param: any) {\n  const { content, title } = param\n\n  let result = await AWBSTORAGE.uploadFile({ stream: content, filename: title })\n\n  return result\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/attachment-base",
-  "version": "7.0.0-alpha.8",
+  "version": "7.0.0",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,13 +27,13 @@
     "@aws-sdk/client-s3": "^3.46.0",
     "@aws-sdk/lib-storage": "^3.46.0",
     "@aws-sdk/s3-presigned-post": "^3.46.0",
-    "@azure/storage-blob": "^12.16.0",
+    "@azure/storage-blob": "^12.18.0",
     "@koa/multer": "^3.0.0",
-    "@things-factory/auth-base": "^7.0.0-alpha.8",
-    "@things-factory/env": "^7.0.0-alpha.0",
-    "@things-factory/shell": "^7.0.0-alpha.8",
+    "@things-factory/auth-base": "^7.0.0",
+    "@things-factory/env": "^7.0.0",
+    "@things-factory/shell": "^7.0.0",
     "mime": "^3.0.0",
     "multer": "^1.4.5-lts.1"
   },
-  "gitHead": "b4981ea2721e7eaf4dbd618b6c77316ebc000ee5"
+  "gitHead": "00f3917ca132679e3571f3f4fd16f4caf84f488e"
 }

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/server/service/attachment/attachment-query.ts

@@ -11,7 +11,10 @@ import { Attachment } from './attachment'
 export class AttachmentQuery {
   @Directive('@privilege(category: "attachment", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => AttachmentList)
-  async attachments(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<AttachmentList> {
+  async attachments(
+    @Ctx() context: ResolverContext,
+    @Args(type => ListParam) params: ListParam
+  ): Promise<AttachmentList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

package/server/service/attachment/attachment.ts

@@ -34,50 +34,50 @@ const DATABASE_TYPE = ORMCONFIG.type
 export class Attachment {
   @PrimaryGeneratedColumn('uuid')
   @Field(type => ID)
-  readonly id: string
+  readonly id?: string
 
   @ManyToOne(type => Domain, { nullable: false })
   @Field(type => Domain)
-  domain: Domain
+  domain?: Domain
 
   @RelationId((attachment: Attachment) => attachment.domain)
-  domainId: string
+  domainId?: string
 
   @Column()
   @Field()
-  name: string
+  name?: string
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  description: string
+  description?: string
 
   @Column()
   @Field()
-  mimetype: string
+  mimetype?: string
 
   @Column()
   @Field()
-  encoding: string
+  encoding?: string
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  category: string
+  category?: string
 
   @Column({ nullable: true, default: '' })
   @Field({ nullable: true })
-  refType: string = ''
+  refType?: string = ''
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  refBy: string
+  refBy?: string
 
   @Column()
   @Field()
-  path: string
+  path?: string
 
   @Column()
   @Field()
-  size: string
+  size?: string
 
   @Column({
     nullable: true,
@@ -85,32 +85,32 @@ export class Attachment {
       DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'longblob'
         : DATABASE_TYPE == 'postgres'
-        ? 'bytea'
-        : 'blob'
+          ? 'bytea'
+          : 'blob'
   })
-  contents: Buffer
+  contents?: Buffer
 
   @CreateDateColumn()
   @Field()
-  createdAt: Date
+  createdAt?: Date
 
   @UpdateDateColumn()
   @Field()
-  updatedAt: Date
+  updatedAt?: Date
 
   @ManyToOne(type => User)
   @Field(type => User, { nullable: true })
-  creator: User
+  creator?: User
 
   @RelationId((attachment: Attachment) => attachment.creator)
-  creatorId: string
+  creatorId?: string
 
   @ManyToOne(type => User)
   @Field(type => User, { nullable: true })
-  updater: User
+  updater?: User
 
   @RelationId((attachment: Attachment) => attachment.updater)
-  updaterId: string
+  updaterId?: string
 
   @Field()
   get fullpath(): string {

package/server/storage-azure-blob.ts

@@ -1,4 +1,4 @@
-import { BlobServiceClient, ContainerClient } from '@azure/storage-blob'
+import { BlobServiceClient } from '@azure/storage-blob'
 import { logger } from '@things-factory/env'
 
 import { STORAGE } from './attachment-const'

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}是未经允许的上传文件类型。"
 }