X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/e15fcf5b50e1831a90a04ded09f24e0c7b31d02e..refs/pull/2928/head:/app/Http/Controllers/Auth/Saml2Controller.php diff --git a/app/Http/Controllers/Auth/Saml2Controller.php b/app/Http/Controllers/Auth/Saml2Controller.php index 7ffcc572b..14eb65b71 100644 --- a/app/Http/Controllers/Auth/Saml2Controller.php +++ b/app/Http/Controllers/Auth/Saml2Controller.php @@ -7,7 +7,6 @@ use BookStack\Http\Controllers\Controller; class Saml2Controller extends Controller { - protected $samlService; /** @@ -15,7 +14,6 @@ class Saml2Controller extends Controller */ public function __construct(Saml2Service $samlService) { - parent::__construct(); $this->samlService = $samlService; $this->middleware('guard:saml2'); } @@ -51,8 +49,9 @@ class Saml2Controller extends Controller public function metadata() { $metaData = $this->samlService->metadata(); + return response()->make($metaData, 200, [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ]); } @@ -64,6 +63,7 @@ class Saml2Controller extends Controller { $requestId = session()->pull('saml2_logout_request_id', null); $redirect = $this->samlService->processSlsResponse($requestId) ?? '/'; + return redirect($redirect); } @@ -78,10 +78,10 @@ class Saml2Controller extends Controller $user = $this->samlService->processAcsResponse($requestId); if ($user === null) { $this->showErrorNotification(trans('errors.saml_fail_authed', ['system' => config('saml2.name')])); + return redirect('/login'); } return redirect()->intended(); } - }