feat(Norppa): Add support for feedbackLiaison special group

Author: Veikkosuhonen

src/auth/IAMConfig.ts

@@ -7,7 +7,7 @@ const ANY = 'ANY'
 /**
  * Map from jory IAM to one or more programmes
  */
-const joryMap = {
+const joryMap: Record<string, string | string[]> = {
   'grp-avoin-johto': 'H930',
   'grp-kielikeskus-esihenkilot': 'H906', // note, all will be given kojo in kojomap
   'hy-ttdk-tuk-jory': '100-K001',
@@ -429,6 +429,8 @@ const hyOneGroups = ['hy-one'] // opintoasiainneuvosto
 
 const employeeGroups = ['hy-employees']
 
+const feedbackLiaisonGroups = ['hy-palautevastaavat']
+
 const oodikoneIams = [
   'grp-oodikone-users',
   'grp-oodikone-basic-users',
@@ -466,6 +468,8 @@ const isHyOneIam = (iam) => hyOneGroups.includes(iam)
 
 const isJoryIam = (iam) => joryGroups.includes(iam)
 
+const isFeedbackLiaisonIam = (iam) => feedbackLiaisonGroups.includes(iam)
+
 const isKosuIam = (iam) => kosuGroups.includes(iam)
 
 const isUniversityWideIam = (iam) => universityWideGroups.includes(iam)
@@ -489,7 +493,7 @@ const isStudyLeaderGroup = (iam, allIams) => {
   })
 }
 
-const iamToOrganisationCode = (iam) => {
+const joryIamToOrganisationCode = (iam) => {
   const organisationCodes = joryMap[iam]
   if (Array.isArray(organisationCodes)) {
     return organisationCodes
@@ -539,6 +543,7 @@ const relevantIAMs = new Set(
     hyOneGroups,
     employeeGroups,
     oodikoneIams,
+    feedbackLiaisonGroups,
     katselmusViewerIams,
   ].flat(),
 )
@@ -568,10 +573,11 @@ export {
   isDoctoralIam,
   isEmployeeIam,
   iamToDoctoralSchool,
-  iamToOrganisationCode,
+  joryIamToOrganisationCode,
   kosuIamToFaculties,
   dekaaniIamToFaculty,
   iamToFaculty,
+  isFeedbackLiaisonIam,
   opetusVaradekaani,
   isStudyLeaderGroup,
   relevantIAMs,

src/auth/IAMRights.ts

@@ -7,7 +7,8 @@ import {
   isKosuIam,
   isUniversityWideIam,
   isDoctoralIam,
-  iamToOrganisationCode,
+  isFeedbackLiaisonIam,
+  joryIamToOrganisationCode,
   isEmployeeIam,
   iamToDoctoralSchool,
   kosuIamToFaculties,
@@ -22,7 +23,7 @@ import { Programme } from '../organisation/types'
 
 type AccessSpecialGroupFunction = (hyGroups: string[]) => {
   access?: { [programmeCode: string]: OrganisationAccess }
-  specialGroup?: { [key: string]: boolean }
+  specialGroup?: { [key: string]: boolean | string[] }
 }
 
 /**
@@ -55,7 +56,7 @@ const getSuperAdmin: AccessSpecialGroupFunction = (hyGroups) => {
 }
 
 /**
- * NOT USED
+ * NOT USED (wait is this used?)
  * Grant admin rights if the user has correct iams (eg. grp-ospa)
  * @returns admin special group
  */
@@ -106,6 +107,26 @@ const getJory: AccessSpecialGroupFunction = (hyGroups) => {
   return {}
 }
 
+/**
+ * Needed primarily for Norppa
+ * Grant feedback liaison special group if the user has feedback liaison iam AND jory iam
+ * The feedbackLiaison special group contains a list of programme keys that the user is jory in
+ * @returns feedback liaison special group
+ */
+const getFeedbackLiaison: AccessSpecialGroupFunction = (hyGroups) => {
+  const isFeedbackLiaison = hyGroups.some(isFeedbackLiaisonIam)
+
+  const joryIams = hyGroups.filter(isJoryIam)
+  const joryProgrammes = joryIams
+    .map(joryIamToOrganisationCode)
+    .flatMap((codes) => codes.map(mapToDegreeCode))
+
+  if (isFeedbackLiaison && joryProgrammes.length > 0) {
+    return { specialGroup: { feedbackLiaison: joryProgrammes } }
+  }
+  return {}
+}
+
 /**
  * Needed for Oodikone
  * Grant kosu special group if the user has kosu iams (eg. hy-ypa-opa-kosu-kumpula)
@@ -125,7 +146,15 @@ const getKosu: AccessSpecialGroupFunction = (hyGroups) => {
 const getSpecialGroups: AccessSpecialGroupFunction = (hyGroups) => {
   let specialGroup = {}
 
-  ;[getAdmin, getSuperAdmin, getOpenUni, getHyOne, getJory, getKosu]
+  ;[
+    getAdmin,
+    getSuperAdmin,
+    getOpenUni,
+    getHyOne,
+    getJory,
+    getKosu,
+    getFeedbackLiaison,
+  ]
     .map((f) => f(hyGroups))
     .forEach(({ specialGroup: newSpecialGroup }) => {
       specialGroup = { ...specialGroup, ...newSpecialGroup }
@@ -230,7 +259,7 @@ const getDoctoralSchoolAccess: AccessSpecialGroupFunction = (hyGroups) => {
 const getProgrammeAdminAccess: AccessSpecialGroupFunction = (hyGroups) => {
   const orgCodes = hyGroups
     .filter((iam) => isStudyLeaderGroup(iam, hyGroups))
-    .map((iam) => iamToOrganisationCode(iam))
+    .map((iam) => joryIamToOrganisationCode(iam))
     .filter(Boolean)
 
   const degreeCodes = orgCodes.flatMap((codes) => codes.map(mapToDegreeCode))
@@ -257,7 +286,7 @@ const getProgrammeAdminAccess: AccessSpecialGroupFunction = (hyGroups) => {
 const getProgrammeWriteAccess: AccessSpecialGroupFunction = (hyGroups) => {
   if (!hyGroups.some(isEmployeeIam)) return {}
   const orgCodes = hyGroups
-    .map((iam) => iamToOrganisationCode(iam))
+    .map((iam) => joryIamToOrganisationCode(iam))
     .filter(Boolean)
   const degreeCodes = orgCodes.flatMap((codes) => codes.map(mapToDegreeCode))
   const access = {}
@@ -274,7 +303,7 @@ const getProgrammeWriteAccess: AccessSpecialGroupFunction = (hyGroups) => {
  */
 const getProgrammeReadAccess: AccessSpecialGroupFunction = (hyGroups) => {
   const orgCodes = hyGroups
-    .map((iam) => iamToOrganisationCode(iam))
+    .map((iam) => joryIamToOrganisationCode(iam))
     .filter(Boolean)
   const degreeCodes = orgCodes.flatMap((codes) => codes.map(mapToDegreeCode))
   const access = {}

tests/norppa.spec.js

@@ -0,0 +1,74 @@
+import { describe, expect, it } from 'vitest'
+import { api } from './util/utils'
+
+describe.concurrent('Norppa', () => {
+  it('Feedback liaisons special group granted to user with feedback liaison iam and jory iam', async () => {
+    const res = await api.post('', {
+      userId: 'tkt-norppa-haba',
+      iamGroups: ['hy-mltdk-tkt-jory', 'hy-palautevastaavat'],
+    })
+
+    expect(res.status).toBe(200)
+
+    const access = await res.json()
+
+    const specialGroup = access.specialGroup
+
+    expect(specialGroup).toHaveProperty('feedbackLiaison')
+    expect(specialGroup.feedbackLiaison).toHaveLength(1)
+    expect(specialGroup.feedbackLiaison).toContain('KH50_005')
+  })
+
+  it('Feedback liaisons special group not granted to user with only jory iam', async () => {
+    const res = await api.post('', {
+      userId: 'tkt-norppa-haba',
+      iamGroups: ['hy-mltdk-tkt-jory'],
+    })
+
+    expect(res.status).toBe(200)
+
+    const access = await res.json()
+
+    const specialGroup = access.specialGroup
+
+    expect(specialGroup).not.toHaveProperty('feedbackLiaison')
+  })
+
+  it('Feedback liaisons special group not granted to user with only feedback liaison iam', async () => {
+    const res = await api.post('', {
+      userId: 'tkt-norppa-haba',
+      iamGroups: ['hy-palautevastaavat'],
+    })
+
+    expect(res.status).toBe(200)
+
+    const access = await res.json()
+
+    const specialGroup = access.specialGroup
+
+    expect(specialGroup).not.toHaveProperty('feedbackLiaison')
+  })
+
+  it('Feedback liaisons special group contains programme codes of each programme where user is in jory', async () => {
+    const res = await api.post('', {
+      userId: 'tkt-norppa-haba',
+      iamGroups: [
+        'hy-ltdk-psyk-jory', // ['300-K001', '300-M004']
+        'hy-ltdk-ll-jory', // '300-M001'
+        'hy-palautevastaavat',
+      ],
+    })
+
+    expect(res.status).toBe(200)
+
+    const access = await res.json()
+
+    const specialGroup = access.specialGroup
+
+    expect(specialGroup).toHaveProperty('feedbackLiaison')
+    expect(specialGroup.feedbackLiaison).toHaveLength(3)
+    expect(specialGroup.feedbackLiaison).toContain('KH30_001')
+    expect(specialGroup.feedbackLiaison).toContain('MH30_004')
+    expect(specialGroup.feedbackLiaison).toContain('MH30_001')
+  })
+})