Hotfix issue to get user role

rfcx · Jul 10, 2024 · 5f15d7e · 5f15d7e
1 parent efacb9e
commit 5f15d7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/model/users.js b/app/model/users.js
@@ -265,7 +265,7 @@ var Users = {
         const q = `select r.name from roles r
             join user_project_role upr on r.role_id = upr.role_id
             where upr.user_id = ${user_id} and upr.project_id = ${project_id}`
-        return dbpool.query(q).get(0).get('name');
+        return dbpool.query(q).get(0);
     },
 
     findOwnedProjects: function(user_id, query) {

diff --git a/app/routes/project.js b/app/routes/project.js
@@ -67,8 +67,12 @@ router.get('/:projecturl?/', function(req, res, next) {
             }
 
             var project = rows[0];
-
-            const userRole = !!req.session.user.isSuper ? 'Admin' : await model.users.getProjectRole(req.session.user.id, project.project_id)
+            let userRole
+            if (!!req.session.user.isSuper) userRole = 'Admin'
+            else if (req.session.user.id) {
+                const role = await model.users.getProjectRole(req.session.user.id, project.project_id)
+                userRole = role && role.name ? role.name : 'Guest'
+            }
             model.users.getPermissions(req.session.user.id, project.project_id, function(err, rows) {
                 var permissionsMap = rows.reduce(function(_, p) {
                     _[p.name] = true;