Merge pull request #14974 from uberbrady/improve_saml_behind_proxy

Fixed #14895 and #14919 - set SAML baseurl to a sensible default for docker users and users behind a reverse proxy

Author: snipe

app/Services/Saml.php

@@ -163,6 +163,7 @@ private function loadSettings()
             OneLogin_Saml2_Utils::setProxyVars(request()->isFromTrustedProxy());
 
             data_set($settings, 'sp.entityId', config('app.url'));
+            data_set($settings, 'baseurl', config('app.url') . '/saml');
             data_set($settings, 'sp.assertionConsumerService.url', route('saml.acs'));
             data_set($settings, 'sp.singleLogoutService.url', route('saml.sls'));
             data_set($settings, 'sp.x509cert', $setting->saml_sp_x509cert);