From 7e0da8147864103f36728ba0d7e22d695881e3d5 Mon Sep 17 00:00:00 2001 From: William Petit Date: Thu, 25 May 2023 14:53:28 +0200 Subject: [PATCH] feat: add missing default values for templates --- defaults/main.yml | 32 ++++++++++++++++++-------- sso.schema.yml | 8 +++---- templates/hydra-dispatcher-apps.yml.j2 | 20 +++++++++------- 3 files changed, 38 insertions(+), 22 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 259017b..49168f8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -101,8 +101,10 @@ hydra_dispatcher_webhook_rules: # Hydra Passwordless configuration enable_hydra_passwordless: yes -hydra_passwordless_app_title: Adresse courriel -hydra_passwordless_app_description: Authentification via adresse courriel +hydra_passwordless_app_title: + fr: Adresse courriel +hydra_passwordless_app_description: + fr: Authentification via adresse courriel hydra_passwordless_app_icon_url: https://upload.wikimedia.org/wikipedia/commons/4/48/You%27ve_got_mail.png hydra_passwordless_identity_provider_id: passwordless hydra_passwordless_smtp_host: smtp-server @@ -136,13 +138,17 @@ hydra_passwordless_attributes_rewrite_rules: # Hydra SAML configuration enable_hydra_saml: yes -hydra_saml_app_title: {} -hydra_saml_app_description: {} +hydra_saml_app_title: + fr: SAML +hydra_saml_app_description: + fr: Authentification via SAML 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: {} +hydra_saml_app_options: + icon_url: + fr: # Liste des URLs autorisées pour la redirection post-login/logout sur le service shibboleth-sp hydra_saml_allowed_redirects: [] @@ -216,8 +222,10 @@ hydra_oidc_debug: no hydra_oidc_hydra_url_error: hydra_oidc_base_url: hydra_oidc_cookie_path: "{{ haproxy_hydra_oidc_base_path }}" -hydra_oidc_app_title: {} -hydra_oidc_app_description: {} +hydra_oidc_app_title: + fr: OIDC +hydra_oidc_app_description: + fr: Authentification via OIDC 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: @@ -229,7 +237,9 @@ hydra_oidc_scope: openid email hydra_oidc_client_id: hydra_oidc_client_secret: hydra_oidc_additionnal_env: {} -hydra_oidc_app_options: {} +hydra_oidc_app_options: + icon_url: + fr: hydra_oidc_attributes_rewrite_rules: email: - "property_exists(consent.session.id_token, 'email') ? consent.session.id_token.email : null" @@ -253,8 +263,10 @@ hydra_oidc_attributes_rewrite_rules: # Hydra LDAP configuration enable_hydra_ldap: no -hydra_ldap_app_title: LDAP -hydra_ldap_app_description: Authentification via LDAP +hydra_ldap_app_title: + fr: LDAP +hydra_ldap_app_description: + fr: Authentification via LDAP hydra_ldap_app_icon_url: hydra_ldap_dev_mode: false hydra_ldap_attributes_rewrite_rules: diff --git a/sso.schema.yml b/sso.schema.yml index f52b6ec..f3c4cb7 100644 --- a/sso.schema.yml +++ b/sso.schema.yml @@ -109,9 +109,9 @@ properties: enable_hydra_passwordless: type: boolean hydra_passwordless_app_title: - type: string + type: object hydra_passwordless_app_description: - type: string + type: object hydra_passwordless_app_icon_url: type: string hydra_passwordless_smtp_host: @@ -134,9 +134,9 @@ properties: enable_hydra_saml: type: boolean hydra_saml_app_title: - type: string + type: object hydra_saml_app_description: - type: string + type: object hydra_saml_app_icon_url: type: string hydra_saml_idp_entity_id: diff --git a/templates/hydra-dispatcher-apps.yml.j2 b/templates/hydra-dispatcher-apps.yml.j2 index d039a26..4ed89c9 100644 --- a/templates/hydra-dispatcher-apps.yml.j2 +++ b/templates/hydra-dispatcher-apps.yml.j2 @@ -4,13 +4,15 @@ hydra: {% if enable_hydra_passwordless %} - id: {{ hydra_passwordless_identity_provider_id | default("passwordless") }} title: - fr: "{{ hydra_passwordless_app_title }}" + fr: "{{ hydra_passwordless_app_title.fr }}" + en: "{{ hydra_passwordless_app_title.en | default("{{ hydra_passwordless_app_title.fr }}") }}" description: - fr: "{{ hydra_passwordless_app_description }}" + fr: "{{ hydra_passwordless_app_description.fr }}" + en: "{{ hydra_passwordless_app_description.en | default("{{ hydra_passwordless_app_description.fr }}") }}" login_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_passwordless_base_path }}/login" consent_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_passwordless_base_path }}/consent" logout_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_passwordless_base_path }}/logout" - attributes_rewrite_configuration: {{ hydra_passwordless_attributes_rewrite_configuration | to_json }} + attributes_rewrite_configuration: {{ hydra_passwordless_attributes_rewrite_configuration | default({}) | to_json }} icon_url: "{{ hydra_passwordless_app_icon_url }}" {% endif %} {% if enable_hydra_saml %} @@ -24,7 +26,7 @@ hydra: 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_configuration: {{ hydra_saml_attributes_rewrite_configuration | to_json }} + attributes_rewrite_configuration: {{ hydra_saml_attributes_rewrite_configuration | default({}) | to_json }} icon_url: "{{ hydra_saml_app_icon_url }}" options: icon_url: @@ -42,7 +44,7 @@ hydra: login_url: "{{ hydra_oidc_base_url }}{{ haproxy_hydra_oidc_base_path }}/login" consent_url: "{{ hydra_oidc_base_url }}{{ haproxy_hydra_oidc_base_path }}/consent" logout_url: "{{ hydra_oidc_base_url }}{{ haproxy_hydra_oidc_base_path }}/logout" - attributes_rewrite_configuration: {{ hydra_oidc_attributes_rewrite_configuration | to_json }} + attributes_rewrite_configuration: {{ hydra_oidc_attributes_rewrite_configuration | default({}) | to_json }} icon_url: "{{ hydra_oidc_app_icon_url }}" options: icon_url: @@ -52,13 +54,15 @@ hydra: {% if enable_hydra_ldap %} - id: ldap title: - fr: "{{ hydra_ldap_app_title }}" + fr: "{{ hydra_ldap_app_title.fr }}" + en: "{{ hydra_ldap_app_title.en | default("{{ hydra_ldap_app_title.fr }}") }}" description: - fr: "{{ hydra_ldap_app_description }}" + fr: "{{ hydra_ldap_app_description.fr }}" + en: "{{ hydra_ldap_app_description.en | default("{{ hydra_ldap_app_description.fr }}") }}" login_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_ldap_base_path }}/auth/login" consent_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_ldap_base_path }}/auth/consent" logout_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_ldap_base_path }}/auth/logout" - attributes_rewrite_configuration: {{ hydra_ldap_attributes_rewrite_configuration | to_json }} + attributes_rewrite_configuration: {{ hydra_ldap_attributes_rewrite_configuration | default({}) | to_json }} icon_url: "{{ hydra_ldap_app_icon_url }}" {% endif %} webhook: