Testes para OidcAuthEventHandler.php. Ainda com erros.

Author: fernando-scolari-bvc

config/module.config.php

@@ -1,14 +1,15 @@
 <?php
 
-use Zend\Router\Http\Literal;
+use Zend\Mvc\OIDC\Factory\OidcAuthEventListenerFactory;
+use Zend\Mvc\OIDC\Listener\OidcAuthListener;
 
 return [
     'listeners' => [
-        "Zend\Mvc\OIDC\Listener\OidcAuthListener"
+        OidcAuthListener::class
     ],
     'service_manager' => [
         'factories' => [
-            "Zend\Mvc\OIDC\Listener\OidcAuthListener" => \Zend\Mvc\OIDC\Factory\OidcAuthEventListenerFactory::class
+            OidcAuthListener::class => OidcAuthEventListenerFactory::class
         ]
     ]
 ];

src/Auth/Authorizator.php

@@ -6,6 +6,7 @@
 use Exception;
 use Lcobucci\JWT\Claim;
 use Lcobucci\JWT\Parser;
+use Lcobucci\JWT\Signer\Key;
 use Lcobucci\JWT\Signer\Rsa\Sha256;
 use Lcobucci\JWT\ValidationData;
 use Zend\Mvc\OIDC\Common\Configuration;
@@ -124,6 +125,7 @@ private function setValidationData(DateTime $moment, Configuration $configuratio
     private function verifySignature(string $publicKey): bool
     {
         $signer = new Sha256();
-        return $this->jwt->verify($signer, $publicKey);
+        $key = new Key($publicKey);
+        return $this->jwt->verify($signer, $key);
     }
 }

src/Common/Model/Token.php

@@ -36,20 +36,17 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
     {
         $configurationDiscoveryService = new ConfigurationDiscoveryService(new HttpClient());
         $certKeyService = new CertKeyService($configurationDiscoveryService, new HttpClient());
+        $configurationParser = new ConfigurationParser();
 
         $moduleConfig = $container->get('config');
         $applicationConfig = $container->get('ApplicationConfig');
         $oidcAuthEventHandler = new OidcAuthEventHandler(
             $applicationConfig,
             $moduleConfig,
-            new ConfigurationParser(),
+            $configurationParser,
             $certKeyService
         );
 
         return new OidcAuthListener($oidcAuthEventHandler);
-
-        //$globalConfiguration = $container->get('ApplicationConfig');
-
-        //return new $requestedName($globalConfiguration);
     }
 }

src/Factory/OidcAuthEventListenerFactory.php

@@ -2,6 +2,7 @@
 
 namespace Zend\Mvc\OIDC\Listener;
 
+use Exception;
 use Zend\Http\Request;
 use Zend\Mvc\MvcEvent;
 use Zend\Mvc\OIDC\Common\Configuration;
@@ -87,6 +88,7 @@ public function __construct(
      * @throws InvalidAuthorizationTokenException
      * @throws JwkRecoveryException
      * @throws OidcConfigurationDiscoveryException
+     * @throws Exception
      */
     public function handle(MvcEvent $mvcEvent)
     {
@@ -145,13 +147,10 @@ private function isAuthorized(array $authorizeConfig): void
     private function getAuthorizationToken(Request $request): string
     {
         $headers = $request->getHeaders('Authorization', null);
-        $token = '';
 
         if (!is_null($headers)) {
-            $token = $headers->toString();
-            $token = str_replace('Authorization: Bearer', null, $token);
-
-            return $token;
+            $tokenFromHeader = $headers->toString();
+            return str_replace('Authorization: Bearer', null, $tokenFromHeader);
         }
 
         throw new BasicAuthorizationException('Authorization exception.');

src/Listener/OidcAuthEventHandler.php

@@ -28,9 +28,9 @@ public function __construct(OidcAuthEventHandler $authEventHandler)
      */
     public function attach(EventManagerInterface $events, $priority = 1)
     {
-        $authEventHandler = $this->authEventHandler;
-        $callback = function (MvcEvent $mvcEvent) use($authEventHandler) {
-            $authEventHandler->handle($mvcEvent);
+        $eventHandler = $this->authEventHandler;
+        $callback = function (MvcEvent $mvcEvent) use($eventHandler) {
+            $eventHandler->handle($mvcEvent);
         };
 
         $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH, $callback, 1000);

src/Listener/OidcAuthListener.php

@@ -9,7 +9,7 @@
  */
 class Module
 {
-    public function getConfig()
+    public function getConfig(): array
     {
         return include __DIR__ . '/../config/module.config.php';
     }