Skip to content

[R-2025-51]Include eduGAIN DS in the IdP list #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Yusaku-Kitabatake wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[R-2025-51]Include eduGAIN DS in the IdP list #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions public/embedded-wayf_js.en
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 = '';
}
Expand Down Expand Up @@ -7904,7 +7912,7 @@ function decodeBase64(input) {
writeHTML('</td>');
writeHTML('</tr>');
writeHTML('</table>');

// Close form
writeHTML('</form>');

Expand Down
10 changes: 9 additions & 1 deletion public/embedded-wayf_js.ja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 = '';
}
Expand Down
Loading