Skip to content
This repository was archived by the owner on Nov 26, 2023. It is now read-only.

Commit e2e5b6e

Browse files
committed
Fixed code-style issues
1 parent 94d14c4 commit e2e5b6e

File tree

8 files changed

+15
-18
lines changed

8 files changed

+15
-18
lines changed

database/migrations/2017_08_09_161334_create_tenant_table.php renamed to database/migrations/2017_08_09_000000_create_tenant_table.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Support\Facades\Schema;
45

56
class CreateTenantTable extends Migration
67
{

src/Http/Controllers/SampleController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace AtlassianConnectCore\Http\Controllers;
44

5-
use App\Http\Controllers\Controller;
5+
use Illuminate\Routing\Controller;
66

77
/**
88
* Class SampleController

src/Http/Controllers/TenantController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace AtlassianConnectCore\Http\Controllers;
44

5-
use App\Http\Controllers\Controller;
5+
use Illuminate\Routing\Controller;
66
use AtlassianConnectCore\Facades\Descriptor;
77
use AtlassianConnectCore\Services\TenantService;
88

src/Http/Middleware/JWTAuth.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
namespace AtlassianConnectCore\Http\Middleware;
44

5-
use AtlassianConnectCore\Helpers\JWTHelper;
65
use AtlassianConnectCore\Services\TenantService;
6+
use Illuminate\Support\Facades\Auth;
77

88
/**
99
* Class JWTAuth
1010
*
11-
* @package App\Http\Middleware
11+
* @package AtlassianConnectCore\Http\Middleware
1212
*/
1313
class JWTAuth
1414
{
@@ -50,7 +50,7 @@ public function handle($request, \Closure $next)
5050
);
5151
}
5252

53-
$jwt = JWTHelper::create(
53+
$jwt = \AtlassianConnectCore\Helpers\JWTHelper::create(
5454
$request->url(),
5555
$request->method(),
5656
$tenant->client_key,
@@ -61,7 +61,7 @@ public function handle($request, \Closure $next)
6161
}
6262

6363
// Authenticate user
64-
if(!\Auth::attempt()) {
64+
if(!Auth::attempt()) {
6565
throw new \Illuminate\Validation\UnauthorizedException();
6666
}
6767

src/JWTGuard.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,17 @@
22

33
namespace AtlassianConnectCore;
44

5-
use AtlassianConnectCore\Helpers\JWTHelper;
65
use Illuminate\Auth\GuardHelpers;
7-
use Illuminate\Auth\Recaller;
86
use Illuminate\Contracts\Auth\Guard;
97
use Illuminate\Contracts\Auth\UserProvider;
10-
use Illuminate\Http\Request;
118
use Illuminate\Contracts\Session\Session;
12-
use Illuminate\Support\Str;
139
use Illuminate\Contracts\Cookie\QueueingFactory as CookieJar;
1410
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
1511

1612
/**
1713
* Class JWTGuard
1814
*
19-
* @package App\Providers\Guards
15+
* @package AtlassianConnectCore
2016
*/
2117
class JWTGuard implements Guard
2218
{
@@ -25,7 +21,7 @@ class JWTGuard implements Guard
2521
/**
2622
* The request instance.
2723
*
28-
* @var Request
24+
* @var \Illuminate\Http\Request
2925
*/
3026
protected $request;
3127

@@ -155,7 +151,7 @@ public function validate(array $credentials = [])
155151
*/
156152
protected function getTokenKey($token)
157153
{
158-
$decoded = JWTHelper::decode($token);
154+
$decoded = \AtlassianConnectCore\Helpers\JWTHelper::decode($token);
159155

160156
return array_get($decoded, 'body.iss');
161157
}
@@ -214,7 +210,7 @@ public function getName()
214210
*/
215211
protected function cycleRememberToken(AuthenticatableContract $user)
216212
{
217-
$user->setRememberToken($token = Str::random(60));
213+
$user->setRememberToken($token = str_random(60));
218214

219215
$this->provider->updateRememberToken($user, $token);
220216
}
@@ -305,7 +301,7 @@ protected function recaller()
305301
}
306302

307303
if ($recaller = $this->request->cookies->get($this->getRecallerName())) {
308-
return new Recaller($recaller);
304+
return new \Illuminate\Auth\Recaller($recaller);
309305
}
310306
}
311307

src/Listeners/CreateOrUpdateTenant.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/**
88
* Class CreateRepositoryHook
99
*
10-
* @package App\Listeners
10+
* @package AtlassianConnectCore\Listeners
1111
*/
1212
class CreateOrUpdateTenant
1313
{

src/Listeners/DeleteTenant.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/**
88
* Class UpdateTenantState
99
*
10-
* @package App\Listeners
10+
* @package AtlassianConnectCore\Listeners
1111
*/
1212
class DeleteTenant
1313
{

src/Listeners/UpdateTenantState.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* Class UpdateTenantState
1313
*
14-
* @package App\Listeners
14+
* @package AtlassianConnectCore\Listeners
1515
*/
1616
class UpdateTenantState
1717
{

0 commit comments

Comments
 (0)