Simplify

cube43 · Sep 27, 2023 · ae0e2a7 · ae0e2a7
1 parent ae405bc
commit ae0e2a7
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 44 deletions.
diff --git a/src/DecodeToken.php b/src/DecodeToken.php
@@ -24,7 +24,7 @@ public function __construct(
      *
      * @param non-empty-string $token
      */
-    public function __invoke(string $token): JwtDecodedToken
+    public function __invoke(string $token): Plain
     {
         try {
             $tokenDecoded = $this->parser->parse($token);
@@ -42,6 +42,6 @@ public function __invoke(string $token): JwtDecodedToken
             throw $exception;
         }
 
-        return new JwtDecodedToken($tokenDecoded, $token);
+        return $tokenDecoded;
     }
 }
diff --git a/src/JwtAuthentication/NullAfter.php b/src/JwtAuthentication/NullAfter.php
@@ -4,13 +4,13 @@
 
 namespace Tuupola\Middleware\JwtAuthentication;
 
+use Lcobucci\JWT\Token\Plain;
 use Psr\Http\Message\ResponseInterface;
 use Tuupola\Middleware\JwtAuthentificationAfter;
-use Tuupola\Middleware\JwtDecodedToken;
 
 class NullAfter implements JwtAuthentificationAfter
 {
-    public function __invoke(ResponseInterface $response, JwtDecodedToken $jwtDecodedToken): ResponseInterface
+    public function __invoke(ResponseInterface $response, Plain $token): ResponseInterface
     {
         return $response;
     }

diff --git a/src/JwtAuthentication/NullBefore.php b/src/JwtAuthentication/NullBefore.php
@@ -4,13 +4,13 @@
 
 namespace Tuupola\Middleware\JwtAuthentication;
 
+use Lcobucci\JWT\Token\Plain;
 use Psr\Http\Message\ServerRequestInterface;
 use Tuupola\Middleware\JwtAuthentificationBefore;
-use Tuupola\Middleware\JwtDecodedToken;
 
 class NullBefore implements JwtAuthentificationBefore
 {
-    public function __invoke(ServerRequestInterface $request, JwtDecodedToken $jwtDecodedToken): ServerRequestInterface
+    public function __invoke(ServerRequestInterface $request, Plain $token): ServerRequestInterface
     {
         return $request;
     }

diff --git a/src/JwtAuthentificationAfter.php b/src/JwtAuthentificationAfter.php
@@ -4,9 +4,10 @@
 
 namespace Tuupola\Middleware;
 
+use Lcobucci\JWT\Token\Plain;
 use Psr\Http\Message\ResponseInterface;
 
 interface JwtAuthentificationAfter
 {
-    public function __invoke(ResponseInterface $response, JwtDecodedToken $jwtDecodedToken): ResponseInterface;
+    public function __invoke(ResponseInterface $response, Plain $token): ResponseInterface;
 }
diff --git a/src/JwtAuthentificationBefore.php b/src/JwtAuthentificationBefore.php
@@ -4,9 +4,10 @@
 
 namespace Tuupola\Middleware;
 
+use Lcobucci\JWT\Token\Plain;
 use Psr\Http\Message\ServerRequestInterface;
 
 interface JwtAuthentificationBefore
 {
-    public function __invoke(ServerRequestInterface $request, JwtDecodedToken $jwtDecodedToken): ServerRequestInterface;
+    public function __invoke(ServerRequestInterface $request, Plain $token): ServerRequestInterface;
 }
diff --git a/src/JwtDecodedToken.php b/src/JwtDecodedToken.php
diff --git a/tests/Assets/TestAfterHandler.php b/tests/Assets/TestAfterHandler.php
@@ -30,13 +30,13 @@
 
 namespace Tuupola\Tests\Middleware\Assets;
 
+use Lcobucci\JWT\Token\Plain;
 use Psr\Http\Message\ResponseInterface;
 use Tuupola\Middleware\JwtAuthentificationAfter;
-use Tuupola\Middleware\JwtDecodedToken;
 
 class TestAfterHandler implements JwtAuthentificationAfter
 {
-    public function __invoke(ResponseInterface $response, JwtDecodedToken $jwtDecodedToken): ResponseInterface
+    public function __invoke(ResponseInterface $response, Plain $token): ResponseInterface
     {
         $response->getBody()->write(self::class);
 

diff --git a/tests/Assets/TestBeforeHandler.php b/tests/Assets/TestBeforeHandler.php
@@ -30,13 +30,13 @@
 
 namespace Tuupola\Tests\Middleware\Assets;
 
+use Lcobucci\JWT\Token\Plain;
 use Psr\Http\Message\ServerRequestInterface;
 use Tuupola\Middleware\JwtAuthentificationBefore;
-use Tuupola\Middleware\JwtDecodedToken;
 
 class TestBeforeHandler implements JwtAuthentificationBefore
 {
-    public function __invoke(ServerRequestInterface $request, JwtDecodedToken $jwtDecodedToken): ServerRequestInterface
+    public function __invoke(ServerRequestInterface $request, Plain $token): ServerRequestInterface
     {
         return $request->withAttribute('test', 'invoke');
     }

diff --git a/tests/Functional/JwtAuthenticationTest.php b/tests/Functional/JwtAuthenticationTest.php
@@ -37,6 +37,7 @@
 use Lcobucci\JWT\Parser;
 use Lcobucci\JWT\Signer\Key\InMemory;
 use Lcobucci\JWT\Token;
+use Lcobucci\JWT\Token\Plain;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -54,7 +55,6 @@
 use Tuupola\Middleware\JwtAuthentificationAfter;
 use Tuupola\Middleware\JwtAuthentificationBefore;
 use Tuupola\Middleware\JwtAuthentificationError;
-use Tuupola\Middleware\JwtDecodedToken;
 use Tuupola\Tests\Middleware\Assets\TestAfterHandler;
 use Tuupola\Tests\Middleware\Assets\TestBeforeHandler;
 use Tuupola\Tests\Middleware\Assets\TestErrorHandler;
@@ -278,7 +278,7 @@ public function testShouldAlterResponseWithAnonymousAfter(): void
 
         $option = JwtAuthenticationOption::create(InMemory::base64Encoded('mBC5v1sOKVvbdEitdSBenu59nfNfhwkedkJVNabosTw='))
             ->withAfter(new class implements JwtAuthentificationAfter {
-                public function __invoke(ResponseInterface $response, JwtDecodedToken $jwtDecodedToken): ResponseInterface
+                public function __invoke(ResponseInterface $response, Plain $token): ResponseInterface
                 {
                     return $response->withHeader('X-Brawndo', 'plants crave');
                 }
@@ -604,10 +604,10 @@ public function testShouldAttachToken(): void
         $default = static function (ServerRequestInterface $request): ResponseInterface {
             $decodedToken = $request->getAttribute('token');
 
-            assert($decodedToken instanceof JwtDecodedToken);
+            assert($decodedToken instanceof Plain);
 
             $response = (new ResponseFactory())->createResponse();
-            $response->getBody()->write((string) json_encode($decodedToken->payload->claims()->get('iss')));
+            $response->getBody()->write((string) json_encode($decodedToken->claims()->get('iss')));
             $response->getBody()->rewind();
 
             return $response;
@@ -638,10 +638,10 @@ public function testShouldAttachCustomToken(): void
         $default = static function (ServerRequestInterface $request): ResponseInterface {
             $decodedToken = $request->getAttribute('nekot');
 
-            assert($decodedToken instanceof JwtDecodedToken);
+            assert($decodedToken instanceof Plain);
 
             $response = (new ResponseFactory())->createResponse();
-            $response->getBody()->write((string) json_encode($decodedToken->payload->claims()->get('iss')));
+            $response->getBody()->write((string) json_encode($decodedToken->claims()->get('iss')));
 
             return $response;
         };
@@ -678,9 +678,9 @@ public function testShouldCallAfterWithProperArguments(): void
 
         $option = JwtAuthenticationOption::create(InMemory::base64Encoded('mBC5v1sOKVvbdEitdSBenu59nfNfhwkedkJVNabosTw='))
             ->withAfter(new class implements JwtAuthentificationAfter {
-                public function __invoke(ResponseInterface $response, JwtDecodedToken $jwtDecodedToken): ResponseInterface
+                public function __invoke(ResponseInterface $response, Plain $token): ResponseInterface
                 {
-                    return $response->withHeader('decoded', (string) json_encode($jwtDecodedToken->payload->claims()->get('iss')))->withHeader('token', $jwtDecodedToken->token);
+                    return $response->withHeader('decoded', (string) json_encode($token->claims()->get('iss')));
                 }
             });
 
@@ -694,7 +694,6 @@ public function __invoke(ResponseInterface $response, JwtDecodedToken $jwtDecode
         self::assertEquals(200, $response->getStatusCode());
         self::assertEquals('Success', $response->getBody());
         self::assertJsonStringEqualsJsonString((string) json_encode(self::$acmeTokenArray['iss']), $response->getHeaderLine('decoded'));
-        self::assertEquals(self::$acmeToken, $response->getHeaderLine('token'));
     }
 
     public function testShouldCallBeforeWithProperArguments(): void
@@ -705,17 +704,16 @@ public function testShouldCallBeforeWithProperArguments(): void
 
         $default = static function (ServerRequestInterface $request): ResponseInterface {
             $response = (new ResponseFactory())->createResponse();
-            $response->getBody()->write('Success' . (string) json_encode($request->getAttribute('decoded')) . (string) json_encode($request->getAttribute('token')));
+            $response->getBody()->write('Success' . (string) json_encode($request->getAttribute('decoded')));
 
             return $response;
         };
 
         $option = JwtAuthenticationOption::create(InMemory::base64Encoded('mBC5v1sOKVvbdEitdSBenu59nfNfhwkedkJVNabosTw='))
             ->withBefore(new class implements JwtAuthentificationBefore {
-                public function __invoke(ServerRequestInterface $request, JwtDecodedToken $jwtDecodedToken): ServerRequestInterface
+                public function __invoke(ServerRequestInterface $request, Plain $token): ServerRequestInterface
                 {
-                    return $request->withAttribute('decoded', (string) json_encode($jwtDecodedToken->payload->claims()->get('iss')))
-                        ->withAttribute('token', $jwtDecodedToken->token);
+                    return $request->withAttribute('decoded', (string) json_encode($token->claims()->get('iss')));
                 }
             });
 
@@ -730,7 +728,7 @@ public function __invoke(ServerRequestInterface $request, JwtDecodedToken $jwtDe
 
         $body->rewind();
         self::assertEquals(200, $response->getStatusCode());
-        self::assertEquals('Success' . (string) json_encode(json_encode(self::$acmeTokenArray['iss'])) . (string) json_encode(self::$acmeToken), $body->getContents());
+        self::assertEquals('Success' . (string) json_encode(json_encode(self::$acmeTokenArray['iss'])), $body->getContents());
     }
 
     public function testShouldCallAnonymousErrorFunction(): void
@@ -868,7 +866,7 @@ public function testShouldReturn401FromAfter(): void
 
         $option = JwtAuthenticationOption::create(InMemory::base64Encoded('mBC5v1sOKVvbdEitdSBenu59nfNfhwkedkJVNabosTw='))
             ->withAfter(new class implements JwtAuthentificationAfter {
-                public function __invoke(ResponseInterface $response, JwtDecodedToken $jwtDecodedToken): ResponseInterface
+                public function __invoke(ResponseInterface $response, Plain $token): ResponseInterface
                 {
                     return $response
                         ->withBody((new StreamFactory())->createStream())
@@ -905,7 +903,7 @@ public function testShouldModifyRequestUsingAnonymousBefore(): void
 
         $option = JwtAuthenticationOption::create(InMemory::base64Encoded('mBC5v1sOKVvbdEitdSBenu59nfNfhwkedkJVNabosTw='))
             ->withBefore(new class implements JwtAuthentificationBefore {
-                public function __invoke(ServerRequestInterface $request, JwtDecodedToken $jwtDecodedToken): ServerRequestInterface
+                public function __invoke(ServerRequestInterface $request, Plain $token): ServerRequestInterface
                 {
                     return $request->withAttribute('test', 'test');
                 }
@@ -1047,15 +1045,15 @@ public function testShouldBindToMiddleware(): void
 
         $option =                 JwtAuthenticationOption::create(InMemory::base64Encoded('mBC5v1sOKVvbdEitdSBenu59nfNfhwkedkJVNabosTw='))
             ->withAfter(new class implements JwtAuthentificationAfter {
-                public function __invoke(ResponseInterface $response, JwtDecodedToken $jwtDecodedToken): ResponseInterface
+                public function __invoke(ResponseInterface $response, Plain $token): ResponseInterface
                 {
                      $response->getBody()->write('im after');
 
                     return $response;
                 }
             })
             ->withBefore(new class implements JwtAuthentificationBefore {
-                public function __invoke(ServerRequestInterface $request, JwtDecodedToken $jwtDecodedToke): ServerRequestInterface
+                public function __invoke(ServerRequestInterface $request, Plain $token): ServerRequestInterface
                 {
                     return $request->withAttribute('before', 'im before');
                 }