feat(#3): login url as separate parameter

eurofurence · Jan 30, 2024 · 906f509 · 906f509
1 parent 447d019
commit 906f509
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 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.22
+version: 0.0.23
 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
@@ -12,7 +12,7 @@ data:
     web:
       server_url: '{{ $public_base_url }}/'
       context_path: '{{ .Values.system.components.regsys_classic.context_path }}'
-      regsys_public_url: '{{ $public_base_url }}/app/register'
+      regsys_public_url: '{{ .Values.system.public_login_url }}'
       {{- range (index .Values.system.registration_languages 0) }}
       {{-   range $key, $value := . }}
       system_language: '{{ $key }}'
@@ -64,7 +64,7 @@ data:
     # configuration file for attendee-service
     service:
       name: 'Attendee Service'
-      regsys_public_url: '{{ $public_base_url }}/app/register'
+      regsys_public_url: '{{ .Values.system.public_login_url }}'
       {{- if .Values.system.components.payment_service.enable }}
       payment_service: '{{ .Values.system.components.payment_service.local_base_url }}'
       {{- end }}

diff --git a/charts/eurofurence-registration-system/tests/configmap_test.yaml b/charts/eurofurence-registration-system/tests/configmap_test.yaml
@@ -9,6 +9,7 @@ tests:
       system:
         public_base_url_domain: https://my.domain.example.com
         public_base_context: 'hello/you'
+        public_login_url: https://identity.example.com/
         registration_languages:
           - 'en-US':
               en-US: English
@@ -141,7 +142,7 @@ tests:
             web:
               server_url: 'https://my.domain.example.com/hello/you/'
               context_path: 'regsys'
-              regsys_public_url: 'https://my.domain.example.com/hello/you/app/register'
+              regsys_public_url: 'https://identity.example.com/'
               system_language: 'en-US'
             downstream:
               auth_service: 'http://auth-service:8080'
@@ -220,7 +221,7 @@ tests:
             # configuration file for attendee-service
             service:
               name: 'Attendee Service'
-              regsys_public_url: 'https://my.domain.example.com/hello/you/app/register'
+              regsys_public_url: 'https://identity.example.com/'
               payment_service: 'http://payment-service:8080'
               mail_service: 'http://mail-service:8080'
               auth_service: 'http://auth-service:8080'

diff --git a/charts/eurofurence-registration-system/values-example.yaml b/charts/eurofurence-registration-system/values-example.yaml
@@ -34,6 +34,7 @@ ingress:
 system:
   public_base_url_domain: https://my.domain.example.com
   public_base_context: 'testing-instance'
+  public_login_url: https://my.identity.provider.example.com/
 
   registration_languages:
     # the first listed locale is the system default

diff --git a/charts/eurofurence-registration-system/values.schema.json b/charts/eurofurence-registration-system/values.schema.json
@@ -110,6 +110,12 @@
           "default": "",
           "example": "this/comes/after/the/domain"
         },
+        "public_login_url": {
+          "type": "string",
+          "description": "The public url to show in emails as the user entry point, e.g. a login page",
+          "pattern": "^https?://.*$",
+          "example": "https://identity.example.com/"
+        },
         "logging": {
           "type": "object",
           "additionalProperties": false,