@@ -4,4 +4,4 @@ |
||
4 | 4 | use Illuminate\Support\Facades\Route; |
5 | 5 | |
6 | 6 | Route::get(Config::get('formio.route.uri', 'api/formio/jwt'), 'FormioController@jwt') |
7 | - ->name(Config::get('formio.route.name', 'formio.jwt')); |
|
7 | + ->name(Config::get('formio.route.name', 'formio.jwt')); |
@@ -17,8 +17,8 @@ |
||
17 | 17 | 'users', |
18 | 18 | function (Blueprint $table) { |
19 | 19 | $table->string('formio_password') |
20 | - ->after('password') |
|
21 | - ->nullable(); |
|
20 | + ->after('password') |
|
21 | + ->nullable(); |
|
22 | 22 | } |
23 | 23 | ); |
24 | 24 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | { |
16 | 16 | Schema::table( |
17 | 17 | 'users', |
18 | - function (Blueprint $table) { |
|
18 | + function(Blueprint $table) { |
|
19 | 19 | $table->string('formio_password') |
20 | 20 | ->after('password') |
21 | 21 | ->nullable(); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | { |
33 | 33 | Schema::table( |
34 | 34 | 'users', |
35 | - function (Blueprint $table) { |
|
35 | + function(Blueprint $table) { |
|
36 | 36 | $table->dropColumn('formio_password'); |
37 | 37 | } |
38 | 38 | ); |
@@ -164,11 +164,11 @@ |
||
164 | 164 | { |
165 | 165 | // TODO: Add some error checking to user parsing |
166 | 166 | $this->token = $this->token->setUser(json_decode($response->getBody(), true)) |
167 | - ->setJwt( |
|
168 | - $response->getHeader('x-jwt-token')[0], |
|
169 | - $this->configs['jwt']['secret'], |
|
170 | - $this->configs['jwt']['algorithm'] |
|
171 | - ); |
|
167 | + ->setJwt( |
|
168 | + $response->getHeader('x-jwt-token')[0], |
|
169 | + $this->configs['jwt']['secret'], |
|
170 | + $this->configs['jwt']['algorithm'] |
|
171 | + ); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | /** |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | } |
190 | 190 | |
191 | 191 | if ($this->token->expired()) { |
192 | - throw new TokenException('Token expired ' . $this->token->expires_at->diffForHumans()); |
|
192 | + throw new TokenException('Token expired '.$this->token->expires_at->diffForHumans()); |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | try { |
@@ -270,6 +270,6 @@ discard block |
||
270 | 270 | */ |
271 | 271 | public function uri($path = null) |
272 | 272 | { |
273 | - return rtrim($this->configs['url'], '/') . '/' . ltrim($path, '/'); |
|
273 | + return rtrim($this->configs['url'], '/').'/'.ltrim($path, '/'); |
|
274 | 274 | } |
275 | 275 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | |
73 | 73 | $resourceIds = function () use ($formio) { |
74 | 74 | $id = $formio->login() |
75 | - ->request('form?name=user')[0]['_id']; |
|
75 | + ->request('form?name=user')[0]['_id']; |
|
76 | 76 | |
77 | 77 | $formio->logout(); |
78 | 78 | |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | Cache::remember( |
87 | 87 | 'formio.id', |
88 | 88 | Carbon::now() |
89 | - ->addDay(), |
|
89 | + ->addDay(), |
|
90 | 90 | $resourceIds |
91 | 91 | ) |
92 | 92 | ); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | |
97 | 97 | $roleIds = function () use ($formio) { |
98 | 98 | $roles = (array)$formio->login() |
99 | - ->request('role?title=Authenticated')[0]['_id']; |
|
99 | + ->request('role?title=Authenticated')[0]['_id']; |
|
100 | 100 | |
101 | 101 | $formio->logout(); |
102 | 102 | |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | Cache::remember( |
111 | 111 | 'formio.user.roles', |
112 | 112 | Carbon::now() |
113 | - ->addDay(), |
|
113 | + ->addDay(), |
|
114 | 114 | $roleIds |
115 | 115 | ) |
116 | 116 | ); |
@@ -63,10 +63,10 @@ discard block |
||
63 | 63 | { |
64 | 64 | $this->app->bind( |
65 | 65 | Formio::class, |
66 | - function (Application $app) { |
|
66 | + function(Application $app) { |
|
67 | 67 | $formio = new Formio(Config::get('formio'), $app->make(Guzzle::class)); |
68 | 68 | |
69 | - $resourceIds = function () use ($formio) { |
|
69 | + $resourceIds = function() use ($formio) { |
|
70 | 70 | $id = $formio->login() |
71 | 71 | ->request('form?name=user')[0]['_id']; |
72 | 72 | |
@@ -90,8 +90,8 @@ discard block |
||
90 | 90 | $formio->setConfigs(Config::get('formio')); |
91 | 91 | } |
92 | 92 | |
93 | - $roleIds = function () use ($formio) { |
|
94 | - $roles = (array)$formio->login() |
|
93 | + $roleIds = function() use ($formio) { |
|
94 | + $roles = (array) $formio->login() |
|
95 | 95 | ->request('role?title=Authenticated')[0]['_id']; |
96 | 96 | |
97 | 97 | $formio->logout(); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | */ |
33 | 33 | public function register() |
34 | 34 | { |
35 | - $this->mergeConfigFrom(__DIR__ . '/../../config/formio.php', 'formio'); |
|
35 | + $this->mergeConfigFrom(__DIR__.'/../../config/formio.php', 'formio'); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | /** |
@@ -43,18 +43,18 @@ discard block |
||
43 | 43 | protected function registerPublishes() |
44 | 44 | { |
45 | 45 | if ($this->app->runningInConsole()) { |
46 | - $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations'); |
|
46 | + $this->loadMigrationsFrom(__DIR__.'/../../database/migrations'); |
|
47 | 47 | |
48 | 48 | $this->publishes( |
49 | 49 | [ |
50 | - __DIR__ . '/../../config/formio.php' => config_path('formio.php'), |
|
50 | + __DIR__.'/../../config/formio.php' => config_path('formio.php'), |
|
51 | 51 | ], |
52 | 52 | 'formio-config' |
53 | 53 | ); |
54 | 54 | |
55 | 55 | $this->publishes( |
56 | 56 | [ |
57 | - __DIR__ . '/../../database/migrations' => database_path('migrations'), |
|
57 | + __DIR__.'/../../database/migrations' => database_path('migrations'), |
|
58 | 58 | ], |
59 | 59 | 'formio-migrations' |
60 | 60 | ); |
@@ -72,8 +72,8 @@ discard block |
||
72 | 72 | 'namespace' => 'Spinen\Formio\Http\Controllers', |
73 | 73 | 'middleware' => Config::get('formio.route.middleware', ['api', 'auth:api']), |
74 | 74 | ], |
75 | - function () { |
|
76 | - $this->loadRoutesFrom(realpath(__DIR__ . '/../../routes/web.php')); |
|
75 | + function() { |
|
76 | + $this->loadRoutesFrom(realpath(__DIR__.'/../../routes/web.php')); |
|
77 | 77 | } |
78 | 78 | ); |
79 | 79 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | return is_null($this->attributes['formio_password'] ?? null) |
26 | 26 | ? null |
27 | 27 | : $this->resolveEncrypter() |
28 | - ->decrypt($this->attributes['formio_password']); |
|
28 | + ->decrypt($this->attributes['formio_password']); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | /** |
@@ -90,6 +90,6 @@ discard block |
||
90 | 90 | $this->attributes['formio_password'] = is_null($formio_password) |
91 | 91 | ? null |
92 | 92 | : $this->resolveEncrypter() |
93 | - ->encrypt($formio_password); |
|
93 | + ->encrypt($formio_password); |
|
94 | 94 | } |
95 | 95 | } |