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

Cleaned up some unessasary facade usage

Browse Source
This commit is contained in:
Dan Brown
2015-09-05 12:29:47 +01:00
parent eac7378ce0
commit 6b6f6d2c92
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Services/SocialAuthService.php
View File

@ -60,8 +60,8 @@ class SocialAuthService
// Get any attached social accounts or users
$socialAccount = $this->socialAccount->where('driver_id', '=', $socialId)->first();
$user = $this->userRepo->getByEmail($socialUser->getEmail());
$isLoggedIn = \Auth::check();
$currentUser = \Auth::user();
$isLoggedIn = auth()->check();
$currentUser = auth()->user();
// When a user is not logged in but a matching SocialAccount exists,
// Log the user found on the SocialAccount into the application.
@ -115,7 +115,7 @@ class SocialAuthService
private function logUserIn($user)
{
\Auth::login($user);
auth()->login($user);
return redirect('/');
}
@ -183,9 +183,10 @@ class SocialAuthService
*/
public function detachSocialAccount($socialDriver)
{
\Auth::user()->socialAccounts()->where('driver', '=', $socialDriver)->delete();
session();
auth()->user()->socialAccounts()->where('driver', '=', $socialDriver)->delete();
\Session::flash('success', $socialDriver . ' account successfully detached');
return redirect(\Auth::user()->getEditUrl());
return redirect(auth()->user()->getEditUrl());
}
}