From 6b6f6d2c9207b0a04e67434d526233bc3c059e4f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 5 Sep 2015 12:29:47 +0100
Subject: [PATCH] Cleaned up some unessasary facade usage

---
 app/Http/Controllers/Controller.php     |  6 +++---
 app/Http/Controllers/UserController.php |  4 ++--
 app/Http/routes.php                     |  2 +-
 app/Services/SocialAuthService.php      | 11 ++++++-----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 2db96ccf7..80c4c5526 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -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();
     }
 
     /**
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index b04dedf16..306641e71 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -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');
diff --git a/app/Http/routes.php b/app/Http/routes.php
index b50cd6fab..97908ff48 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -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
diff --git a/app/Services/SocialAuthService.php b/app/Services/SocialAuthService.php
index 814f96af6..fda39819d 100644
--- a/app/Services/SocialAuthService.php
+++ b/app/Services/SocialAuthService.php
@@ -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());
     }
 
 }
\ No newline at end of file