@@ -19,8 +19,8 @@ |
||
| 19 | 19 | /* |
| 20 | 20 | * Authenticate the user's personal channel... |
| 21 | 21 | */ |
| 22 | - Broadcast::channel('App.User.*', function ($user, $userId) { |
|
| 23 | - return (int) $user->id === (int) $userId; |
|
| 22 | + Broadcast::channel('App.User.*', function($user, $userId) { |
|
| 23 | + return (int)$user->id === (int)$userId; |
|
| 24 | 24 | }); |
| 25 | 25 | } |
| 26 | 26 | } |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | $locale = $request->header('Content-Language'); |
| 39 | 39 | |
| 40 | 40 | // if the header is missed |
| 41 | - if(!$locale){ |
|
| 41 | + if (!$locale) { |
|
| 42 | 42 | // take the default local language |
| 43 | 43 | $locale = $this->app->config->get('app.locale'); |
| 44 | 44 | } |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | throw (new MissingVisitorIdException()); |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - if($skipCriterias){ |
|
| 44 | + if ($skipCriterias) { |
|
| 45 | 45 | $this->userRepository = $this->userRepository->skipCriteria(); |
| 46 | 46 | } |
| 47 | 47 | |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | public function register() |
| 20 | 20 | { |
| 21 | - $this->app->bind('PortButler', function () { |
|
| 21 | + $this->app->bind('PortButler', function() { |
|
| 22 | 22 | return $this->app->make(PortButler::class); |
| 23 | 23 | }); |
| 24 | 24 | } |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | public function up() |
| 13 | 13 | { |
| 14 | 14 | // Create table for storing roles |
| 15 | - Schema::create('roles', function (Blueprint $table) { |
|
| 15 | + Schema::create('roles', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('name')->unique(); |
| 18 | 18 | $table->string('display_name')->nullable(); |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | }); |
| 22 | 22 | |
| 23 | 23 | // Create table for associating roles to users (Many-to-Many) |
| 24 | - Schema::create('role_user', function (Blueprint $table) { |
|
| 24 | + Schema::create('role_user', function(Blueprint $table) { |
|
| 25 | 25 | $table->integer('user_id')->unsigned(); |
| 26 | 26 | $table->integer('role_id')->unsigned(); |
| 27 | 27 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | }); |
| 35 | 35 | |
| 36 | 36 | // Create table for storing permissions |
| 37 | - Schema::create('permissions', function (Blueprint $table) { |
|
| 37 | + Schema::create('permissions', function(Blueprint $table) { |
|
| 38 | 38 | $table->increments('id'); |
| 39 | 39 | $table->string('name')->unique(); |
| 40 | 40 | $table->string('display_name')->nullable(); |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | }); |
| 44 | 44 | |
| 45 | 45 | // Create table for associating permissions to roles (Many-to-Many) |
| 46 | - Schema::create('permission_role', function (Blueprint $table) { |
|
| 46 | + Schema::create('permission_role', function(Blueprint $table) { |
|
| 47 | 47 | $table->integer('permission_id')->unsigned(); |
| 48 | 48 | $table->integer('role_id')->unsigned(); |
| 49 | 49 | |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | { |
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | - * @param \App\Containers\SocialAuthentication\UI\API\Requests\AuthenticateOneRequest $request |
|
| 24 | + * @param ApiAuthenticateRequest $request |
|
| 25 | 25 | * @param \App\Containers\SocialAuthentication\Actions\SocialLoginAction $action |
| 26 | 26 | * |
| 27 | 27 | * @return \Dingo\Api\Http\Response |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use App\Containers\SocialAuthentication\Actions\SocialLoginAction; |
| 6 | 6 | use App\Containers\SocialAuthentication\UI\API\Requests\ApiAuthenticateRequest; |
| 7 | -use App\Containers\SocialAuthentication\UI\API\Requests\AuthenticateCallbackRequest; |
|
| 8 | 7 | use App\Containers\SocialAuthentication\UI\API\Requests\AuthenticateOneRequest; |
| 9 | 8 | use App\Containers\User\UI\API\Transformers\UserTransformer; |
| 10 | 9 | use App\Port\Controller\Abstracts\PortApiController; |
@@ -78,10 +78,10 @@ |
||
| 78 | 78 | // find if that user exist in our database |
| 79 | 79 | $user = $this->findSocialUserTask->run($provider, $socialUserProfile->id); |
| 80 | 80 | |
| 81 | - $tokenSecret = isset($socialUserProfile->tokenSecret) ? : null; |
|
| 82 | - $expiresIn = isset($socialUserProfile->expiresIn) ? : null; |
|
| 83 | - $refreshToken = isset($socialUserProfile->refreshToken) ? : null; |
|
| 84 | - $avatar_original = isset($socialUserProfile->avatar_original) ? : null; |
|
| 81 | + $tokenSecret = isset($socialUserProfile->tokenSecret) ?: null; |
|
| 82 | + $expiresIn = isset($socialUserProfile->expiresIn) ?: null; |
|
| 83 | + $refreshToken = isset($socialUserProfile->refreshToken) ?: null; |
|
| 84 | + $avatar_original = isset($socialUserProfile->avatar_original) ?: null; |
|
| 85 | 85 | |
| 86 | 86 | // if user not found then create new one |
| 87 | 87 | if (!$user) { |