chore: handle limit errors and generalize limit parameters

ved-websites · Aug 25, 2023 · 76e0972 · 76e0972
1 parent cf27104
commit 76e0972
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 20 deletions.
diff --git a/api/src/@common/minio/minio-client.module.ts b/api/src/@common/minio/minio-client.module.ts
@@ -4,6 +4,9 @@ import { MinioModule } from 'nestjs-minio-client';
 import { EnvironmentConfig } from '~/env.validation';
 import { MinioClientService } from './minio-client.service';
 
+export const GRAPHQL_MAX_FILE_SIZE_MB = 10;
+export const GRAPHQL_MAX_FILE_COUNT = 10;
+
 @Module({
 	imports: [
 		MinioModule.registerAsync({
@@ -22,6 +25,10 @@ import { MinioClientService } from './minio-client.service';
 })
 export class MinioClientModule implements NestModule {
 	configure(consumer: MiddlewareConsumer) {
-		consumer.apply(graphqlUploadExpress({ maxFileSize: 1000000, maxFiles: 10 })).forRoutes('/graphql');
+		const byteToMbRatio = 1000000;
+
+		consumer
+			.apply(graphqlUploadExpress({ maxFileSize: GRAPHQL_MAX_FILE_SIZE_MB * byteToMbRatio, maxFiles: GRAPHQL_MAX_FILE_COUNT }))
+			.forRoutes('/graphql');
 	}
 }
diff --git a/api/src/@common/minio/minio-client.service.ts b/api/src/@common/minio/minio-client.service.ts
@@ -3,6 +3,7 @@ import * as crypto from 'crypto';
 import { FileUpload } from 'graphql-upload/Upload.js';
 import { MinioService } from 'nestjs-minio-client';
 import { EnvironmentConfig } from '~/env.validation';
+import { GRAPHQL_MAX_FILE_COUNT, GRAPHQL_MAX_FILE_SIZE_MB } from './minio-client.module';
 
 @Injectable()
 export class MinioClientService {
@@ -40,6 +41,20 @@ export class MinioClientService {
 	}
 
 	public async upload(file: FileUpload, bucketName: string) {
+		const fileStream = (() => {
+			try {
+				return file.createReadStream();
+			} catch (error) {
+				throw new HttpException(
+					`Invalid file! Make sure that you are sending less than ${GRAPHQL_MAX_FILE_COUNT} files and that the files are less than ${GRAPHQL_MAX_FILE_SIZE_MB} MB.`,
+					HttpStatus.BAD_REQUEST,
+					{
+						cause: error,
+					},
+				);
+			}
+		})();
+
 		const timestamp = Date.now().toString();
 		const hashedFileName = crypto.createHash('md5').update(timestamp).digest('hex');
 		const extension = file.filename.substring(file.filename.lastIndexOf('.'), file.filename.length);
@@ -52,7 +67,7 @@ export class MinioClientService {
 		await this.verifyBucketExistence(appBucketName);
 
 		try {
-			await this.client.putObject(appBucketName, fileName, file.createReadStream(), {
+			await this.client.putObject(appBucketName, fileName, fileStream, {
 				'Content-Type': file.mimetype,
 			});
 		} catch (error) {

diff --git a/api/src/@common/users/avatar/avatar.resolver.ts b/api/src/@common/users/avatar/avatar.resolver.ts
@@ -1,5 +1,4 @@
 import { AuthSession, LuciaSession } from '$auth/session.decorator';
-import { SuccessOutput } from '$graphql/common-dto/success.dto';
 import { Args, Mutation, Resolver } from '@nestjs/graphql';
 import GraphQLUpload from 'graphql-upload/GraphQLUpload.js';
 import { FileUpload } from 'graphql-upload/Upload.js';
@@ -23,12 +22,8 @@ export class AvatarResolver {
 		} satisfies UploadAvatarOutput;
 	}
 
-	@Mutation(() => SuccessOutput, { nullable: true })
+	@Mutation(() => Boolean)
 	async deleteAvatar(@AuthSession() { user }: LuciaSession) {
-		await this.avatarService.deleteUserImage(user);
-
-		return {
-			success: true,
-		} satisfies SuccessOutput;
+		return this.avatarService.deleteUserImage(user);
 	}
 }
diff --git a/api/src/@common/users/avatar/avatar.service.ts b/api/src/@common/users/avatar/avatar.service.ts
@@ -54,7 +54,7 @@ export class AvatarService {
 
 	async deleteUserImage(user: User) {
 		if (!user.avatarRef) {
-			return;
+			return false;
 		}
 
 		await this.minioClientService.delete(user.avatarRef, AVATAR_BUCKET_NAME);
@@ -67,5 +67,7 @@ export class AvatarService {
 				id: user.id,
 			},
 		});
+
+		return true;
 	}
 }
diff --git a/api/tests/@generated/graphql/index.ts b/api/tests/@generated/graphql/index.ts
@@ -206,7 +206,7 @@ export type MessageWhereUniqueInput = {
 export type Mutation = {
   addMessage?: Maybe<Message>;
   createUser: CreateUserOutput;
-  deleteAvatar?: Maybe<SuccessOutput>;
+  deleteAvatar: Scalars['Boolean']['output'];
   deleteUser?: Maybe<GetUserOutput>;
   editUser: User;
   login: LoggedUserOutput;
@@ -563,10 +563,6 @@ export type SubscriptionMessageAddedArgs = {
   where?: InputMaybe<MessageWhereInput>;
 };
 
-export type SuccessOutput = {
-  success: Scalars['Boolean']['output'];
-};
-
 export type UnregisteredUserOutput = {
   /** Email of the unregistered user */
   email: Scalars['String']['output'];

diff --git a/client/src/graphql/@generated/index.ts b/client/src/graphql/@generated/index.ts
@@ -206,7 +206,7 @@ export type MessageWhereUniqueInput = {
 export type Mutation = {
   addMessage?: Maybe<Message>;
   createUser: CreateUserOutput;
-  deleteAvatar?: Maybe<SuccessOutput>;
+  deleteAvatar: Scalars['Boolean']['output'];
   deleteUser?: Maybe<GetUserOutput>;
   editUser: User;
   login: LoggedUserOutput;
@@ -563,10 +563,6 @@ export type SubscriptionMessageAddedArgs = {
   where?: InputMaybe<MessageWhereInput>;
 };
 
-export type SuccessOutput = {
-  success: Scalars['Boolean']['output'];
-};
-
 export type UnregisteredUserOutput = {
   /** Email of the unregistered user */
   email: Scalars['String']['output'];