dispense Authentication service from HttpContext

Author: Machometec

lib/Extensions/ServiceCollectionExtensions.php

@@ -57,8 +57,8 @@ public static function addAntiForgery(IServiceCollection $services, Closure $con
 
     public static function addAuthentication(IServiceCollection $services, Closure $configure)
     {
-        $services->addSingleton(IAuthentication::class, function ($provider) use ($configure): Authentication {
-            $builder = new AuthenticationBuilder($provider->getService(HttpContext::class));
+        $services->addSingleton(IAuthentication::class, function () use ($configure): Authentication {
+            $builder = new AuthenticationBuilder();
             $configure($builder);
             return $builder->build();
         });

lib/Security/Authentication/AuthenticationBuilder.php

@@ -8,8 +8,6 @@
 
 namespace DevNet\Web\Security\Authentication;
 
-use DevNet\System\Runtime\LauncherProperties;
-use DevNet\Web\Http\Message\HttpContext;
 use DevNet\Web\Security\Authentication\JwtBearer\JwtBearerHandler;
 use DevNet\Web\Security\Authentication\JwtBearer\JwtBearerOptions;
 use DevNet\Web\Security\Authentication\Cookies\AuthenticationCookieHandler;
@@ -19,12 +17,6 @@
 class AuthenticationBuilder
 {
     private array $authentications;
-    private HttpContext $httpContext;
-
-    public function __construct(HttpContext $httpContext)
-    {
-        $this->httpContext = $httpContext;
-    }
 
     public function addCookie(string $authenticationScheme = AuthenticationScheme::CookieSession, Closure $configuration = null): void
     {
@@ -43,7 +35,7 @@ public function addJwtBearer(string $authenticationScheme = AuthenticationScheme
             $configuration($options);
         }
 
-        $this->authentications[$authenticationScheme] = new JwtBearerHandler($this->httpContext, $options);
+        $this->authentications[$authenticationScheme] = new JwtBearerHandler($options);
     }
 
     public function build(): Authentication

lib/Security/Authentication/Cookies/AuthenticationCookieHandler.php

@@ -27,7 +27,7 @@ class AuthenticationCookieHandler implements IAuthenticationHandler, IAuthentica
     public function __construct(AuthenticationCookieOptions $options)
     {
         $this->options = $options;
-        $this->session = new Session($options->CookieName);
+        $this->session = new Session($options->CookieName, $options->CookiePath);
 
         if (!$this->options->ExpireTime) {
             $this->options->ExpireTime = new TimeSpan();

lib/Security/Authentication/Cookies/AuthenticationCookieOptions.php

@@ -8,7 +8,6 @@
 
 namespace DevNet\Web\Security\Authentication\Cookies;
 
-use DevNet\System\Runtime\LauncherProperties;
 use DevNet\System\TimeSpan;
 
 class AuthenticationCookieOptions
@@ -22,9 +21,7 @@ public function __construct(string $cookieName = 'Identity', string $cookiePath
         $this->CookieName = $cookieName;
         $this->CookiePath = $cookiePath;
 
-        if ($this->CookieName == 'Identity') {
-            $this->CookieName .= "-" . md5(LauncherProperties::getRootDirectory());
-        }
+        $this->CookieName = $this->CookieName . "-" . md5($this->CookieName . $_SERVER['DOCUMENT_ROOT']);
 
         if (!$expireTime) {
             $this->ExpireTime = TimeSpan::fromDays(7);

lib/Security/Authentication/JwtBearer/JwtBearerHandler.php

@@ -9,7 +9,6 @@
 namespace DevNet\Web\Security\Authentication\JwtBearer;
 
 use DevNet\System\PropertyTrait;
-use DevNet\Web\Http\Message\HttpContext;
 use DevNet\Web\Security\Authentication\AuthenticationResult;
 use DevNet\Web\Security\Authentication\IAuthenticationHandler;
 use DevNet\Web\Security\Tokens\Jwt\JwtSecurityTokenHandler;
@@ -19,13 +18,11 @@ class JwtBearerHandler implements IAuthenticationHandler
 {
     use PropertyTrait;
 
-    private HttpContext $HttpContext;
     private JwtBearerOptions $options;
     private JwtSecurityTokenHandler $handler;
 
-    public function __construct(HttpContext $httpContext, JwtBearerOptions $options)
+    public function __construct(JwtBearerOptions $options)
     {
-        $this->httpContext = $httpContext;
         $this->options = $options;
         $this->handler = new JwtSecurityTokenHandler();
     }
@@ -37,12 +34,13 @@ public function get_Options(): JwtBearerOptions
 
     public function readToken(): string
     {
-        $headers = $this->httpContext->Request->Headers->getValues('Authorization');
-        if (!$headers) {
+        $headers = getallheaders();;
+        $bearerToken = $headers['Authorization'];
+        if (!$bearerToken) {
             throw new Exception("The request is missing the authorization header!");
         }
 
-        if (!preg_match("/^Bearer\s+(.*)$/", $headers[0], $matches)) {
+        if (!preg_match("/^Bearer\s+(.*)$/", $bearerToken[0], $matches)) {
             throw new Exception("Incorrect authentication header scheme!");
         }
 

lib/Security/Tokens/Base64UrlEncoder.php lib/Security/Base64UrlEncoder.phplib/Security/Tokens/Base64UrlEncoder.php renamed to lib/Security/Base64UrlEncoder.php

@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Security\Tokens;
+namespace DevNet\Web\Security;
 
 class Base64UrlEncoder
 {

lib/Security/Tokens/Csrf/AntiforgeryOptions.php

@@ -17,6 +17,6 @@ class AntiForgeryOptions
 
     public function __construct()
     {
-        $this->CookieName = $this->CookieName . "-" . md5($this->CookieName . $_SERVER['DOCUMENT_ROOT']);;
+        $this->CookieName = $this->CookieName . "-" . md5($this->CookieName . $_SERVER['DOCUMENT_ROOT']);
     }
 }

lib/Security/Tokens/Jwt/JwtHeader.php

@@ -8,7 +8,7 @@
 
 namespace DevNet\Web\Security\Tokens\Jwt;
 
-use DevNet\Web\Security\Tokens\Base64UrlEncoder;
+use DevNet\Web\Security\Base64UrlEncoder;
 
 class JwtHeader
 {

lib/Security/Tokens/Jwt/JwtPayload.php

@@ -9,7 +9,7 @@
 namespace DevNet\Web\Security\Tokens\Jwt;
 
 use DevNet\Web\Security\Claims\ClaimsIdentity;
-use DevNet\Web\Security\Tokens\Base64UrlEncoder;
+use DevNet\Web\Security\Base64UrlEncoder;
 
 class JwtPayload
 {

lib/Security/Tokens/Jwt/JwtSecurityTokenHandler.php

@@ -10,7 +10,7 @@
 
 use DevNet\Web\Security\Claims\Claim;
 use DevNet\Web\Security\Claims\ClaimsIdentity;
-use DevNet\Web\Security\Tokens\Base64UrlEncoder;
+use DevNet\Web\Security\Base64UrlEncoder;
 use DevNet\Web\Security\Tokens\Jwt\JwtSecurityToken;
 use DateTime;