diff --git a/entities/Image.entity.ts b/entities/Image.entity.ts index 3621937..a6028ba 100644 --- a/entities/Image.entity.ts +++ b/entities/Image.entity.ts @@ -4,6 +4,7 @@ import { CrudValidationGroups } from "@dataui/crud"; import { IsNotEmpty, IsUniqueCombination, MaxLength } from "@shared/utils/validation/class-validator-he"; import { StringType } from "@shared/utils/entity/class-transformer"; import { MediumTextColumn, TextColumn } from "@shared/utils/entity/column-types.util"; +import { IsNotBlobFile } from "@shared/utils/validation/is-not-blob-file"; export enum ImageTargetEnum { reportLogo = 'לוגו לתעודה', @@ -33,6 +34,7 @@ export class Image { @IsOptional({ groups: [CrudValidationGroups.UPDATE] }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @IsNotBlobFile({ always: true }) @Column(() => FileData) fileData: FileData; diff --git a/entities/UploadedFile.entity.ts b/entities/UploadedFile.entity.ts index d5bf33b..8b2bd25 100644 --- a/entities/UploadedFile.entity.ts +++ b/entities/UploadedFile.entity.ts @@ -6,6 +6,7 @@ import { StringType } from "@shared/utils/entity/class-transformer"; import { CreatedAtColumn, UpdatedAtColumn } from "@shared/utils/entity/column-types.util"; import { IHasUserId } from "@shared/base-entity/interface"; import { FileData } from "./Image.entity"; +import { IsNotBlobFile } from "@shared/utils/validation/is-not-blob-file"; @Entity("uploaded_files") export class UploadedFile implements IHasUserId { @@ -31,6 +32,7 @@ export class UploadedFile implements IHasUserId { @IsOptional({ groups: [CrudValidationGroups.UPDATE] }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @IsNotBlobFile({ always: true }) @Column(() => FileData) fileData: FileData; diff --git a/utils/validation/__tests__/is-not-blob-file.spec.ts b/utils/validation/__tests__/is-not-blob-file.spec.ts new file mode 100644 index 0000000..0375023 --- /dev/null +++ b/utils/validation/__tests__/is-not-blob-file.spec.ts @@ -0,0 +1,30 @@ +import { validate } from 'class-validator'; +import { IsNotBlobFile } from '../is-not-blob-file'; + +class TestEntity { + @IsNotBlobFile() fileData: any; +} + +const validateFile = (fileData: any) => { + const entity = new TestEntity(); + entity.fileData = fileData; + return validate(entity); +}; + +describe('IsNotBlobFile', () => { + it('rejects a blob: src', async () => { + const errors = await validateFile({ src: 'blob:https://app/123', title: 'a.pdf' }); + expect(errors).toHaveLength(1); + expect(errors[0].constraints.IsNotBlobFile).toBeDefined(); + }); + + it('accepts a data URL src', async () => { + expect(await validateFile({ src: 'data:application/pdf;base64,JVBERi0=', title: 'a.pdf' })).toHaveLength(0); + }); + + it('accepts empty values', async () => { + expect(await validateFile(undefined)).toHaveLength(0); + expect(await validateFile(null)).toHaveLength(0); + expect(await validateFile({ title: 'a.pdf' })).toHaveLength(0); + }); +}); diff --git a/utils/validation/is-not-blob-file.ts b/utils/validation/is-not-blob-file.ts new file mode 100644 index 0000000..dddbf8b --- /dev/null +++ b/utils/validation/is-not-blob-file.ts @@ -0,0 +1,25 @@ +import { registerDecorator, ValidationOptions } from 'class-validator'; + +/** + * Rejects a file value whose `src` is a browser-local `blob:` URL. + * Such a URL is valid only inside the uploading tab, so storing it loses the file. + */ +export function IsNotBlobFile(validationOptions?: ValidationOptions) { + return function (object: Object, propertyName: string) { + registerDecorator({ + name: 'IsNotBlobFile', + target: object.constructor, + propertyName: propertyName, + options: { + message: 'הקובץ לא נקלט במלואו. נא לבחור את הקובץ שוב ולשמור', + ...validationOptions, + }, + validator: { + validate(value: any) { + const src = value?.src; + return !(typeof src === 'string' && src.trim().startsWith('blob:')); + }, + }, + }); + }; +}