@@ -26,6 +26,9 @@ discard block |
||
| 26 | 26 | return $this->execute(($request->has('code') || $request->has('oauth_token')), $provider); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | + /** |
|
| 30 | + * @param boolean $request |
|
| 31 | + */ |
|
| 29 | 32 | public function execute($request, $provider) |
| 30 | 33 | { |
| 31 | 34 | if (! $request) { |
@@ -41,6 +44,7 @@ discard block |
||
| 41 | 44 | /** |
| 42 | 45 | * Find a user by username or create a new user |
| 43 | 46 | * @param |
| 47 | + * @param \Laravel\Socialite\Contracts\User $userData |
|
| 44 | 48 | * @return |
| 45 | 49 | */ |
| 46 | 50 | public function findByProviderIdOrCreate($userData, $provider) |
@@ -103,7 +107,7 @@ discard block |
||
| 103 | 107 | /** |
| 104 | 108 | * Get Data from Social Media Account |
| 105 | 109 | * @param string $provider |
| 106 | - * @return collection |
|
| 110 | + * @return \Laravel\Socialite\Contracts\User |
|
| 107 | 111 | */ |
| 108 | 112 | private function getSocialUser($provider) |
| 109 | 113 | { |
@@ -3,8 +3,6 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | - |
|
| 7 | -use App\Http\Requests; |
|
| 8 | 6 | use App\Http\Controllers\Controller; |
| 9 | 7 | use Illuminate\Contracts\Auth\Guard; |
| 10 | 8 | use Laravel\Socialite\Contracts\Factory as Socialite; |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | public function execute($request, $provider) |
| 30 | 30 | { |
| 31 | - if (! $request) { |
|
| 31 | + if (!$request) { |
|
| 32 | 32 | return $this->getAuthorizationFirst($provider); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | { |
| 48 | 48 | $user = User::where('provider_id', '=', $userData->id)->first(); |
| 49 | 49 | |
| 50 | - if (empty($user)) { |
|
| 50 | + if (empty($user)) { |
|
| 51 | 51 | $user = User::create([ |
| 52 | 52 | 'fullname' => $userData->getName(), |
| 53 | 53 | 'username' => $userData->getNickName(), |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | 'username' => $user->username, |
| 83 | 83 | ]; |
| 84 | 84 | |
| 85 | - if (! empty(array_diff($dbData, $socialData))) { |
|
| 85 | + if (!empty(array_diff($dbData, $socialData))) { |
|
| 86 | 86 | $user->avatar = $userData->getAvatar(); |
| 87 | 87 | $user->fullname = $userData->getName(); |
| 88 | 88 | $user->username = $userData->getId(); |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | public function __construct() |
| 39 | 39 | { |
| 40 | - $this->middleware('guest', ['except' => 'logout']); |
|
| 40 | + $this->middleware('guest', [ 'except' => 'logout' ]); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -64,9 +64,9 @@ discard block |
||
| 64 | 64 | protected function create(array $data) |
| 65 | 65 | { |
| 66 | 66 | return User::create([ |
| 67 | - 'fullname' => $data['name'], |
|
| 68 | - 'email' => $data['email'], |
|
| 69 | - 'password' => bcrypt($data['password']), |
|
| 67 | + 'fullname' => $data[ 'name' ], |
|
| 68 | + 'email' => $data[ 'email' ], |
|
| 69 | + 'password' => bcrypt($data[ 'password' ]), |
|
| 70 | 70 | ]); |
| 71 | 71 | } |
| 72 | 72 | |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | |
| 27 | 27 | public function getAvatarUrl() |
| 28 | 28 | { |
| 29 | - if(is_null($this->avatar)) { |
|
| 29 | + if (is_null($this->avatar)) { |
|
| 30 | 30 | return "http://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email))) . "?d=mm&s=40"; |
| 31 | 31 | } |
| 32 | 32 | |