From 65525ae0d339769f520aad06cf7aba6d90d8602b Mon Sep 17 00:00:00 2001 From: Yusaku Kitabatake <79951536+Yusaku-Kitabatake@users.noreply.github.com> Date: Tue, 25 Feb 2025 16:34:58 +0900 Subject: [PATCH] Include eduGAIN DS in the IdP list --- public/embedded-wayf_js.en | 12 ++++++++++-- public/embedded-wayf_js.ja | 10 +++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/public/embedded-wayf_js.en b/public/embedded-wayf_js.en index ebc61a287..5f578a051 100644 --- a/public/embedded-wayf_js.en +++ b/public/embedded-wayf_js.en @@ -12,6 +12,7 @@ var wayf_sp_entityID; var wayf_URL; var wayf_return_url; var wayf_sp_handlerURL; +var wayf_eduGAIN_DS_url; var wayf_use_discovery_service; var wayf_use_small_logo; @@ -2623,7 +2624,10 @@ function submitForm(){ setCookie('_saml_idp', encodeBase64(NonFedEntityID) , 100); // Redirect user to SP handler - if (wayf_use_discovery_service){ + if (wayf_eduGAIN_DS_url && NonFedEntityID == wayf_eduGAIN_DS_url){ + redirect_url = wayf_eduGAIN_DS_url + '?target=' + encodeURIComponent(wayf_return_url); + window.location = redirect_url; + } else if (wayf_use_discovery_service){ redirect_url = wayf_sp_samlDSURL + (wayf_sp_samlDSURL.indexOf('?')>=0?'&':'?')+'entityID=' + encodeURIComponent(NonFedEntityID) + '&target=' + encodeURIComponent(wayf_return_url); @@ -2880,6 +2884,10 @@ function decodeBase64(input) { config_ok = false; } + if(typeof(wayf_eduGAIN_DS_url) == "undefined"){ + wayf_eduGAIN_DS_url = ''; + } + if(typeof(wayf_discofeed_url) == "undefined"){ wayf_discofeed_url = ''; } @@ -7904,7 +7912,7 @@ function decodeBase64(input) { writeHTML(''); writeHTML(''); writeHTML(''); - + // Close form writeHTML(''); diff --git a/public/embedded-wayf_js.ja b/public/embedded-wayf_js.ja index bc4fc2cf1..35f245c9f 100644 --- a/public/embedded-wayf_js.ja +++ b/public/embedded-wayf_js.ja @@ -12,6 +12,7 @@ var wayf_sp_entityID; var wayf_URL; var wayf_return_url; var wayf_sp_handlerURL; +var wayf_eduGAIN_DS_url; var wayf_use_discovery_service; var wayf_use_small_logo; @@ -2623,7 +2624,10 @@ function submitForm(){ setCookie('_saml_idp', encodeBase64(NonFedEntityID) , 100); // Redirect user to SP handler - if (wayf_use_discovery_service){ + if (wayf_eduGAIN_DS_url && NonFedEntityID == wayf_eduGAIN_DS_url){ + redirect_url = wayf_eduGAIN_DS_url + '?target=' + encodeURIComponent(wayf_return_url); + window.location = redirect_url; + } else if (wayf_use_discovery_service){ redirect_url = wayf_sp_samlDSURL + (wayf_sp_samlDSURL.indexOf('?')>=0?'&':'?')+'entityID=' + encodeURIComponent(NonFedEntityID) + '&target=' + encodeURIComponent(wayf_return_url); @@ -2880,6 +2884,10 @@ function decodeBase64(input) { config_ok = false; } + if(typeof(wayf_eduGAIN_DS_url) == "undefined"){ + wayf_eduGAIN_DS_url = ''; + } + if(typeof(wayf_discofeed_url) == "undefined"){ wayf_discofeed_url = ''; }