fix(#3): fix auth group config

eurofurence · Dec 23, 2023 · c5edda0 · c5edda0
1 parent 00f2ec8
commit c5edda0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/charts/eurofurence-registration-system/Chart.yaml b/charts/eurofurence-registration-system/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: eurofurence-registration-system
-version: 0.0.13
+version: 0.0.14
 description: A helm chart that can deploy the Eurofurence Registration System.
 type: application
 home: https://github.com/eurofurence/reg-helm-chart
diff --git a/charts/eurofurence-registration-system/templates/configmap.yaml b/charts/eurofurence-registration-system/templates/configmap.yaml
@@ -174,9 +174,17 @@ data:
         id_token_cookie_name: '{{ .Values.system.components.auth_service.id_token_cookie_name }}'
         access_token_cookie_name: '{{ .Values.system.components.auth_service.access_token_cookie_name }}'
         relevant_groups:
-          admin:
-            - '123456789'
-          earlyReg: []
+          {{- if .Values.system.components.auth_service.admin_group_limit_to_identities }}
+          {{ .Values.system.components.auth_service.admin_group_id }}:
+          {{-   range .Values.system.components.auth_service.admin_group_limit_to_identities }}
+            - '{{ . }}'
+          {{-   end }}
+          {{- else }}
+          {{ .Values.system.components.auth_service.admin_group_id }}: []
+          {{- end }}
+          {{- range .Values.system.components.auth_service.other_group_ids }}
+          {{ . }}: []
+          {{- end }}
         {{- with .Values.system.components.auth_service.token_public_keys_PEM }}
         token_public_keys_PEM: {{- . | toYaml | nindent 8 }}
         {{- end }}

diff --git a/charts/eurofurence-registration-system/tests/configmap_test.yaml b/charts/eurofurence-registration-system/tests/configmap_test.yaml
@@ -306,9 +306,10 @@ tests:
                 id_token_cookie_name: 'JWT'
                 access_token_cookie_name: 'AUTH'
                 relevant_groups:
-                  admin:
-                    - '123456789'
-                  earlyReg: []
+                  D1DQADM:
+                    - 'IDPUSERID1'
+                    - 'IDPUSERID2'
+                  D2DQEARLYREG: []
                 token_public_keys_PEM:
                 - |
                   -----BEGIN PUBLIC KEY-----