diff --git a/src/main/webapp/resources/js/shib/idpselect.js b/src/main/webapp/resources/js/shib/idpselect.js index 6fe435112e3..5dbe9bc902f 100644 --- a/src/main/webapp/resources/js/shib/idpselect.js +++ b/src/main/webapp/resources/js/shib/idpselect.js @@ -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;