Add previous fixes to repository

UniversityOfHelsinkiCS · Aug 28, 2023 · 91a075f · 91a075f
1 parent bd3754e
commit 91a075f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/backend/index.js b/backend/index.js
@@ -23,7 +23,6 @@ const server = require('http').createServer(app)
 
 app.listen(3100, () => {
     logger.info('Grappa app listening on port 3100!')
-    logger.info('Debugging version: 0.0.5')
     logger.info(`Environment is ${process.env.NODE_ENV}`)
 })
 

diff --git a/backend/package.json b/backend/package.json
diff --git a/backend/src/middleware/attachments.js b/backend/src/middleware/attachments.js
@@ -18,19 +18,11 @@ const storage = () => {
     }
 }
 
-const upload = () => {
-    console.log("Starting upload")
-    try {
-    multer({ storage: storage() }).fields([
+const upload = multer({ storage: storage() }).fields([
     { name: 'otherFile' },
     { name: 'reviewFile', maxCount: 1 },
     { name: 'thesisFile', maxCount: 1 }
 ])
-    } catch (e) {
-        console.log("Upload failed. Error: ")
-        console.log(e)
-        throw e
-    }
-}
+
 
 module.exports = upload
diff --git a/backend/src/middleware/auditLogger.js b/backend/src/middleware/auditLogger.js
@@ -5,7 +5,7 @@ const loggedMethods = ['POST', 'PUT', 'DELETE']
 
 module.exports = function auditLogger(req, res, next) {
     console.log("Req: " + req.method + " " + req.originalUrl + " at " + new Date().toString())
-    if (req.body) console.log("body keys: " + Object.keys(req.body))
+    if (req.headers && req.headers.uid) console.log("Uid: " + req.headers.uid)
     if (loggedMethods.includes(req.method)) {
         const type = `${req.method} ${req.originalUrl}`
 

diff --git a/backend/src/routes/theses.js b/backend/src/routes/theses.js
@@ -74,7 +74,10 @@ router.put('/', jsonParser, auth.checkStaff, (req, res, next) => thesisControlle
  * @apiSuccess thesis New thesis
  * @apiSuccess roles New roles
  */
-router.post('/', attachment, auth.checkStaff, (req, res, next) => thesisController.saveThesisForm(req, res).catch(next))
+router.post('/', attachment, auth.checkStaff, (req, res, next) => { 
+    console.log("Starting route post thesis :")
+    return thesisController.saveThesisForm(req, res).catch(next)
+})
 
 /**
  * @api {put} theses/printed Mark theses as printed

diff --git a/backend/src/util/ethesis.js b/backend/src/util/ethesis.js