@@ -4,4 +4,4 @@ |
||
| 4 | 4 | use Illuminate\Support\Facades\Route; |
| 5 | 5 | |
| 6 | 6 | Route::get(rtrim(Config::get('clickup.route.sso', '/clickup/sso'), '/') . '/{user}', 'ClickUpController@processCode') |
| 7 | - ->name('clickup.sso.redirect_url'); |
|
| 7 | + ->name('clickup.sso.redirect_url'); |
|
@@ -3,5 +3,5 @@ |
||
| 3 | 3 | use Illuminate\Support\Facades\Config; |
| 4 | 4 | use Illuminate\Support\Facades\Route; |
| 5 | 5 | |
| 6 | -Route::get(rtrim(Config::get('clickup.route.sso', '/clickup/sso'), '/') . '/{user}', 'ClickUpController@processCode') |
|
| 6 | +Route::get(rtrim(Config::get('clickup.route.sso', '/clickup/sso'), '/').'/{user}', 'ClickUpController@processCode') |
|
| 7 | 7 | ->name('clickup.sso.redirect_url'); |
@@ -17,8 +17,8 @@ |
||
| 17 | 17 | 'users', |
| 18 | 18 | function (Blueprint $table) { |
| 19 | 19 | $table->string('clickup_token', 1024) |
| 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('clickup_token', 1024) |
| 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('clickup_token'); |
| 37 | 37 | } |
| 38 | 38 | ); |
@@ -36,12 +36,12 @@ discard block |
||
| 36 | 36 | { |
| 37 | 37 | if (is_null($this->builder)) { |
| 38 | 38 | $this->builder = Container::getInstance() |
| 39 | - ->make(Builder::class) |
|
| 40 | - ->setClient( |
|
| 41 | - Container::getInstance() |
|
| 42 | - ->make(ClickUp::class) |
|
| 43 | - ->setToken($this->clickup_token) |
|
| 44 | - ); |
|
| 39 | + ->make(Builder::class) |
|
| 40 | + ->setClient( |
|
| 41 | + Container::getInstance() |
|
| 42 | + ->make(ClickUp::class) |
|
| 43 | + ->setToken($this->clickup_token) |
|
| 44 | + ); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | return $this->builder; |
@@ -110,6 +110,6 @@ discard block |
||
| 110 | 110 | $this->attributes['clickup_token'] = is_null($clickup_token) |
| 111 | 111 | ? null |
| 112 | 112 | : $this->resolveEncrypter() |
| 113 | - ->encrypt($clickup_token); |
|
| 113 | + ->encrypt($clickup_token); |
|
| 114 | 114 | } |
| 115 | 115 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | */ |
| 88 | 88 | public function oauthRequestTokenUsingCode($code): string |
| 89 | 89 | { |
| 90 | - $path = 'oauth/token?' . http_build_query( |
|
| 90 | + $path = 'oauth/token?'.http_build_query( |
|
| 91 | 91 | [ |
| 92 | 92 | 'client_id' => $this->configs['oauth']['id'], |
| 93 | 93 | 'client_secret' => $this->configs['oauth']['secret'], |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | public function oauthUri($url): string |
| 129 | 129 | { |
| 130 | 130 | return $this->uri( |
| 131 | - '?' . http_build_query( |
|
| 131 | + '?'.http_build_query( |
|
| 132 | 132 | [ |
| 133 | 133 | 'client_id' => $this->configs['oauth']['id'], |
| 134 | 134 | 'redirect_uri' => $url, |
@@ -254,6 +254,6 @@ discard block |
||
| 254 | 254 | { |
| 255 | 255 | $url = $url ?? $this->configs['url'] ?? 'https://api.clickup.com/api/v2'; |
| 256 | 256 | |
| 257 | - return rtrim($url, '/') . (Str::startsWith($path, '?') ? null : '/') . ltrim($path, '/'); |
|
| 257 | + return rtrim($url, '/').(Str::startsWith($path, '?') ? null : '/').ltrim($path, '/'); |
|
| 258 | 258 | } |
| 259 | 259 | } |
@@ -106,8 +106,8 @@ discard block |
||
| 106 | 106 | ], |
| 107 | 107 | ] |
| 108 | 108 | ) |
| 109 | - ->getBody() |
|
| 110 | - ->getContents(), |
|
| 109 | + ->getBody() |
|
| 110 | + ->getContents(), |
|
| 111 | 111 | true |
| 112 | 112 | )['access_token']; |
| 113 | 113 | } catch (GuzzleException $e) { |
@@ -198,8 +198,8 @@ discard block |
||
| 198 | 198 | 'body' => json_encode($data ?? []), |
| 199 | 199 | ] |
| 200 | 200 | ) |
| 201 | - ->getBody() |
|
| 202 | - ->getContents(), |
|
| 201 | + ->getBody() |
|
| 202 | + ->getContents(), |
|
| 203 | 203 | true |
| 204 | 204 | ); |
| 205 | 205 | } catch (GuzzleException $e) { |