Skip to content

Commit

Permalink
possible fix for "DISCO UI" error #1060
Browse files Browse the repository at this point in the history
- error back after addition of redirectPage in #869
- this fix requires clearing your browser
  • Loading branch information
pdurbin committed Nov 13, 2014
1 parent 5f4ba1e commit 2591a1b
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/main/webapp/resources/js/shib/idpselect.js
Original file line number Diff line number Diff line change
Expand Up @@ -1128,6 +1128,14 @@ function IdPSelectUI() {
fatal(getLocalizedMessage('fatal.wrongEntityId') + '"' + suppliedEntityId + '" != "' + paramsSupplied.myEntityID + '"');
return false;
}
if (null === returnString || returnString.length === 0) {
// The addition of redirectPage in https://github.com/IQSS/dataverse/issues/869
// broke Shibboleth login, resulting in the error
// "FATAL - DISCO UI:No URL return parameter provided"
// error in https://github.com/IQSS/dataverse/issues/1060
// So we try to add something reasonable back in.
returnString = paramsSupplied.defaultReturn;
}
if (null === returnString || returnString.length === 0) {
fatal(getLocalizedMessage('fatal.noReturnURL'));
return false;
Expand Down

0 comments on commit 2591a1b

Please sign in to comment.