use clientId when user field is missing

MAIF · Nov 29, 2023 · 593dee7 · 593dee7
1 parent a5cd110
commit 593dee7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/server/index.js b/server/index.js
@@ -64,6 +64,11 @@ function createServer(appVersion) {
   app.use(bodyParser.urlencoded({ extended: true }));
   app.use(bodyParser.text());
 
+  // app.use('*', (req, res, next) => {
+  //   console.log(req.headers)
+  //   next()
+  // })
+
   app.use('/', Security.extractUserFromQuery);
   app.use('/', publicRouter);
   app.use('/api/plugins', pluginsRouter);

diff --git a/server/security/middlewares.js b/server/security/middlewares.js
@@ -15,14 +15,14 @@ const otoroshiAuthentication = (req, res, next) => {
   if (jwtUser) {
     try {
       const decodedToken = jwt.verify(jwtUser, secret, { algorithms: ['HS512'] });
-      req.user = decodedToken.user
+      req.user = decodedToken.user || decodedToken.apikey.clientId
       next()
     } catch (err) {
       console.log(err)
       missingCredentials(res)
     }
   } else {
-    console.log(`Missing jwt user ${jwtUser}`)
+    console.log(`Missing jwt user`, jwtUser)
     missingCredentials(res)
   }
 }

diff --git a/server/utils.js b/server/utils.js
@@ -3,7 +3,7 @@ const fs = require("fs-extra");
 const path = require("path");
 const pako = require('pako');
 
-const format = value => value.replace(/[^a-zA-Z ]/g, "");
+const format = value => value?.replace(/[^a-zA-Z ]/g, "");
 
 const unzip = (isRustBuild, zipString, outputFolder, rules = []) => {
   try {