Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Controller.php
View File

@ -30,16 +30,16 @@ abstract class Controller extends BaseController
public function __construct()
{
// Get a user instance for the current user
$user = Auth::user();
$user = auth()->user();
if (!$user) {
$user = User::getDefault();
}
// Share variables with views
view()->share('signedIn', Auth::check());
view()->share('signedIn', auth()->check());
view()->share('currentUser', $user);
// Share variables with controllers
$this->currentUser = $user;
$this->signedIn = Auth::check();
$this->signedIn = auth()->check();
}
/**

4
app/Http/Controllers/UserController.php
View File

@ -64,7 +64,7 @@ class UserController extends Controller
]);
$user = $this->user->fill($request->all());
$user->password = Hash::make($request->get('password'));
$user->password = bcrypt($request->get('password'));
$user->save();
$user->attachRoleId($request->get('role'));
@ -120,7 +120,7 @@ class UserController extends Controller
if ($request->has('password') && $request->get('password') != '') {
//dd('cat');
$password = $request->get('password');
$user->password = Hash::make($password);
$user->password = bcrypt($password);
}
$user->save();
return redirect('/users');

2
app/Http/routes.php
View File

@ -43,6 +43,7 @@ Route::group(['middleware' => 'auth'], function () {
});
// Uploads
Route::post('/upload/image', 'ImageController@upload');
// Users
@ -75,7 +76,6 @@ Route::group(['middleware' => 'auth'], function () {
Route::get('/settings', 'SettingController@index');
Route::post('/settings', 'SettingController@update');
});
// Login using social authentication

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());
}
}