Refactor auth middleware

src/Middleware/Auth/AuthenticationMiddlewareTrait.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Jenky\Atlas\Middleware\Auth;
+
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+trait AuthenticationMiddlewareTrait
+{
+    /**
+     * @var string|\Stringable
+     */
+    private $token;
+
+    public function __invoke(RequestInterface $request, callable $next): ResponseInterface
+    {
+        return $next($request->withHeader('Authorization', (string) $this->token));
+    }
+}

src/Middleware/Auth/BasicAuthentication.php

@@ -4,31 +4,14 @@
 
 namespace Jenky\Atlas\Middleware\Auth;
 
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
 final class BasicAuthentication
 {
-    /**
-     * @var string
-     */
-    private $username;
-
-    /**
-     * @var string
-     */
-    private $password;
+    use AuthenticationMiddlewareTrait;
 
     public function __construct(string $username, string $password)
     {
-        $this->username = $username;
-        $this->password = $password;
-    }
-
-    public function __invoke(RequestInterface $request, callable $next): ResponseInterface
-    {
-        $credential = $this->username.':'.$this->password;
+        $credential = $username.':'.$password;
 
-        return $next($request->withHeader('Authorization', 'Basic '.base64_encode($credential)));
+        $this->token = 'Basic '.base64_encode($credential);
     }
 }

src/Middleware/Auth/TokenAuthentication.php

@@ -4,23 +4,17 @@
 
 namespace Jenky\Atlas\Middleware\Auth;
 
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
 final class TokenAuthentication
 {
-    /**
-     * @var string
-     */
-    private $token;
+    use AuthenticationMiddlewareTrait;
 
-    public function __construct(string $token, string $tokenPrefix = 'Bearer')
+    public function __construct(string $token)
     {
-        $this->token = $tokenPrefix.' '.trim($token);
+        $this->token = $token;
     }
 
-    public function __invoke(RequestInterface $request, callable $next): ResponseInterface
+    public static function from(string $token, string $tokenPrefix = 'Bearer'): self
     {
-        return $next($request->withHeader('Authorization', $this->token));
+        return new self($tokenPrefix.' '.trim($token));
     }
 }

tests/AuthTest.php

@@ -74,7 +74,7 @@ public function test_token_auth(): void
 
         $this->assertTrue($response->unauthorized());
 
-        $connector->middleware()->before('fake_auth', new TokenAuthentication('#zKh#4KNu$Bq4^b97KJ6'));
+        $connector->middleware()->before('fake_auth', TokenAuthentication::from('#zKh#4KNu$Bq4^b97KJ6'));
 
         $response = $connector->send(new DummyRequest('http://localhost'));