From 598984a3e4e98c7bce15450058843fbb7a0256b2 Mon Sep 17 00:00:00 2001
From: cmsassot <cmsassot@cadoles.com>
Date: Thu, 9 Feb 2023 14:41:40 +0100
Subject: [PATCH] Correction templating app hydra-disptacher

---
 templates/hydra-dispatcher-apps.yml.j2 | 38 +++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/templates/hydra-dispatcher-apps.yml.j2 b/templates/hydra-dispatcher-apps.yml.j2
index 904b904..26d14d7 100644
--- a/templates/hydra-dispatcher-apps.yml.j2
+++ b/templates/hydra-dispatcher-apps.yml.j2
@@ -13,25 +13,6 @@ hydra:
       attributes_rewrite_rules: {{ hydra_passwordless_attributes_rewrite_rules | to_json }}
       icon_url: "{{ hydra_passwordless_app_icon_url }}"
 {% 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 %}
     - id: {{ hydra_oidc_identity_provider_id | default("oidc") }}
       title: 
@@ -61,4 +42,23 @@ hydra:
       logout_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_ldap_base_path }}/auth/logout"
       attributes_rewrite_rules: {{ hydra_ldap_attributes_rewrite_rules | to_json }}
       icon_url: "{{ hydra_ldap_app_icon_url }}"
+{% 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 %}
\ No newline at end of file