@@ -13,6 +13,6 @@ |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | -Route::get('/test', function (Request $request) { |
|
16 | +Route::get('/test', function(Request $request) { |
|
17 | 17 | return response()->json('welcome to the api'); |
18 | 18 | }); |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | |
41 | 41 | public function buildBootstrapArray() |
42 | 42 | { |
43 | - $bootstrap = []; |
|
43 | + $bootstrap = [ ]; |
|
44 | 44 | foreach (\Module::all() as $module) { |
45 | 45 | foreach ($this->moduleEntityDirectories as $key => $directory) { |
46 | 46 | $directory = ucfirst($directory); |
@@ -57,26 +57,26 @@ discard block |
||
57 | 57 | try { |
58 | 58 | $command = new $class(); |
59 | 59 | if ($command instanceof Command) { |
60 | - $bootstrap[$key][] = $class; |
|
60 | + $bootstrap[ $key ][ ] = $class; |
|
61 | 61 | } |
62 | 62 | } catch (\Exception $e) { |
63 | 63 | //If the creation of the class fails it is not a command so skip |
64 | 64 | } |
65 | 65 | break; |
66 | 66 | case 'routes': |
67 | - $bootstrap[$key][] = [$directoryPath.'/'.$fileName, $namespace]; |
|
67 | + $bootstrap[ $key ][ ] = [ $directoryPath.'/'.$fileName, $namespace ]; |
|
68 | 68 | break; |
69 | 69 | case 'configs': |
70 | - $bootstrap[$key][] = [$directoryPath.'/'.$fileName, strtolower($module->getName())]; |
|
70 | + $bootstrap[ $key ][ ] = [ $directoryPath.'/'.$fileName, strtolower($module->getName()) ]; |
|
71 | 71 | break; |
72 | 72 | case 'factories': |
73 | - $bootstrap[$key][] = $directoryPath; |
|
73 | + $bootstrap[ $key ][ ] = $directoryPath; |
|
74 | 74 | break; |
75 | 75 | case 'migrations': |
76 | - $bootstrap[$key][] = $directoryPath; |
|
76 | + $bootstrap[ $key ][ ] = $directoryPath; |
|
77 | 77 | break; |
78 | 78 | case 'seeders': |
79 | - $bootstrap[$key][] = $class; |
|
79 | + $bootstrap[ $key ][ ] = $class; |
|
80 | 80 | break; |
81 | 81 | default: |
82 | 82 | break; |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | |
93 | 93 | private function hasPhpExtension(string $fileName): bool |
94 | 94 | { |
95 | - return strlen($fileName) > 4 && '.php' === ($fileName[-4].$fileName[-3].$fileName[-2].$fileName[-1]); |
|
95 | + return strlen($fileName) > 4 && '.php' === ($fileName[-4 ].$fileName[-3 ].$fileName[-2 ].$fileName[-1 ]); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | private function loadBootstrapFromCache() |
@@ -110,32 +110,32 @@ discard block |
||
110 | 110 | |
111 | 111 | public function getCommands(): array |
112 | 112 | { |
113 | - return $this->loadBootstrapFromCache()['commands'] ?? []; |
|
113 | + return $this->loadBootstrapFromCache()[ 'commands' ] ?? [ ]; |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | public function getRoutes(): array |
117 | 117 | { |
118 | - return $this->loadBootstrapFromCache()['routes'] ?? []; |
|
118 | + return $this->loadBootstrapFromCache()[ 'routes' ] ?? [ ]; |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | public function getConfigs(): array |
122 | 122 | { |
123 | - return $this->loadBootstrapFromCache()['configs'] ?? []; |
|
123 | + return $this->loadBootstrapFromCache()[ 'configs' ] ?? [ ]; |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | public function getFactories(): array |
127 | 127 | { |
128 | - return $this->loadBootstrapFromCache()['factories'] ?? []; |
|
128 | + return $this->loadBootstrapFromCache()[ 'factories' ] ?? [ ]; |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | public function getMigrations(): array |
132 | 132 | { |
133 | - return $this->loadBootstrapFromCache()['migrations'] ?? []; |
|
133 | + return $this->loadBootstrapFromCache()[ 'migrations' ] ?? [ ]; |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | public function getSeeders(): array |
137 | 137 | { |
138 | - return $this->loadBootstrapFromCache()['seeders'] ?? []; |
|
138 | + return $this->loadBootstrapFromCache()[ 'seeders' ] ?? [ ]; |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | public function getCachePath(): string |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | |
35 | 35 | $this->resolver->setDefaultConnection($this->getDatabase()); |
36 | 36 | |
37 | - Model::unguarded(function () { |
|
37 | + Model::unguarded(function() { |
|
38 | 38 | foreach ($this->getSeeders() as $seeder) { |
39 | 39 | $seeder = $this->laravel->make($seeder); |
40 | 40 | $seeder->__invoke(); |
@@ -48,6 +48,6 @@ discard block |
||
48 | 48 | { |
49 | 49 | $this->service = $this->laravel->make(BootstrapRegistrarService::class); |
50 | 50 | |
51 | - return $this->service->getSeeders() ?? []; |
|
51 | + return $this->service->getSeeders() ?? [ ]; |
|
52 | 52 | } |
53 | 53 | } |
@@ -2,7 +2,7 @@ |
||
2 | 2 | |
3 | 3 | use Modules\User\Entities\User; |
4 | 4 | |
5 | -$factory->define(User::class, function (Faker\Generator $faker) { |
|
5 | +$factory->define(User::class, function(Faker\Generator $faker) { |
|
6 | 6 | return [ |
7 | 7 | 'auth0_id' => null, |
8 | 8 | 'name' => $faker->name, |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | | 'Auth0\Login\Auth0Controller@callback' |
38 | 38 | | |
39 | 39 | */ |
40 | - 'redirect_uri' => env('APP_URL') . '/auth0/callback', |
|
40 | + 'redirect_uri' => env('APP_URL').'/auth0/callback', |
|
41 | 41 | |
42 | 42 | /* |
43 | 43 | |-------------------------------------------------------------------------- |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | | This is used to verify the decoded tokens when using RS256 |
60 | 60 | | |
61 | 61 | */ |
62 | - 'authorized_issuers' => [env('AUTH0_DOMAIN')], |
|
62 | + 'authorized_issuers' => [ env('AUTH0_DOMAIN') ], |
|
63 | 63 | |
64 | 64 | /* |
65 | 65 | |-------------------------------------------------------------------------- |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | | Token decoding algorithms supported by your API |
86 | 86 | | |
87 | 87 | */ |
88 | - 'supported_algs' => ['RS256'], |
|
88 | + 'supported_algs' => [ 'RS256' ], |
|
89 | 89 | |
90 | 90 | /* |
91 | 91 | |-------------------------------------------------------------------------- |
@@ -38,14 +38,14 @@ |
||
38 | 38 | $user = $this->auth0Repository->getUserByDecodedJWT($tokenInfo); |
39 | 39 | |
40 | 40 | if (!$user) { |
41 | - return response()->json(['error' => 'Unauthorized user'], 401); |
|
41 | + return response()->json([ 'error' => 'Unauthorized user' ], 401); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | \Auth::login($user); |
45 | 45 | } catch (InvalidTokenException $e) { |
46 | - return response()->json(['error' => "Invalid or no token set"], 401); |
|
46 | + return response()->json([ 'error' => "Invalid or no token set" ], 401); |
|
47 | 47 | } catch (CoreException $e) { |
48 | - return response()->json(['error' => $e->getMessage()], 401); |
|
48 | + return response()->json([ 'error' => $e->getMessage() ], 401); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | return $next($request); |
@@ -52,17 +52,17 @@ discard block |
||
52 | 52 | $apiDomain = strtolower(env('API_URL')); |
53 | 53 | $apiDomain = str_replace('http://', '', $apiDomain); |
54 | 54 | $apiDomain = str_replace('https://', '', $apiDomain); |
55 | - $moduleNamespace = $route[1]; |
|
56 | - $moduleName = explode('\\', $moduleNamespace)[1]; |
|
57 | - $controllerNamespace = $moduleNamespace . '\\' . 'Http\\Controllers'; |
|
58 | - $modelNameSpace = $moduleNamespace . '\\' . 'Entities\\' . $moduleName; |
|
59 | - $filepath = $route[0]; |
|
55 | + $moduleNamespace = $route[ 1 ]; |
|
56 | + $moduleName = explode('\\', $moduleNamespace)[ 1 ]; |
|
57 | + $controllerNamespace = $moduleNamespace.'\\'.'Http\\Controllers'; |
|
58 | + $modelNameSpace = $moduleNamespace.'\\'.'Entities\\'.$moduleName; |
|
59 | + $filepath = $route[ 0 ]; |
|
60 | 60 | Route::group([ |
61 | 61 | 'prefix' => 'v1', |
62 | 62 | 'namespace' => $controllerNamespace, |
63 | 63 | 'domain' => $apiDomain, |
64 | - 'middleware' => ['api'], |
|
65 | - ], function (Router $router) use ($filepath) { |
|
64 | + 'middleware' => [ 'api' ], |
|
65 | + ], function(Router $router) use ($filepath) { |
|
66 | 66 | require $filepath; |
67 | 67 | }); |
68 | 68 | Route::model(strtolower($moduleName), $modelNameSpace); |
@@ -78,10 +78,10 @@ discard block |
||
78 | 78 | { |
79 | 79 | foreach ($this->bootstrapService->getConfigs() as $route) { |
80 | 80 | $this->publishes([ |
81 | - $route[0] => config_path($route[1]), |
|
81 | + $route[ 0 ] => config_path($route[ 1 ]), |
|
82 | 82 | ], 'config'); |
83 | 83 | $this->mergeConfigFrom( |
84 | - $route[0], basename($route[1], '.php') |
|
84 | + $route[ 0 ], basename($route[ 1 ], '.php') |
|
85 | 85 | ); |
86 | 86 | } |
87 | 87 | } |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | { |
122 | 122 | $app = $this->app; |
123 | 123 | $service = $this->bootstrapService; |
124 | - $this->app->extend('command.seed', function () use ($app, $service) { |
|
125 | - return new SeedCommand($app['db'], $service); |
|
124 | + $this->app->extend('command.seed', function() use ($app, $service) { |
|
125 | + return new SeedCommand($app[ 'db' ], $service); |
|
126 | 126 | }); |
127 | 127 | } |
128 | 128 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | |
43 | 43 | public function getUserByUserInfo($userInfo) |
44 | 44 | { |
45 | - return $this->upsertUser($userInfo['profile']); |
|
45 | + return $this->upsertUser($userInfo[ 'profile' ]); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | protected function upsertUser($profile) |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | throw new Exception("Missing token information: Auth0 user id is not set"); |
52 | 52 | |
53 | 53 | $identifier = explode('|', $profile->user_id); |
54 | - $identityProvider = $identifier[0]; |
|
55 | - $id = $identifier[1]; |
|
54 | + $identityProvider = $identifier[ 0 ]; |
|
55 | + $id = $identifier[ 1 ]; |
|
56 | 56 | |
57 | 57 | $user = $this->service->find($id); |
58 | 58 |
@@ -47,8 +47,9 @@ discard block |
||
47 | 47 | |
48 | 48 | protected function upsertUser($profile) |
49 | 49 | { |
50 | - if (!isset($profile->user_id)) |
|
51 | - throw new Exception("Missing token information: Auth0 user id is not set"); |
|
50 | + if (!isset($profile->user_id)) { |
|
51 | + throw new Exception("Missing token information: Auth0 user id is not set"); |
|
52 | + } |
|
52 | 53 | |
53 | 54 | $identifier = explode('|', $profile->user_id); |
54 | 55 | $identityProvider = $identifier[0]; |
@@ -59,8 +60,9 @@ discard block |
||
59 | 60 | if ($user === null || !$this->userEqualsProfile($user, $profile)) { |
60 | 61 | try { |
61 | 62 | |
62 | - if ($user === null) |
|
63 | - $user = new User(); |
|
63 | + if ($user === null) { |
|
64 | + $user = new User(); |
|
65 | + } |
|
64 | 66 | |
65 | 67 | $user->_id = new ObjectId($id); |
66 | 68 | $user->provider = $identityProvider; |
@@ -27,9 +27,9 @@ discard block |
||
27 | 27 | |
28 | 28 | private function getUserTokenData(): \stdClass |
29 | 29 | { |
30 | - return Cache::remember('testing:http_access_token', 60, function () { |
|
30 | + return Cache::remember('testing:http_access_token', 60, function() { |
|
31 | 31 | $httpClient = new Client(); |
32 | - $response = $httpClient->post(config('laravel-auth0.domain') . 'oauth/token', [ |
|
32 | + $response = $httpClient->post(config('laravel-auth0.domain').'oauth/token', [ |
|
33 | 33 | 'form_params' => [ |
34 | 34 | 'grant_type' => 'password', |
35 | 35 | 'client_id' => 'Dik7up1ZsRePpdZNjzrHIAUHe8mCb3RK', |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | private function sendRequest(string $method, string $route, array $payload = array(), $authenticated = true): \Illuminate\Foundation\Testing\TestResponse |
51 | 51 | { |
52 | 52 | return $this->json($method, $route, $payload, $authenticated ? [ |
53 | - "Authorization" => "Bearer " . $this->getUserTokenData()->id_token |
|
54 | - ] : []); |
|
53 | + "Authorization" => "Bearer ".$this->getUserTokenData()->id_token |
|
54 | + ] : [ ]); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | protected function httpNoAuth(string $method, string $route, array $payload = array()) |