fix: use short classname for config()

If FQCN is specified, devs cannot override.
codeigniter4 · Aug 24, 2023 · 9dbb6e5 · 9dbb6e5
1 parent 970c67e
commit 9dbb6e5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/src/Authentication/Authenticators/JWT.php b/src/Authentication/Authenticators/JWT.php
@@ -10,7 +10,6 @@
 use CodeIgniter\Shield\Authentication\AuthenticatorInterface;
 use CodeIgniter\Shield\Authentication\JWTManager;
 use CodeIgniter\Shield\Config\Auth;
-use CodeIgniter\Shield\Config\AuthJWT;
 use CodeIgniter\Shield\Entities\User;
 use CodeIgniter\Shield\Exceptions\RuntimeException;
 use CodeIgniter\Shield\Models\TokenLoginModel;
@@ -61,7 +60,7 @@ public function __construct(UserModel $provider)
      */
     public function attempt(array $credentials): Result
     {
-        $config = config(AuthJWT::class);
+        $config = config('AuthJWT');
 
         /** @var IncomingRequest $request */
         $request = service('request');
@@ -142,7 +141,7 @@ public function check(array $credentials): Result
                 'success' => false,
                 'reason'  => lang(
                     'Auth.noToken',
-                    [config(AuthJWT::class)->authenticatorHeader]
+                    [config('AuthJWT')->authenticatorHeader]
                 ),
             ]);
         }
@@ -196,7 +195,7 @@ public function loggedIn(): bool
         /** @var IncomingRequest $request */
         $request = service('request');
 
-        $config = config(AuthJWT::class);
+        $config = config('AuthJWT');
 
         return $this->attempt([
             'token' => $request->getHeaderLine($config->authenticatorHeader),

diff --git a/src/Authentication/JWT/Adapters/FirebaseAdapter.php b/src/Authentication/JWT/Adapters/FirebaseAdapter.php
@@ -6,7 +6,6 @@
 
 use CodeIgniter\Shield\Authentication\JWT\Exceptions\InvalidTokenException;
 use CodeIgniter\Shield\Authentication\JWT\JWSAdapterInterface;
-use CodeIgniter\Shield\Config\AuthJWT;
 use CodeIgniter\Shield\Exceptions\InvalidArgumentException as ShieldInvalidArgumentException;
 use CodeIgniter\Shield\Exceptions\LogicException as ShieldLogicException;
 use DomainException;
@@ -79,7 +78,7 @@ public function decode(string $encodedToken, $keyset): stdClass
      */
     private function createKeysForDecode($keyset)
     {
-        $config = config(AuthJWT::class);
+        $config = config('AuthJWT');
 
         $configKeys = $config->keys[$keyset];
 
@@ -127,7 +126,7 @@ public function encode(array $payload, $keyset, ?array $headers = null): string
      */
     private function createKeysForEncode($keyset): array
     {
-        $config = config(AuthJWT::class);
+        $config = config('AuthJWT');
 
         if (isset($config->keys[$keyset][0]['secret'])) {
             $key = $config->keys[$keyset][0]['secret'];

diff --git a/src/Authentication/JWT/JWSEncoder.php b/src/Authentication/JWT/JWSEncoder.php
@@ -6,7 +6,6 @@
 
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Shield\Authentication\JWT\Adapters\FirebaseAdapter;
-use CodeIgniter\Shield\Config\AuthJWT;
 
 class JWSEncoder
 {
@@ -39,7 +38,7 @@ public function encode(
             'Cannot pass $claims[\'exp\'] and $ttl at the same time.'
         );
 
-        $config = config(AuthJWT::class);
+        $config = config('AuthJWT');
 
         $payload = array_merge(
             $config->defaultClaims,

diff --git a/src/Filters/JWTAuth.php b/src/Filters/JWTAuth.php
@@ -10,7 +10,6 @@
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Shield\Authentication\Authenticators\JWT;
-use CodeIgniter\Shield\Config\AuthJWT;
 use Config\Services;
 
 /**
@@ -59,7 +58,7 @@ private function getTokenFromHeader(RequestInterface $request): string
     {
         assert($request instanceof IncomingRequest);
 
-        $config = config(AuthJWT::class);
+        $config = config('AuthJWT');
 
         $tokenHeader = $request->getHeaderLine(
             $config->authenticatorHeader ?? 'Authorization'

diff --git a/src/Models/BaseModel.php b/src/Models/BaseModel.php
@@ -20,7 +20,7 @@ abstract class BaseModel extends Model
 
     public function __construct()
     {
-        $this->authConfig = config(Auth::class);
+        $this->authConfig = config('Auth');
 
         if ($this->authConfig->DBGroup !== null) {
             $this->DBGroup = $this->authConfig->DBGroup;