hydra-dispatcher: update templating j2

Reviewed-on: #2
Co-authored-by: cmsassot <cmsassot@cadoles.com>
Co-committed-by: cmsassot <cmsassot@cadoles.com>

defaults/main.yml

@@ -110,12 +110,13 @@ hydra_passwordless_attributes_rewrite_rules:
 # Hydra SAML configuration
 
 enable_hydra_saml: yes
-hydra_saml_app_title: SAML
-hydra_saml_app_description: Authentification via SAML
+hydra_saml_app_title: {}
+hydra_saml_app_description: {}
 hydra_saml_app_icon_url:
 hydra_saml_identity_provider_id: saml
 hydra_saml_idp_entity_id: https://samltest.id/saml/idp
 hydra_saml_idp_metadata_url: https://samltest.id/saml/idp
+hydra_saml_app_options: {}
 
 # Liste des URLs autorisées pour la redirection post-login/logout sur le service shibboleth-sp
 hydra_saml_allowed_redirects: []
@@ -187,8 +188,8 @@ oidc_test_app_public_base_url: "{{ haproxy_public_base_url }}{{ haproxy_oidc_tes
 enable_hydra_oidc: no
 hydra_oidc_debug: no
 hydra_oidc_cookie_path: "{{ haproxy_hydra_oidc_base_path }}"
-hydra_oidc_app_title: OpenID Connect
-hydra_oidc_app_description: Authentification via OpenID Connect
+hydra_oidc_app_title: {}
+hydra_oidc_app_description: {}
 hydra_oidc_app_icon_url: https://openid.net/wordpress-content/uploads/2014/09/openid-r-logo-900x360.png
 hydra_oidc_identity_provider_id: oidc
 hydra_oidc_authorize_endpoint:
@@ -200,7 +201,7 @@ hydra_oidc_scope: openid email
 hydra_oidc_client_id:
 hydra_oidc_client_secret: 
 hydra_oidc_additionnal_env: {}
-
+hydra_oidc_app_options: {}
 hydra_oidc_attributes_rewrite_rules:
   email:
     - "property_exists(consent.session.id_token, 'email') ? consent.session.id_token.email : null"

templates/cadoles-pod-hydra-dispatcher-v1.conf.j2

@@ -5,10 +5,6 @@ PODMAN_ARGS="\
     --network=slirp4netns:allow_host_loopback=true \
     --tz=local \
     -p 127.0.0.1:3000:80 \
-    -v /etc/hydra-dispatcher/conf.d:/var/www/config/hydra \ 
-    {% for item in hydra_dispatcher_mounts %}
-        -v "{{ item.host }}:{{ item.container }}" \
-    {% endfor %}
     -e APP_ENV=prod \
     -e 'APP_DEBUG={{ hydra_dispatcher_debug }}' \
     -e HYDRA_ADMIN_BASE_URL=http://10.0.2.2:4445 \
@@ -24,4 +20,8 @@ PODMAN_ARGS="\
     -e 'TRUSTED_PROXIES=127.0.0.1,10.0.2.0/24' \
     -e 'SENTRY_DSN={{ hydra_dispatcher_sentry_dsn }}' \
     -e 'SENTRY_ENVIRONMENT={{ hydra_dispatcher_sentry_environment }}' \
+    -v /etc/hydra-dispatcher/conf.d:/var/www/config/hydra \
+    {% for item in hydra_dispatcher_mounts %}
+    -v {{ item.host }}:{{ item.container }} \
+    {% endfor %}
 "

templates/hydra-dispatcher-apps.yml.j2

@@ -16,26 +16,39 @@ hydra:
 {% if enable_hydra_saml %}
     - id: {{ hydra_saml_identity_provider_id | default("saml") }}
       title: 
-        fr: "{{ hydra_saml_app_title }}"
+        fr: "{{ hydra_saml_app_title.fr }}"
+        en: "{{ hydra_saml_app_title.en | default("{{ hydra_saml_app_title.fr }}")  }}"
       description: 
-        fr: "{{ hydra_saml_app_description }}"
+        fr: "{{ hydra_saml_app_description.fr }}"
+        en: "{{ hydra_saml_app_description.en | default("{{ hydra_saml_app_description.fr }}")  }}"
       login_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_saml_base_path }}/login"
       consent_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_saml_base_path }}/consent"
       logout_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_saml_base_path }}/logout"
       attributes_rewrite_rules: {{ hydra_saml_attributes_rewrite_rules | to_json }}
       icon_url: "{{ hydra_saml_app_icon_url }}"
+      options:
+        icon_url:
+          fr: "{{ hydra_saml_app_options.icon_url.fr }}"
+          en: "{{ hydra_saml_app_options.icon_url.en | default("{{ hydra_saml_app_options.icon_url.fr }}") }}"
+
 {% endif %}
 {% if enable_hydra_oidc %}
     - id: {{ hydra_oidc_identity_provider_id | default("oidc") }}
       title: 
-        fr: "{{ hydra_oidc_app_title }}"
+        fr: "{{ hydra_oidc_app_title.fr }}"
+        en: "{{ hydra_oidc_app_title.en | default("{{ hydra_oidc_app_title.fr }}")  }}"
       description: 
-        fr: "{{ hydra_oidc_app_description }}"
+        fr: "{{ hydra_oidc_app_description.fr }}"
+        en: "{{ hydra_oidc_app_description.en | default("{{ hydra_oidc_app_description.fr }}")  }}"
       login_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_oidc_base_path }}/login"
       consent_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_oidc_base_path }}/consent"
       logout_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_oidc_base_path }}/logout"
       attributes_rewrite_rules: {{ hydra_oidc_attributes_rewrite_rules | to_json }}
       icon_url: "{{ hydra_oidc_app_icon_url }}"
+      options:
+        icon_url:
+          fr: "{{ hydra_oidc_app_options.icon_url.fr }}"
+          en: "{{ hydra_oidc_app_options.icon_url.en | default("{{ hydra_oidc_app_options.icon_url.fr }}") }}"
 {% endif %}
 {% if enable_hydra_ldap %}
     - id: ldap