李帅

1.测试OAuth

...@@ -30,7 +30,7 @@ class AuthController extends Controller ...@@ -30,7 +30,7 @@ class AuthController extends Controller
30 */ 30 */
31 public function handleProviderCallback(Request $request, $service) 31 public function handleProviderCallback(Request $request, $service)
32 { 32 {
33 - $socialUser = Socialite::driver($service)->stateless()->user(); 33 + $socialUser = Socialite::driver($service)->user();
34 dd($socialUser); 34 dd($socialUser);
35 // //据说apple有问题需要用这种办法 35 // //据说apple有问题需要用这种办法
36 // if ($service === 'apple'){ 36 // if ($service === 'apple'){
...@@ -80,14 +80,12 @@ class AuthController extends Controller ...@@ -80,14 +80,12 @@ class AuthController extends Controller
80 public function apiHandleProviderCallback(Request $request, $service) 80 public function apiHandleProviderCallback(Request $request, $service)
81 { 81 {
82 $code = $request->get('code'); 82 $code = $request->get('code');
83 +
83 if (!$code) return Response::fail('code miss'); 84 if (!$code) return Response::fail('code miss');
84 85
85 - $driver = Socialite::driver($service); 86 + $user = Socialite::driver($service)->stateless()->user();
86 - $response = $driver->getAccessTokenResponse($code);
87 - if (isset($response['errcode'])) return Response::fail($response['errmsg']);
88 87
89 - $driver->setOpenId($response['openid']); 88 + return Response::success($user);
90 - $oauthUser = $driver->getUserByToken($response['access_token']);
91 89
92 // //另一种写法 90 // //另一种写法
93 // $user = User::query()->firstOrCreate([ 91 // $user = User::query()->firstOrCreate([
......
...@@ -23,7 +23,7 @@ Route::prefix('v1')->namespace('App\Http\Controllers\V1')->group(function (Route ...@@ -23,7 +23,7 @@ Route::prefix('v1')->namespace('App\Http\Controllers\V1')->group(function (Route
23 23
24 Route::prefix('v1')->namespace('App\Http\Controllers\V1')->group(function (Router $api){ 24 Route::prefix('v1')->namespace('App\Http\Controllers\V1')->group(function (Router $api){
25 /** 移动端微信用户登录*/ 25 /** 移动端微信用户登录*/
26 - $api->get('login/{service}/callback', 'AuthController@apiHandleProviderCallback'); 26 + $api->get('auth/{service}/callback', 'AuthController@apiHandleProviderCallback');
27 }); 27 });
28 28
29 //Route::prefix('v1')->namespace('App\Http\Controllers\V1')->middleware('auth:sanctum')->group(function ($api){ 29 //Route::prefix('v1')->namespace('App\Http\Controllers\V1')->middleware('auth:sanctum')->group(function ($api){
......