webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-31 15:24:31 +03:00
Code Activity

Updated okta config keys, made SVG fully vector

Browse Source 
Also added some additional error handling to login.
This commit is contained in:
Dan Brown
2017-12-09 13:32:45 +00:00
parent d17eb0f54c
commit 90bf13c1ab
5 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Services/SocialAuthService.php
View File

@ -1,5 +1,7 @@
<?php namespace BookStack\Services;
use BookStack\Http\Requests\Request;
use GuzzleHttp\Exception\ClientException;
use Laravel\Socialite\Contracts\Factory as Socialite;
use BookStack\Exceptions\SocialDriverNotConfigured;
use BookStack\Exceptions\SocialSignInException;
@ -91,7 +93,6 @@ class SocialAuthService
public function handleLoginCallback($socialDriver)
{
$driver = $this->validateDriver($socialDriver);
// Get user details from social driver
$socialUser = $this->socialite->driver($driver)->user();
$socialId = $socialUser->getId();
@ -135,7 +136,7 @@ class SocialAuthService
$message .= trans('errors.social_account_register_instructions', ['socialAccount' => title_case($socialDriver)]);
}
throw new SocialSignInException($message . '.', '/login');
throw new SocialSignInException($message, '/login');
}
/**