Merge branch 'master' into fix/shibboleth_entity_id

This commit is contained in:
Laurent Gourvenec 2023-02-28 14:36:57 +01:00
commit e42d3cf47b
1 changed files with 23 additions and 24 deletions

View File

@ -5,7 +5,7 @@ hydra:
- id: {{ hydra_passwordless_identity_provider_id | default("passwordless") }} - id: {{ hydra_passwordless_identity_provider_id | default("passwordless") }}
title: title:
fr: "{{ hydra_passwordless_app_title }}" fr: "{{ hydra_passwordless_app_title }}"
description: description:
fr: "{{ hydra_passwordless_app_description }}" fr: "{{ hydra_passwordless_app_description }}"
login_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_passwordless_base_path }}/login" login_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_passwordless_base_path }}/login"
consent_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_passwordless_base_path }}/consent" consent_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_passwordless_base_path }}/consent"
@ -13,12 +13,30 @@ hydra:
attributes_rewrite_rules: {{ hydra_passwordless_attributes_rewrite_rules | to_json }} attributes_rewrite_rules: {{ hydra_passwordless_attributes_rewrite_rules | to_json }}
icon_url: "{{ hydra_passwordless_app_icon_url }}" icon_url: "{{ hydra_passwordless_app_icon_url }}"
{% endif %} {% endif %}
{% if enable_hydra_saml %}
- id: {{ hydra_saml_identity_provider_id | default("saml") }}
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 }}"
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 %} {% if enable_hydra_oidc %}
- id: {{ hydra_oidc_identity_provider_id | default("oidc") }} - id: {{ hydra_oidc_identity_provider_id | default("oidc") }}
title: title:
fr: "{{ hydra_oidc_app_title.fr }}" fr: "{{ hydra_oidc_app_title.fr }}"
en: "{{ hydra_oidc_app_title.en | default("{{ hydra_oidc_app_title.fr }}") }}" en: "{{ hydra_oidc_app_title.en | default("{{ hydra_oidc_app_title.fr }}") }}"
description: description:
fr: "{{ hydra_oidc_app_description.fr }}" fr: "{{ hydra_oidc_app_description.fr }}"
en: "{{ hydra_oidc_app_description.en | default("{{ hydra_oidc_app_description.fr }}") }}" en: "{{ hydra_oidc_app_description.en | default("{{ hydra_oidc_app_description.fr }}") }}"
login_url: "{{ hydra_oidc_base_url }}{{ haproxy_hydra_oidc_base_path }}/login" login_url: "{{ hydra_oidc_base_url }}{{ haproxy_hydra_oidc_base_path }}/login"
@ -33,9 +51,9 @@ hydra:
{% endif %} {% endif %}
{% if enable_hydra_ldap %} {% if enable_hydra_ldap %}
- id: ldap - id: ldap
title: title:
fr: "{{ hydra_ldap_app_title }}" fr: "{{ hydra_ldap_app_title }}"
description: description:
fr: "{{ hydra_ldap_app_description }}" fr: "{{ hydra_ldap_app_description }}"
login_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_ldap_base_path }}/auth/login" 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" consent_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_ldap_base_path }}/auth/consent"
@ -43,22 +61,3 @@ hydra:
attributes_rewrite_rules: {{ hydra_ldap_attributes_rewrite_rules | to_json }} attributes_rewrite_rules: {{ hydra_ldap_attributes_rewrite_rules | to_json }}
icon_url: "{{ hydra_ldap_app_icon_url }}" icon_url: "{{ hydra_ldap_app_icon_url }}"
{% endif %} {% endif %}
{% if enable_hydra_saml %}
- id: {{ hydra_saml_identity_provider_id | default("saml") }}
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 }}"
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 %}