From 6bde10e23dd7966353d36079b9a1849ea0a78588 Mon Sep 17 00:00:00 2001 From: Veikkosuhonen Date: Thu, 23 Jan 2025 10:24:14 +0200 Subject: [PATCH] fix: Allow multiple kojo iams per jory iam --- src/auth/IAMConfig.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/auth/IAMConfig.ts b/src/auth/IAMConfig.ts index 65c9559..04e7d96 100644 --- a/src/auth/IAMConfig.ts +++ b/src/auth/IAMConfig.ts @@ -153,12 +153,12 @@ const kojoMap = { 'hy-oiktdk-ibl-jory': 'hy-oiktdk-maisteri-kojot', 'hy-oiktdk-ggl-jory': 'hy-oiktdk-maisteri-kojot', 'hy-ltdk-spk-jory': 'hy-ltdk-kandi-kojot', - 'hy-ltdk-hll-jory': 'hy-ltdk-kandi-kojot', + 'hy-ltdk-hll-jory': ['hy-ltdk-kandi-kojot', 'hy-ltdk-maisteri-kojot'], 'hy-ltdk-psyk-jory': 'hy-ltdk-maisteri-kojot', 'hy-ltdk-logo-jory': 'hy-ltdk-maisteri-kojot', 'hy-ltdk-ll-jory': 'hy-ltdk-maisteri-kojot', 'hy-ltdk-tmed-jory': 'hy-ltdk-maisteri-kojot', - 'hy-ltdk-hll-jory': 'hy-ltdk-maisteri-kojot', + // 'hy-ltdk-hll-jory': 'hy-ltdk-maisteri-kojot', 'hy-ltdk-terv-jory': 'hy-ltdk-maisteri-kojot', 'hy-humtdk-filk-jory': 'hy-humtdk-kandi-kojot', 'hy-humtdk-ttk-jory': 'hy-humtdk-kandi-kojot', @@ -478,8 +478,16 @@ const iamToDoctoralSchool = (iam) => doctoralSchoolMap[iam] const getStudyLeaderGroup = (iam) => kojoMap[iam] -const isStudyLeaderGroup = (iam, allIams) => - allIams.concat('ANY').includes(getStudyLeaderGroup(iam)) +const isStudyLeaderGroup = (iam, allIams) => { + const kojoIam = getStudyLeaderGroup(iam) + return allIams.concat('ANY').some((iam) => { + if (Array.isArray(kojoIam)) { + return kojoIam.includes(iam) + } else { + return kojoIam === iam + } + }) +} const iamToOrganisationCode = (iam) => { const organisationCodes = joryMap[iam]