wip #4765 @0.5

diff --git a/routes/socialite.php b/routes/socialite.php
index c1d5a3a344c599a9ea714e28e21e206d74317151..a3718d947197cf8fe7311897f28b2ca60425f1e4 100644 (file)
--- 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 0f2a6da03a95114e3f7ca41b1d1cf994e9f505eb..3554a92342fe02c7f8172f8ff1473d8435550d4a 100644 (file)
--- 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);
         }