Fixes for CodeStyle vol.2

[bookstack] / app / Http / Controllers / Auth / Saml2Controller.php

diff --git a/app/Http/Controllers/Auth/Saml2Controller.php b/app/Http/Controllers/Auth/Saml2Controller.php
index 7ffcc572bcd06dc43f003df6edb9f8c05d84720e..14eb65b717de6076ecbd76f1d352b877146c95f7 100644 (file)
--- 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
 {
 
 class Saml2Controller extends Controller
 {

-

     protected $samlService;
 
     /**
     protected $samlService;
 
     /**


@@ -15,7 +14,6 @@ class Saml2Controller extends Controller
      */
     public function __construct(Saml2Service $samlService)
     {
      */
     public function __construct(Saml2Service $samlService)
     {

-        parent::__construct();

         $this->samlService = $samlService;
         $this->middleware('guard:saml2');
     }
         $this->samlService = $samlService;
         $this->middleware('guard:saml2');
     }


@@ -51,8 +49,9 @@ class Saml2Controller extends Controller
     public function metadata()
     {
         $metaData = $this->samlService->metadata();
     public function metadata()
     {
         $metaData = $this->samlService->metadata();

+

         return response()->make($metaData, 200, [
         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) ?? '/';
     {
         $requestId = session()->pull('saml2_logout_request_id', null);
         $redirect = $this->samlService->processSlsResponse($requestId) ?? '/';

+

         return redirect($redirect);
     }
 
         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')]));
         $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();
     }
             return redirect('/login');
         }
 
         return redirect()->intended();
     }

-

 }
 }