fix: do not override user faculty

UniversityOfHelsinkiCS · Mar 22, 2024 · d521928 · d521928
1 parent 49835da
commit d521928
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/client/pages/MainPage/ProductGrid.tsx b/src/client/pages/MainPage/ProductGrid.tsx
@@ -52,6 +52,7 @@ const ProductCard = ({
         sx={{
           mx: 'auto',
           px: 4,
+          mb: 2,
           borderRadius: '1rem',
           textTransform: 'capitalize',
           fontWeight: '600',

diff --git a/src/server/util/oicd.ts b/src/server/util/oicd.ts
@@ -69,6 +69,11 @@ const verifyLogin = async (
 
   const userPreferedFaculty = await getUserFaculties(id, iamGroups)
 
+  const userFaculty = await User.findByPk(id, {
+    attributes: ['preferredFaculty'],
+  })
+  const userFacultyCode = userFaculty?.preferredFaculty
+
   const user: UserType = {
     username,
     id: id || username,
@@ -78,7 +83,8 @@ const verifyLogin = async (
     firstName,
     lastName,
     isAdmin: checkAdmin(iamGroups) || username === 'glandmic',
-    preferredFaculty: userPreferedFaculty[0]?.code || 'OTHER',
+    preferredFaculty:
+      userFacultyCode || userPreferedFaculty[0]?.code || 'OTHER',
   }
 
   await User.upsert({