From d44954f3873d04721d0e6f3475a43e9809b8a692 Mon Sep 17 00:00:00 2001
From: subnub <kyle.hoell@gmail.com>
Date: Mon, 11 May 2020 12:40:34 -0400
Subject: [PATCH] test

---
 backend/controllers/file.ts           | 5 +++--
 backend/express-routers/file.ts       | 2 +-
 backend/services/FileService/index.ts | 6 +++++-
 src/components/PopupWindow/index.js   | 4 +++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/backend/controllers/file.ts b/backend/controllers/file.ts
index ae1ab14..df11140 100644
--- a/backend/controllers/file.ts
+++ b/backend/controllers/file.ts
@@ -343,8 +343,9 @@ class FileController {
 
             const user = req.user
             const tempToken = req.params.tempToken;
-    
-            await fileService.removeTempToken(user, tempToken);
+            const currentUUID = req.params.uuid;
+
+            await fileService.removeTempToken(user, tempToken, currentUUID);
 
             res.send();
             
diff --git a/backend/express-routers/file.ts b/backend/express-routers/file.ts
index a4a3306..748f6bb 100644
--- a/backend/express-routers/file.ts
+++ b/backend/express-routers/file.ts
@@ -64,7 +64,7 @@ router.patch("/file-service/move", auth, fileController.moveFile);
 
 router.delete("/file-service/remove-link/:id", auth, fileController.removeLink);
 
-router.delete("/file-service/remove/token-video/:tempToken", auth, fileController.removeTempToken);
+router.delete("/file-service/remove/token-video/:tempToken/:uuid", auth, fileController.removeTempToken);
 
 router.delete("/file-service/remove", auth, fileController.deleteFile);
 
diff --git a/backend/services/FileService/index.ts b/backend/services/FileService/index.ts
index 7416776..9208c0d 100644
--- a/backend/services/FileService/index.ts
+++ b/backend/services/FileService/index.ts
@@ -9,6 +9,8 @@ import DbUtilFile from "../../db/utils/fileUtils/index";
 import DbUtilFolder from "../../db/utils/folderUtils";
 import { UserInterface } from "../../models/user";
 import { FileInterface } from "../../models/file";
+import tempStorage from "../../tempStorage/tempStorage";
+import uuid from "uuid";
 
 const dbUtilsFile = new DbUtilFile();
 const dbUtilsFolder = new DbUtilFolder();
@@ -155,7 +157,7 @@ class MongoFileService {
         return tempToken;
     }
 
-    removeTempToken = async(user: UserInterface, tempToken: any) => {
+    removeTempToken = async(user: UserInterface, tempToken: any, currentUUID: string) => {
 
         const key = user.getEncryptionKey();
 
@@ -169,6 +171,8 @@ class MongoFileService {
 
         if (!removedTokenUser) throw new NotFoundError("Remove Temp Token User Not Found Errors");
 
+        delete tempStorage[currentUUID];
+
         await removedTokenUser.save();
     }
 
diff --git a/src/components/PopupWindow/index.js b/src/components/PopupWindow/index.js
index 78d8e38..c689b05 100644
--- a/src/components/PopupWindow/index.js
+++ b/src/components/PopupWindow/index.js
@@ -91,13 +91,15 @@ class PopupWindowContainer extends React.Component {
 
     componentWillUnmount = () => {
 
+        const uuidID = window.sessionStorage.getItem("uuid");
+
         document.removeEventListener('mousedown', this.handleClickOutside);   
 
         const headers = {'Authorization': "Bearer " + window.localStorage.getItem("token")}
       
         if (this.props.popupFile.metadata.isVideo) {
 
-            axios.delete(currentURL +`/file-service/remove/token-video/${this.tempToken}`, {
+            axios.delete(currentURL +`/file-service/remove/token-video/${this.tempToken}/${uuidID}`, {
                 headers,
             }).catch((err) => {
                 console.log(err);