Throw 404 if s3 object is not found

Fixes: #15

Author: MrBartusek

apps/api/src/images/images.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Get, Header, Param, Redirect, Res } from '@nestjs/common';
+import { Controller, Get, Header, NotFoundException, Param, Redirect, Res } from '@nestjs/common';
 import { Response } from 'express';
 import { ImagesService } from './images.service';
 
@@ -18,6 +18,9 @@ export class ImagesController {
 	@Header('Cache-Control', `public, max-age=${CACHE_TIME}`)
 	async getByKey(@Param('key') key: string, @Res() response: Response) {
 		const object = await this.imagesService.getObject(key);
+		if (!object) {
+			throw new NotFoundException('Object with provided key was not found');
+		}
 		object.pipe(response);
 	}
 }

apps/api/src/s3/s3.service.ts

@@ -1,6 +1,7 @@
 import {
 	DeleteObjectCommandInput,
 	GetObjectCommandInput,
+	NoSuchKey,
 	PutObjectCommandInput,
 } from '@aws-sdk/client-s3';
 import { Injectable, Logger } from '@nestjs/common';
@@ -37,7 +38,13 @@ export class S3Service {
 			Key: key,
 		};
 
-		const object = await this.s3.getObject(params);
+		const object = await this.s3.getObject(params).catch((error) => {
+			if (error instanceof NoSuchKey) {
+				return null;
+			}
+			throw error;
+		});
+		if (object == null) return null;
 		const body = object.Body as Readable;
 		return body;
 	}