@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function run($user, $roles) |
| 47 | 47 | { |
| 48 | - if(!$user instanceof User){ |
|
| 48 | + if (!$user instanceof User) { |
|
| 49 | 49 | $user = $this->findUserByIdTask->run($user); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | $this->assignRole($user, $role); |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - }else{ |
|
| 57 | + } else { |
|
| 58 | 58 | $this->assignRole($user, $roles); |
| 59 | 59 | } |
| 60 | 60 | |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | $this->assignRole($user, $role); |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - }else{ |
|
| 57 | + } else{ |
|
| 58 | 58 | $this->assignRole($user, $roles); |
| 59 | 59 | } |
| 60 | 60 | |
@@ -42,13 +42,13 @@ |
||
| 42 | 42 | { |
| 43 | 43 | $role = $this->getRoleAction->run($roleName); |
| 44 | 44 | |
| 45 | - if(is_array($permissionNames)){ |
|
| 45 | + if (is_array($permissionNames)) { |
|
| 46 | 46 | |
| 47 | - foreach ($permissionNames as $permissionName){ |
|
| 47 | + foreach ($permissionNames as $permissionName) { |
|
| 48 | 48 | $role->givePermissionTo($permissionName); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - }else{ |
|
| 51 | + } else { |
|
| 52 | 52 | $role->givePermissionTo($permissionNames); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | $role->givePermissionTo($permissionName); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - }else{ |
|
| 51 | + } else{ |
|
| 52 | 52 | $role->givePermissionTo($permissionNames); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | { |
| 48 | 48 | $user = $this->webLoginTask->run($email, $password, $remember); |
| 49 | 49 | |
| 50 | - if($user){ |
|
| 50 | + if ($user) { |
|
| 51 | 51 | $this->isUserAdminTask->run($user); |
| 52 | 52 | } |
| 53 | 53 | |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Containers\Authorization\UI\API\Tests\Functional; |
| 4 | 4 | |
| 5 | -use App\Containers\Authorization\Models\User; |
|
| 6 | 5 | use App\Port\Tests\PHPUnit\Abstracts\TestCase; |
| 7 | 6 | |
| 8 | 7 | /** |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use App\Containers\Stripe\Models\StripeAccount; |
| 7 | 7 | use App\Containers\User\Models\User; |
| 8 | 8 | use App\Port\Task\Abstracts\Task; |
| 9 | -use Auth; |
|
| 10 | 9 | |
| 11 | 10 | /** |
| 12 | 11 | * Class CreateStripeAccountObjectTask. |
@@ -4,9 +4,7 @@ |
||
| 4 | 4 | |
| 5 | 5 | use App; |
| 6 | 6 | use App\Port\Foundation\Portals\Facade\PortButler; |
| 7 | -use DB; |
|
| 8 | 7 | use File; |
| 9 | -use Log; |
|
| 10 | 8 | |
| 11 | 9 | /** |
| 12 | 10 | * Class ProvidersLoaderTrait. |
@@ -44,6 +44,9 @@ |
||
| 44 | 44 | |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | + /** |
|
| 48 | + * @param string $directory |
|
| 49 | + */ |
|
| 47 | 50 | private function loadViews($directory) |
| 48 | 51 | { |
| 49 | 52 | View::addLocation($directory); |
@@ -4,10 +4,8 @@ |
||
| 4 | 4 | |
| 5 | 5 | use App; |
| 6 | 6 | use App\Port\Foundation\Portals\Facade\PortButler; |
| 7 | -use DB; |
|
| 8 | 7 | use File; |
| 9 | 8 | use Illuminate\Support\Facades\View; |
| 10 | -use Log; |
|
| 11 | 9 | |
| 12 | 10 | /** |
| 13 | 11 | * Class ViewsLoaderTrait. |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | // TODO: these needs to be separated into multiple routes files |
| 3 | -$router->group(['domain' => 'admin.'. env('APP_URL')], function ($router) { |
|
| 3 | +$router->group(['domain' => 'admin.' . env('APP_URL')], function($router) { |
|
| 4 | 4 | |
| 5 | 5 | $router->get('/', [ |
| 6 | 6 | 'uses' => 'Controller@showLoginPage', |
@@ -102,10 +102,10 @@ |
||
| 102 | 102 | |
| 103 | 103 | // checking if some data are available in the response |
| 104 | 104 | // (these lines are written to make this function compatible with multiple providers) |
| 105 | - $tokenSecret = isset($socialUserProfile->tokenSecret) ? : null; |
|
| 106 | - $expiresIn = isset($socialUserProfile->expiresIn) ? : null; |
|
| 107 | - $refreshToken = isset($socialUserProfile->refreshToken) ? : null; |
|
| 108 | - $avatar_original = isset($socialUserProfile->avatar_original) ? : null; |
|
| 105 | + $tokenSecret = isset($socialUserProfile->tokenSecret) ?: null; |
|
| 106 | + $expiresIn = isset($socialUserProfile->expiresIn) ?: null; |
|
| 107 | + $refreshToken = isset($socialUserProfile->refreshToken) ?: null; |
|
| 108 | + $avatar_original = isset($socialUserProfile->avatar_original) ?: null; |
|
| 109 | 109 | |
| 110 | 110 | // check if the social ID exist on any of our users, and get that user in case it was found |
| 111 | 111 | $socialUser = $this->findSocialUserTask->run($provider, $socialUserProfile->id); |