Use user's iam groups to prefill faculty selection when possible

src/client/components/InteractiveForm/SelectFaculty.tsx

@@ -9,12 +9,14 @@ import { useTranslation } from 'react-i18next'
 import styles from './styles'
 import { InputProps, Faculty, Locales } from '../../types'
 import useFaculties from '../../hooks/useFaculties'
+import useUserFaculties from '../../hooks/useUserFaculties'
 
 const SelectFaculty: React.FC<InputProps> = ({ control }) => {
   const { t, i18n } = useTranslation()
   const { language } = i18n
   const [faculty, setFaculty] = useState('')
   const { faculties, isLoading } = useFaculties()
+  const { userFaculties = [] } = useUserFaculties()
 
   const handleChange = (event: SelectChangeEvent) => {
     setFaculty(event.target.value)
@@ -41,7 +43,7 @@ const SelectFaculty: React.FC<InputProps> = ({ control }) => {
         <Controller
           control={control}
           name="faculty"
-          defaultValue=""
+          defaultValue={userFaculties[0]?.code || ''}
           render={({ field }) => (
             <FormControl sx={{ width: '100%' }}>
               <InputLabel>{t('facultySelect:inputLabel')}</InputLabel>

src/client/types.ts

@@ -108,4 +108,5 @@ export interface User {
   email?: string
   language?: string
   isAdmin: boolean
+  iamGroups: string[]
 }

src/server/middeware/user.ts

@@ -1,12 +1,16 @@
 import { inDevelopment } from '../../config'
 
+const parseIamGroups = (iamGroups: string) =>
+  iamGroups?.split(';').filter(Boolean) ?? []
+
 const mockHeaders = {
   uid: 'testuser',
   givenname: 'Testi',
   sn: 'Kayttaja',
   mail: '[email protected]',
   preferredlanguage: 'fi',
   hypersonsisuid: 'hy-hlo-123',
+  hygroupcn: 'grp-toska;hy-mltdk-employees',
 }
 
 const userMiddleware = (req, _, next) => {
@@ -19,15 +23,19 @@ const userMiddleware = (req, _, next) => {
     mail: email,
     preferredlanguage: language,
     hypersonsisuid: id,
+    hygroupcn,
   } = headers
 
+  const iamGroups = parseIamGroups(hygroupcn)
+
   const user = {
+    id,
     username,
     firstName,
     lastName,
     email,
     language,
-    id,
+    iamGroups,
   }
 
   req.user = user

src/server/routes/faculty.ts

@@ -1,11 +1,8 @@
 import express from 'express'
 
 import { inE2EMode } from '../../config'
+import { RequestWithUser } from '../types'
 import { getOrganisationData, getUserOrganisations } from '../util/jami'
-import { OrganisationData, RequestWithUser } from '../types'
-
-const parseIamGroups = (iamGroups: string) =>
-  iamGroups?.split(';').filter(Boolean) ?? []
 
 const mockFaculty = [
   {
@@ -23,19 +20,19 @@ const facultyRouter = express.Router()
 facultyRouter.get('/', async (req, res) => {
   if (inE2EMode) return res.send(mockFaculty)
 
-  const organisationData: Array<OrganisationData> = await getOrganisationData()
+  const organisationData = await getOrganisationData()
 
   const faculties = organisationData.map(({ code, name }) => ({ code, name }))
 
   return res.send(faculties)
 })
 
 facultyRouter.get('/user', async (req: RequestWithUser, res) => {
-  const { id } = req.user
+  const { id, iamGroups } = req.user
 
-  const iamGroups = parseIamGroups(req.headers.hygroupcn as string)
+  const organisationData = await getUserOrganisations(id, iamGroups)
 
-  const faculties = await getUserOrganisations(id, iamGroups)
+  const faculties = organisationData.map(({ code, name }) => ({ code, name }))
 
   return res.send(faculties)
 })

src/server/types.ts

@@ -34,6 +34,7 @@ export interface User {
   email?: string
   language?: string
   isAdmin: boolean
+  iamGroups: string[]
 }
 
 export interface RequestWithUser extends Request {