Move profilePicture upload to separate private method

src/routes/UploadRoute.ts

@@ -12,11 +12,37 @@ import Route from "../lib/Route";
 
 const dataDirName = "data";
 
+interface UploadConfirmation {
+    /**
+     * Indicates the error that might have occured during the upload
+     */
+    error?: string;
+
+    /**
+     * The file that has been uploaded
+     */
+    fileName?: string;
+
+    /**
+     * If the upload was successful
+     */
+    success: boolean;
+}
+
 /**
  * Represents an upload handler.
  */
 export class UploadRoute extends Route {
 
+    /**
+     * Returns the hash of the current time to be used as a filename.
+     */
+    private static getFileName() {
+        const hash = crypto.createHash("md5");
+        hash.update(Number(Date.now()).toString());
+        return hash.digest("hex");
+    }
+
     public readonly dataDir: string;
 
     constructor(private publicPath: string) {
@@ -33,14 +59,48 @@ export class UploadRoute extends Route {
         this.router.use(fileUpload());
         // Uploads a file to the data directory and returns the filename
         this.router.use(async (req, res) => {
+            let uploadConfirmation: UploadConfirmation;
+            if (req.session.userId) {
+                if (req.files.profilePicture) {
+                    uploadConfirmation = await this.uploadProfilePicture(req);
+                } else {
+                    res.status(status.BAD_REQUEST);
+                    uploadConfirmation = {
+                        error: "You did not provide a (valid) file.",
+                        success: false,
+                    };
+                }
+            } else {
+                res.status(status.UNAUTHORIZED);
+                uploadConfirmation = {
+                    error: "You are not logged in.",
+                    success: false,
+                };
+            }
+            res.json(uploadConfirmation);
+        });
+    }
+
+    /**
+     * Executed when the route is destroyed
+     * @param params
+     */
+    public async destroy(...params: any): Promise<any> {
+        return undefined;
+    }
+
+    /**
+     * Uploads a file as a users profile picture and deletes the old one.
+     * The user gets updated with the new profile picture url.
+     * @param request
+     */
+    private async uploadProfilePicture(request: any): Promise<UploadConfirmation> {
         let success = false;
-            let fileName: string;
         let error: string;
-            const profilePic = req.files.profilePicture as UploadedFile;
+        let fileName: string;
-            if (req.session.userId) {
+        const profilePic = request.files.profilePicture as UploadedFile;
-                if (profilePic) {
         try {
-                        const fileBasename = this.getFileName() + ".webp";
+            const fileBasename = UploadRoute.getFileName() + ".webp";
             const filePath = path.join(this.dataDir, fileBasename);
             await sharp(profilePic.data)
                 .resize(512, 512)
@@ -48,9 +108,9 @@ export class UploadRoute extends Route {
                 .webp()
                 .toFile(filePath);
             fileName = `/${dataDirName}/${fileBasename}`;
-                        const user = await User.findByPk(req.session.userId);
+            const user = await User.findByPk(request.session.userId);
             const oldProfilePicture = path.join(this.dataDir, path.basename(user.profilePicture));
-                        if (await fsx.pathExists(oldProfilePicture)) {
+            if ((await fsx.pathExists(oldProfilePicture))) {
                 await fsx.unlink(oldProfilePicture);
             } else {
                 globals.logger.warn(`Could not delete ${oldProfilePicture}: Not found!`);
@@ -63,36 +123,10 @@ export class UploadRoute extends Route {
             globals.logger.debug(err.stack);
             error = err.message;
         }
-                } else {
+        return {
-                    res.status(status.BAD_REQUEST);
-                    error = "You did not provide a (valid) file.";
-                }
-            } else {
-                res.status(status.UNAUTHORIZED);
-                error = "You are not logged in.";
-            }
-            res.json({
             error,
             fileName,
             success,
-            });
+        };
-        });
-    }
-
-    /**
-     * Executed when the route is destroyed
-     * @param params
-     */
-    public async destroy(...params: any): Promise<any> {
-        return undefined;
-    }
-
-    /**
-     * Returns the hash of the current time to be used as a filename.
-     */
-    private getFileName() {
-        const hash = crypto.createHash("md5");
-        hash.update(Number(Date.now()).toString());
-        return hash.digest("hex");
     }
 }