OZG-4939: OZG-5045: Use a default Origin and if configured in the values, also additional ones.

src/main/helm/templates/keycloak-client-crd.yaml → src/main/helm/templates/keycloak_client_crd.yaml

@@ -10,14 +10,13 @@ spec:
   keep_after_delete: {{ $.Values.sso.keep_after_delete | default false }}
   client_name: {{ $client.client_name }}
   client_base_url: https://{{ include "app.baseDomain" $ }}  
-{{- if $client.client_web_origins }}
+
   client_web_origins:
+    - https://{{ include "app.baseDomain" $ }}
+  {{- if $client.client_web_origins }}
     {{- with $client.client_web_origins }}
 {{ toYaml . | indent 4 }}
     {{- end }}
-{{- else }}
-  client_web_origins:
-    - https://{{ include "app.baseDomain" $ }}
   {{- end }}
   client_redirect_uris:
     - https://{{ include "app.baseDomain" $ }}

src/test/helm/keycloak_client_crd_test.yaml

@@ -27,7 +27,7 @@ release:
   name: administration
   namespace: by-helm-test
 templates:
-  - templates/keycloak-client-crd.yaml
+  - templates/keycloak_client_crd.yaml
 set:
   ozgcloud:
     bundesland: by
@@ -114,7 +114,7 @@ tests:
           value:
             - https://helm-admin.ozg-sh.de
             - https://helm-admin.ozg-sh.de/*
-  - it: should override client web origins
+  - it: should use additional client web origins
     set:
       sso:
         keycloak_clients:
@@ -126,6 +126,7 @@ tests:
       - equal:
           path: spec.client_web_origins
           value:
+            - https://helm-admin.ozg-sh.de
             - https://some.origin.de
             - https://some.other.origin.de
   - it: should use additional redirect uris for client web origins