Fix filtering user iams

UniversityOfHelsinkiCS · Jan 23, 2023 · 6ff4d7b · 6ff4d7b
1 parent cd26710
commit 6ff4d7b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/auth/IAMRights.js b/src/auth/IAMRights.js
@@ -127,14 +127,7 @@ const getKosu = (hyGroups) => {
 const getSpecialGroups = (hyGroups) => {
   let specialGroup = {}
 
-  ;[
-    getAdmin,
-    getSuperAdmin,
-    getOpenUni,
-    getHyOne,
-    getJory,
-    getKosu,
-  ]
+  ;[getAdmin, getSuperAdmin, getOpenUni, getHyOne, getJory, getKosu]
     .map((f) => f(hyGroups))
     .forEach(({ specialGroup: newSpecialGroup }) => {
       specialGroup = { ...specialGroup, ...newSpecialGroup }

diff --git a/src/index.js b/src/index.js
@@ -75,10 +75,10 @@ app.get('/:id', async (req, res) => {
 
   const user = await User.findByPk(id)
 
-  user.iamGroups = user.iamGroups.filter((iam) => relevantIAMs.includes(iam))
-
   if (!user) return res.sendStatus(404)
 
+  user.iamGroups = user.iamGroups.filter((iam) => relevantIAMs.includes(iam))
+
   return res.send(user)
 })