From 95b3c628ce61ed7af0b26bbe71f995a9d1156af9 Mon Sep 17 00:00:00 2001
From: Philip Molares <philip.molares@udo.edu>
Date: Sat, 27 Feb 2021 11:24:41 +0100
Subject: [PATCH] DBSchema: Add fileUrl to media_upload table

Signed-off-by: Philip Molares <philip.molares@udo.edu>
---
 docs/content/dev/db-schema.plantuml |  1 +
 src/media/backends/imgur-backend.ts | 39 +++++++++++++++++++++--------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/docs/content/dev/db-schema.plantuml b/docs/content/dev/db-schema.plantuml
index 2ed07aeec..93782290e 100644
--- a/docs/content/dev/db-schema.plantuml
+++ b/docs/content/dev/db-schema.plantuml
@@ -135,6 +135,7 @@ entity "media_upload" {
   *noteId : uuid <<FK note>>
   *userId : uuid <<FK user>>
   *backendType: text
+  *fileUrl: text
   backendData: text
   *createdAt : date
 }
diff --git a/src/media/backends/imgur-backend.ts b/src/media/backends/imgur-backend.ts
index 46324ec03..ecced7586 100644
--- a/src/media/backends/imgur-backend.ts
+++ b/src/media/backends/imgur-backend.ts
@@ -10,10 +10,17 @@ import { ConsoleLoggerService } from '../../logger/console-logger.service';
 import { MediaBackend } from '../media-backend.interface';
 import { BackendData } from '../media-upload.entity';
 import { MediaConfig } from '../../config/media.config';
-import fetch from 'node-fetch';
+import fetch, { Response } from 'node-fetch';
 import { URLSearchParams } from 'url';
 import { MediaBackendError } from '../../errors/errors';
 
+type UploadResult = {
+  data: {
+    link: string;
+    deletehash: string;
+  };
+};
+
 @Injectable()
 export class ImgurBackend implements MediaBackend {
   private config: MediaConfig['backend']['imgur'];
@@ -35,44 +42,56 @@ export class ImgurBackend implements MediaBackend {
     params.append('image', buffer.toString('base64'));
     params.append('type', 'base64');
     try {
-      const result = await fetch('https://api.imgur.com/3/image', {
+      const result = (await fetch('https://api.imgur.com/3/image', {
         method: 'POST',
         body: params,
+        // eslint-disable-next-line @typescript-eslint/naming-convention
         headers: { Authorization: `Client-ID ${this.config.clientID}` },
       })
-        .then(ImgurBackend.checkStatus)
-        .then((res) => res.json());
+        .then((res) => ImgurBackend.checkStatus(res))
+        .then((res) => res.json())) as UploadResult;
       this.logger.debug(`Response: ${JSON.stringify(result)}`, 'saveFile');
       this.logger.log(`Uploaded ${fileName}`, 'saveFile');
       return [result.data.link, result.data.deletehash];
     } catch (e) {
-      this.logger.error(`error: ${e.message}`, e.stack, 'saveFile');
+      this.logger.error(
+        `error: ${(e as Error).message}`,
+        (e as Error).stack,
+        'saveFile',
+      );
       throw new MediaBackendError(`Could not save '${fileName}' on imgur`);
     }
   }
 
   async deleteFile(fileName: string, backendData: BackendData): Promise<void> {
     if (backendData === null) {
-      throw new Error();
+      throw new MediaBackendError(
+        `We don't have any delete tokens for '${fileName}' and therefore can't delete this image on imgur`,
+      );
     }
     try {
       const result = await fetch(
         `https://api.imgur.com/3/image/${backendData}`,
         {
           method: 'POST',
+          // eslint-disable-next-line @typescript-eslint/naming-convention
           headers: { Authorization: `Client-ID ${this.config.clientID}` },
         },
-      ).then(ImgurBackend.checkStatus);
-      this.logger.debug(`Response: ${result}`, 'saveFile');
+      ).then((res) => ImgurBackend.checkStatus(res));
+      this.logger.debug(`Response: ${result.toString()}`, 'saveFile');
       this.logger.log(`Deleted ${fileName}`, 'deleteFile');
       return;
     } catch (e) {
-      this.logger.error(`error: ${e.message}`, e.stack, 'deleteFile');
+      this.logger.error(
+        `error: ${(e as Error).message}`,
+        (e as Error).stack,
+        'deleteFile',
+      );
       throw new MediaBackendError(`Could not delete '${fileName}' on imgur`);
     }
   }
 
-  private static checkStatus(res) {
+  private static checkStatus(res: Response): Response {
     if (res.ok) {
       // res.status >= 200 && res.status < 300
       return res;