github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-20 20:31:25 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Applied styleci changes

Browse Source
This commit is contained in:
Dan Brown
2021-10-20 13:40:27 +01:00
parent fe07cdaa06
commit 129f3286d9
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Auth/Saml2Controller.php
View File

@ -88,6 +88,7 @@ class Saml2Controller extends Controller
if (empty($samlResponse)) { if (empty($samlResponse)) {
$this->showErrorNotification(trans('errors.saml_fail_authed', ['system' => config('saml2.name')])); $this->showErrorNotification(trans('errors.saml_fail_authed', ['system' => config('saml2.name')]));
return redirect('/login'); return redirect('/login');
} }
@ -108,19 +109,23 @@ class Saml2Controller extends Controller
$acsId = $request->get('id', null); $acsId = $request->get('id', null);
$cacheKey = 'saml2_acs:' . $acsId; $cacheKey = 'saml2_acs:' . $acsId;
$samlResponse = null; $samlResponse = null;
try { try {
$samlResponse = decrypt(cache()->pull($cacheKey)); $samlResponse = decrypt(cache()->pull($cacheKey));
} catch (\Exception $exception) {} } catch (\Exception $exception) {
}
$requestId = session()->pull('saml2_request_id', 'unset'); $requestId = session()->pull('saml2_request_id', 'unset');
if (empty($acsId) || empty($samlResponse)) { if (empty($acsId) || empty($samlResponse)) {
$this->showErrorNotification(trans('errors.saml_fail_authed', ['system' => config('saml2.name')])); $this->showErrorNotification(trans('errors.saml_fail_authed', ['system' => config('saml2.name')]));
return redirect('/login'); return redirect('/login');
} }
$user = $this->samlService->processAcsResponse($requestId, $samlResponse); $user = $this->samlService->processAcsResponse($requestId, $samlResponse);
if (is_null($user)) { if (is_null($user)) {
$this->showErrorNotification(trans('errors.saml_fail_authed', ['system' => config('saml2.name')])); $this->showErrorNotification(trans('errors.saml_fail_authed', ['system' => config('saml2.name')]));
return redirect('/login'); return redirect('/login');
} }