Refactored + back to 100% coverage

Author: mariusjp

composer.json

@@ -2,7 +2,7 @@
     "name": "coddin-web/oidc-client-laravel-wrapper",
     "description": "A Laravel wrapper of jumbojett's OpenID Connect Client",
     "type": "library",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
@@ -41,12 +41,12 @@
         }
     ],
     "scripts": {
-        "phpcs": "phpcs --standard=./phpcs_codestyle.xml -n src",
-        "phpcs-fix": "phpcbf --standard=./phpcs_codestyle.xml -n src",
+        "phpcs": "phpcs --standard=./phpcs_codestyle.xml -n src tests",
+        "phpcs-fix": "phpcbf --standard=./phpcs_codestyle.xml -n src tests",
         "phpstan": "phpstan analyse --memory-limit=2G",
         "phpunit": "vendor/bin/phpunit -c phpunit.xml.dist",
         "phpunitwcov": "XDEBUG_MODE=coverage vendor/bin/phpunit -c phpunit.xml.dist --coverage-html reports/ --coverage-clover coverage/clover.xml",
-        "phpcoverage": "coverage-check coverage/clover.xml 63",
+        "phpcoverage": "coverage-check coverage/clover.xml 100",
         "checkup": [
             "@phpcs",
             "@phpstan",

config/oidc.php

@@ -10,6 +10,10 @@
         'secret' => env('OIDC_CLIENT_SECRET'),
         'use_pkce' => false,
         'redirect_url' => '/',
+        'scopes' => [
+            'profile',
+            'email',
+        ],
     ],
     'private_key' => [
         'base64' => env('OIDC_BASE64_PRIVATE_KEY'),

src/Builder/OpenIDConnectClientBuilder.php

@@ -41,6 +41,8 @@ public function execute(): OpenIDConnectClient
             url: rtrim($appUrl, '/') . $this->configRepository->getAsString('oidc.client.redirect_url'),
         );
 
+        $openIDClient->addScope($this->configRepository->getAsArray('oidc.client.scopes'));
+
         return $openIDClient;
     }
 

src/Event/UserAuthorizedEvent.php

@@ -17,16 +17,25 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
     public function getUuid(): string
     {
         return $this->uuid;
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
     public function getName(): string
     {
         return $this->name;
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
     public function getEmail(): string
     {
         return $this->email;

src/Helper/ConfigRepository.php

@@ -40,4 +40,19 @@ public function getAsBool(string $key): bool
 
         return $value;
     }
+
+    /**
+     * @return array<mixed, mixed>
+     * @throws ConfigRepositoryException
+     */
+    public function getAsArray(string $key): array
+    {
+        $value = $this->configRepository->get($key);
+
+        if (!is_array($value)) {
+            throw ConfigRepositoryException::notAnArray();
+        }
+
+        return $value;
+    }
 }

src/Helper/ConfigRepositoryException.php

@@ -8,11 +8,16 @@ final class ConfigRepositoryException extends \Exception
 {
     public static function notAString(): self
     {
-        return new self('The config value is not a string');
+        return new self('The config value is not a string while it was expected to be');
     }
 
     public static function notABool(): self
     {
-        return new self('The config value is not a bool');
+        return new self('The config value is not a bool while it was expected to be');
+    }
+
+    public static function notAnArray(): self
+    {
+        return new self('The config value is not an array while it was expected to be');
     }
 }

src/Http/Middleware/OpenIDConnectAuthenticated.php

@@ -52,7 +52,7 @@ public function handle(Request $request, \Closure $next): mixed
             );
 
             $userUuid = $token->claims()->get('sub');
-            $userName = $token->claims()->get('name');
+            $userName = $token->claims()->get('nickname');
             $userEmail = $token->claims()->get('email');
 
             UserAuthorizedEvent::dispatch(
@@ -86,6 +86,12 @@ private function handleExistingToken(
         Request $request,
         \Closure $next,
     ): mixed {
+        if ($token->isExpired(new \DateTimeImmutable())) {
+            $this->tokenStorageAdaptor->forget();
+
+            return $this->responseFactory->redirectTo($request->getPathInfo());
+        }
+
         try {
             $openIDClient = $this->openIDConnectClientBuilder->execute();
             $stillActiveResponse = $openIDClient->introspectToken(
@@ -96,7 +102,7 @@ private function handleExistingToken(
             throw new HttpException(Response::HTTP_INTERNAL_SERVER_ERROR);
         }
 
-        if (!is_object($stillActiveResponse)) {
+        if (!\is_object($stillActiveResponse)) {
             $this->tokenStorageAdaptor->forget();
 
             return $this->responseFactory->redirectTo($request->getPathInfo());