From 6d02ab07173dc4b7fde9a9839633add1d313923e Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 14 Aug 2018 18:03:37 +0200 Subject: [PATCH] set base url to 'http://domain/nextcloud/index.php/apps/user_saml/saml' Signed-off-by: Bjoern Schiessle --- appinfo/routes.php | 5 +++++ lib/SAMLSettings.php | 2 +- tests/unit/AppInfo/RoutesTest.php | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/appinfo/routes.php b/appinfo/routes.php index 7da99f9..6e65217 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -28,6 +28,11 @@ return [ 'url' => '/saml/login', 'verb' => 'GET', ], + [ + 'name' => 'SAML#base', + 'url' => '/saml', + 'verb' => 'GET', + ], [ 'name' => 'SAML#getMetadata', 'url' => '/saml/metadata', diff --git a/lib/SAMLSettings.php b/lib/SAMLSettings.php index be0f9ff..58bd129 100644 --- a/lib/SAMLSettings.php +++ b/lib/SAMLSettings.php @@ -101,7 +101,7 @@ class SAMLSettings { $settings = [ 'strict' => true, 'debug' => $this->config->getSystemValue('debug', false), - 'baseurl' => $this->request->getServerProtocol() . '://' . $this->request->getServerHost(), + 'baseurl' => $this->urlGenerator->linkToRouteAbsolute('user_saml.SAML.base'), 'security' => [ 'nameIdEncrypted' => ($this->config->getAppValue('user_saml', $prefix . 'security-nameIdEncrypted', '0') === '1') ? true : false, 'authnRequestsSigned' => ($this->config->getAppValue('user_saml', $prefix . 'security-authnRequestsSigned', '0') === '1') ? true : false, diff --git a/tests/unit/AppInfo/RoutesTest.php b/tests/unit/AppInfo/RoutesTest.php index 5ca5ea6..b8efaba 100644 --- a/tests/unit/AppInfo/RoutesTest.php +++ b/tests/unit/AppInfo/RoutesTest.php @@ -34,6 +34,11 @@ class Test extends TestCase { 'url' => '/saml/login', 'verb' => 'GET', ], + [ + 'name' => 'SAML#base', + 'url' => '/saml', + 'verb' => 'GET', + ], [ 'name' => 'SAML#getMetadata', 'url' => '/saml/metadata',