wip #4765

diff --git a/app/Http/Controllers/Admin/ToolsController.php b/app/Http/Controllers/Admin/ToolsController.php
index 008d30a33745591cd369068bc7af800330fe85d4..06e89ed280726e0381838675da98f468bc6920bb 100644 (file)
--- a/app/Http/Controllers/Admin/ToolsController.php
+++ b/app/Http/Controllers/Admin/ToolsController.php
@@ -27,9 +27,4 @@ class ToolsController extends Controller
         }
         return $this->$tool($args);
     }
-
-    protected function test()
-    {
-dd(Auth::user());
-    }
 }

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 60282cb3511902aab6946e14f43ebbe980017cf9..51a047a9f6baf3f645853dbdb1b95f5fc7f144a0 100644 (file)
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\Auth;
 
+
 use Backpack\CRUD\app\Library\Auth\AuthenticatesUsers;
+use Illuminate\Support\Facades\Auth;
 use Laravel\Socialite\Facades\Socialite;
 
 class LoginController extends \Backpack\CRUD\app\Http\Controllers\Auth\LoginController
@@ -22,10 +24,9 @@ class LoginController extends \Backpack\CRUD\app\Http\Controllers\Auth\LoginCont
 
     public function showLoginForm()
     {
-        try {
-            dd(Socialite::driver('google')->user());
-        } catch (\Exception $e) {
-            return Socialite::driver('google')->redirect();
+        if (Auth::user()) {
+            return redirect(backpack_url('dashboard'));
         }
+        return Socialite::driver('google')->redirect();
     }
 }