webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Merge branch 'feature/saml' of git://github.com/Xiphoseer/BookStack into Xiphoseer-feature/saml

Browse Source
This commit is contained in:
Dan Brown
2019-11-16 12:42:45 +00:00
parent 189a598d56 8e723f10dc
commit bb1f43cbd8
18 changed files with 646 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,6 +119,7 @@ class LoginController extends Controller
{
$socialDrivers = $this->socialAuthService->getActiveDrivers();
$authMethod = config('auth.method');
$samlEnabled = config('services.saml.enabled') == true;
if ($request->has('email')) {
session()->flashInput([
@ -127,7 +128,11 @@ class LoginController extends Controller
]);
}
return view('auth.login', ['socialDrivers' => $socialDrivers, 'authMethod' => $authMethod]);
return view('auth.login', [
'socialDrivers' => $socialDrivers,
'authMethod' => $authMethod,
'samlEnabled' => $samlEnabled,
]);
}
/**