Skip to content

Commit 9dbb6e5

Browse files
committed
fix: use short classname for config()
If FQCN is specified, devs cannot override.
1 parent 970c67e commit 9dbb6e5

File tree

5 files changed

+8
-12
lines changed

5 files changed

+8
-12
lines changed

src/Authentication/Authenticators/JWT.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use CodeIgniter\Shield\Authentication\AuthenticatorInterface;
1111
use CodeIgniter\Shield\Authentication\JWTManager;
1212
use CodeIgniter\Shield\Config\Auth;
13-
use CodeIgniter\Shield\Config\AuthJWT;
1413
use CodeIgniter\Shield\Entities\User;
1514
use CodeIgniter\Shield\Exceptions\RuntimeException;
1615
use CodeIgniter\Shield\Models\TokenLoginModel;
@@ -61,7 +60,7 @@ public function __construct(UserModel $provider)
6160
*/
6261
public function attempt(array $credentials): Result
6362
{
64-
$config = config(AuthJWT::class);
63+
$config = config('AuthJWT');
6564

6665
/** @var IncomingRequest $request */
6766
$request = service('request');
@@ -142,7 +141,7 @@ public function check(array $credentials): Result
142141
'success' => false,
143142
'reason' => lang(
144143
'Auth.noToken',
145-
[config(AuthJWT::class)->authenticatorHeader]
144+
[config('AuthJWT')->authenticatorHeader]
146145
),
147146
]);
148147
}
@@ -196,7 +195,7 @@ public function loggedIn(): bool
196195
/** @var IncomingRequest $request */
197196
$request = service('request');
198197

199-
$config = config(AuthJWT::class);
198+
$config = config('AuthJWT');
200199

201200
return $this->attempt([
202201
'token' => $request->getHeaderLine($config->authenticatorHeader),

src/Authentication/JWT/Adapters/FirebaseAdapter.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use CodeIgniter\Shield\Authentication\JWT\Exceptions\InvalidTokenException;
88
use CodeIgniter\Shield\Authentication\JWT\JWSAdapterInterface;
9-
use CodeIgniter\Shield\Config\AuthJWT;
109
use CodeIgniter\Shield\Exceptions\InvalidArgumentException as ShieldInvalidArgumentException;
1110
use CodeIgniter\Shield\Exceptions\LogicException as ShieldLogicException;
1211
use DomainException;
@@ -79,7 +78,7 @@ public function decode(string $encodedToken, $keyset): stdClass
7978
*/
8079
private function createKeysForDecode($keyset)
8180
{
82-
$config = config(AuthJWT::class);
81+
$config = config('AuthJWT');
8382

8483
$configKeys = $config->keys[$keyset];
8584

@@ -127,7 +126,7 @@ public function encode(array $payload, $keyset, ?array $headers = null): string
127126
*/
128127
private function createKeysForEncode($keyset): array
129128
{
130-
$config = config(AuthJWT::class);
129+
$config = config('AuthJWT');
131130

132131
if (isset($config->keys[$keyset][0]['secret'])) {
133132
$key = $config->keys[$keyset][0]['secret'];

src/Authentication/JWT/JWSEncoder.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use CodeIgniter\I18n\Time;
88
use CodeIgniter\Shield\Authentication\JWT\Adapters\FirebaseAdapter;
9-
use CodeIgniter\Shield\Config\AuthJWT;
109

1110
class JWSEncoder
1211
{
@@ -39,7 +38,7 @@ public function encode(
3938
'Cannot pass $claims[\'exp\'] and $ttl at the same time.'
4039
);
4140

42-
$config = config(AuthJWT::class);
41+
$config = config('AuthJWT');
4342

4443
$payload = array_merge(
4544
$config->defaultClaims,

src/Filters/JWTAuth.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use CodeIgniter\HTTP\Response;
1111
use CodeIgniter\HTTP\ResponseInterface;
1212
use CodeIgniter\Shield\Authentication\Authenticators\JWT;
13-
use CodeIgniter\Shield\Config\AuthJWT;
1413
use Config\Services;
1514

1615
/**
@@ -59,7 +58,7 @@ private function getTokenFromHeader(RequestInterface $request): string
5958
{
6059
assert($request instanceof IncomingRequest);
6160

62-
$config = config(AuthJWT::class);
61+
$config = config('AuthJWT');
6362

6463
$tokenHeader = $request->getHeaderLine(
6564
$config->authenticatorHeader ?? 'Authorization'

src/Models/BaseModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ abstract class BaseModel extends Model
2020

2121
public function __construct()
2222
{
23-
$this->authConfig = config(Auth::class);
23+
$this->authConfig = config('Auth');
2424

2525
if ($this->authConfig->DBGroup !== null) {
2626
$this->DBGroup = $this->authConfig->DBGroup;

0 commit comments

Comments
 (0)