From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 7 Oct 2021 15:26:57 +0000 (+0200)
Subject: wip #4765 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b716aa6c2a27743462d0afd03f343f3de4896be8;p=cubist_socialite.git

wip #4765 @0.5
---

diff --git a/routes/socialite.php b/routes/socialite.php
index c1d5a3a..a3718d9 100644
--- a/routes/socialite.php
+++ b/routes/socialite.php
@@ -1,6 +1,6 @@
 <?php
 
-Route::group(['namespace' => 'Cubist\Socialite\Http\Controllers'], function () {
+Route::group(['namespace' => 'Cubist\Socialite\Http\Controllers','middleware' => ['web']], function () {
     Route::get("socialite/login", "SocialiteController@login");
     Route::get("socialite/redirect/{provider}", "SocialiteController@redirect")->name('socialite.redirect');
     Route::get("socialite/callback/{provider}", "SocialiteController@callback")->name('socialite.callback');
diff --git a/src/Http/Controllers/SocialiteController.php b/src/Http/Controllers/SocialiteController.php
index 0f2a6da..3554a92 100644
--- a/src/Http/Controllers/SocialiteController.php
+++ b/src/Http/Controllers/SocialiteController.php
@@ -2,24 +2,22 @@
 
 namespace Cubist\Socialite\Http\Controllers;
 
-use Cubist\Socialite\SocialiteServiceProvider;
-use Illuminate\Http\Client\Request;
+use Cubist\Socialite\CubistSocialiteServiceProvider;
 use Illuminate\Routing\Controller;
+use Laravel\Socialite\Facades\Socialite;
 
 class SocialiteController extends Controller
 {
-
     protected $providers = ["google"];
 
     public function login()
     {
-        return view(SocialiteServiceProvider::NAMESPACE . ".login");
+        return view(CubistSocialiteServiceProvider::NAMESPACE . "::login");
     }
 
-    public function redirect(Request $request)
+    public function redirect()
     {
-
-        $provider = $request->provider;
+        $provider = request()->provider;
         if (in_array($provider, $this->providers)) {
             return Socialite::driver($provider)->redirect();
         }
@@ -27,12 +25,11 @@ class SocialiteController extends Controller
     }
 
 
-    public function callback(Request $request)
+    public function callback()
     {
-
-        $provider = $request->provider;
+        $provider = request()->provider;
         if (in_array($provider, $this->providers)) {
-            $data = Socialite::driver($request->provider)->user();
+            $data = Socialite::driver($provider)->user();
             $user = $data->user;
             dd($user);
         }