李帅

1.优化用户登录,注销。

...@@ -78,14 +78,9 @@ class AuthController extends Controller ...@@ -78,14 +78,9 @@ class AuthController extends Controller
78 78
79 public function socialite(Request $request, $service) 79 public function socialite(Request $request, $service)
80 { 80 {
81 - $validator = Validator::make([ 81 + $validator = Validator::make(['token' => $request->token, 'provider' => $service,], [
82 - 'token' => $request->token,
83 - 'provider' => $service,
84 - 'provider_id' => $request->provider_id
85 - ], [
86 'token' => 'required|string', 82 'token' => 'required|string',
87 'provider' => 'required|in:facebook,twitter,github,apple', 83 'provider' => 'required|in:facebook,twitter,github,apple',
88 - 'provider_id' => 'required|string'
89 ]); 84 ]);
90 if ($validator->fails()){ 85 if ($validator->fails()){
91 return Response::fail('',500,$validator->errors()); 86 return Response::fail('',500,$validator->errors());
......
...@@ -153,7 +153,7 @@ class UserController extends Controller ...@@ -153,7 +153,7 @@ class UserController extends Controller
153 return Response::fail('',500,$exception->getMessage()); 153 return Response::fail('',500,$exception->getMessage());
154 } 154 }
155 155
156 - return Response::success(['avatar' => $user->avatar]); 156 + return Response::success($user);
157 } 157 }
158 158
159 public function destroy($id, Request $request) 159 public function destroy($id, Request $request)
......
...@@ -27,6 +27,9 @@ Route::prefix('v1')->namespace('App\Http\Controllers\V1')->group(function (Route ...@@ -27,6 +27,9 @@ Route::prefix('v1')->namespace('App\Http\Controllers\V1')->group(function (Route
27 /** 社会化用户登录*/ 27 /** 社会化用户登录*/
28 $api->any('auth/{service}/callback', 'AuthController@apiHandleProviderCallback'); 28 $api->any('auth/{service}/callback', 'AuthController@apiHandleProviderCallback');
29 29
30 + /** 社会化用户登录*/
31 + $api->post('socialite/{service}', 'AuthController@socialite');
32 +
30 /** 增加观看次数 */ 33 /** 增加观看次数 */
31 $api->get('/addview/{id}', 'ImmerseController@addview'); 34 $api->get('/addview/{id}', 'ImmerseController@addview');
32 35
......