Cleanup & finishing touches ✨

removed the PredicateMiddleware for no added value

src/Factory/AuthFactory.php

@@ -144,7 +144,7 @@ public function inspectTokens(
             $response = fn() => $this->responseFactory->createResponse(401); // HTTP status 401 (Unauthorized)
             $withError = fn($error = null) => $error !== null ? Man::writeJsonError($response(), $error) : $response();
             $token = $request->getAttribute($tokenAttribute ?? Man::TOKEN_ATTRIBUTE_NAME);
-            if ($token !== null) {
+            if (is_object($token)) { // asserts that the token is an object
                 return $inspector(
                     $token,
                     fn() => $next->handle($request),

src/Factory/AuthWizard.php

@@ -4,7 +4,7 @@
 
 namespace Dakujem\Middleware\Factory;
 
-use Dakujem\Middleware\PredicateMiddleware;
+use Dakujem\Middleware\GenericMiddleware;
 use Dakujem\Middleware\TokenManipulators as Man;
 use Dakujem\Middleware\TokenMiddleware;
 use Psr\Http\Message\ResponseFactoryInterface as ResponseFactory;
@@ -67,7 +67,7 @@ public static function decodeTokens(
      * @param ResponseFactory $responseFactory
      * @param string|null $tokenAttribute
      * @param string|null $errorAttribute
-     * @return PredicateMiddleware
+     * @return GenericMiddleware
      */
     public static function assertTokens(
         ResponseFactory $responseFactory,
@@ -84,7 +84,7 @@ public static function assertTokens(
      * @param callable $inspector fn(Token,callable,callable):Response
      * @param string|null $tokenAttribute
      * @param string|null $errorAttribute
-     * @return PredicateMiddleware
+     * @return GenericMiddleware
      */
     public static function inspectTokens(
         ResponseFactory $responseFactory,

src/TokenManipulators.php

@@ -127,48 +127,6 @@ public static function attributeTokenProvider(string $attributeName = self::TOKE
         };
     }
 
-    /**
-     * Create a basic error responder that returns a response with 400 (Bad Request) status.
-     *
-     * @param ResponseFactory $responseFactory
-     * @param int|null $httpStatus HTTP response status, default is 400
-     * @return callable
-     */
-    public static function basicErrorResponder(
-        ResponseFactory $responseFactory,
-        ?int $httpStatus = null
-    ): callable {
-        return function (/* Request $request */) use ($responseFactory, $httpStatus): Response {
-            return $responseFactory->createResponse($httpStatus ?? 400);
-        };
-    }
-
-    /**
-     * Create a function that reads a message from a Request attribute of choice
-     * and writes it as JSON to the Response body, setting correct content-type header.
-     *
-     * It can be used to transfer an error message from the Request to the Response for end user convenience.
-     * Warning: Opinionated and inflexible. You will probably want to use your own implementation.
-     *
-     * @param string $errorAttributeName
-     * @return callable fn(Request,Response):Response
-     */
-    public static function errorMessagePassJson(string $errorAttributeName = self::ERROR_ATTRIBUTE_NAME): callable
-    {
-        return function (Request $request, Response $response) use ($errorAttributeName): Response {
-            // When this error handler is called and no error message is found, it assumes that no token was found.
-            $msg = $request->getAttribute($errorAttributeName) ?? 'No token found.';
-            $stream = $response->getBody();
-            /** @noinspection PhpComposerExtensionStubsInspection */
-            $stream !== null && $stream->write(json_encode([
-                'error' => [
-                    'message' => $msg,
-                ],
-            ]));
-            return $response->withHeader('Content-type', 'application/json');
-        };
-    }
-
     /**
      * Write error message or error data as JSON to the Response.
      * Also sets the Content-type header for JSON.

tests/ComplexInteractionTest.phpt

@@ -215,6 +215,32 @@ class _ComplexInteractionTest extends TestCase
         });
     }
 
+    public function testRejectWithData()
+    {
+        $errorData = [
+            'message' => 'Sorry, the server turned into a teapot!',
+            'reason' => 'Well, the reason is unknown...',
+        ];
+        $mw = fn() => [
+            AuthWizard::inspectTokens(
+                new ResponseFactory(),
+                function (object $token, callable $next, callable $withError) use ($errorData): Response {
+                    return $withError($errorData)->withStatus(418); // reject the token
+                }
+            ),
+            AuthWizard::decodeTokens($this->key),
+        ];
+
+        // the token is indeed valid, but will be rejected by the inspector
+        $request = $this->req()->withHeader('Authorization', 'Bearer ' . $this->validToken());
+        self::check($mw(), $request, function (Request $request) {
+            throw new LogicException('The kernel should never be reached.');
+        }, function (Response $response) use ($errorData) {
+            Assert::same(418, $response->getStatusCode());
+            Assert::same(json_encode(['error' => $errorData]), $response->getBody()->getContents());
+        });
+    }
+
     public function testAcceptByInspector()
     {
         $mw = fn() => [