Introduce browser session and token bearer interfaces

Author: ilijastuden

src/Adapter/BrowserSessionAdapter.php

@@ -6,6 +6,8 @@
  * (c) A51 doo <[email protected]>. All rights reserved.
  */
 
+declare(strict_types=1);
+
 namespace ActiveCollab\Authentication\Adapter;
 
 use ActiveCollab\Authentication\AuthenticatedUser\AuthenticatedUserInterface;
@@ -27,38 +29,19 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
-/**
- * @package ActiveCollab\Authentication\Adapter
- */
-class BrowserSessionAdapter extends Adapter
+class BrowserSessionAdapter extends Adapter implements BrowserSessionAdapterInterface
 {
-    /**
-     * @var UserRepositoryInterface
-     */
     private $user_repository;
-
-    /**
-     * @var SessionRepositoryInterface
-     */
     private $session_repository;
-
-    /**
-     * @var CookiesInterface
-     */
     private $cookies;
-
-    /**
-     * @var string
-     */
     private $session_cookie_name;
 
-    /**
-     * @param UserRepositoryInterface    $user_repository
-     * @param SessionRepositoryInterface $session_repository
-     * @param CookiesInterface           $cookies
-     * @param string                     $session_cookie_name
-     */
-    public function __construct(UserRepositoryInterface $user_repository, SessionRepositoryInterface $session_repository, CookiesInterface $cookies, $session_cookie_name = 'sessid')
+    public function __construct(
+        UserRepositoryInterface $user_repository,
+        SessionRepositoryInterface $session_repository,
+        CookiesInterface $cookies,
+        string $session_cookie_name = 'sessid'
+    )
     {
         if (empty($session_cookie_name)) {
             throw new InvalidArgumentException('Session cookie name is required');
@@ -70,9 +53,6 @@ public function __construct(UserRepositoryInterface $user_repository, SessionRep
         $this->session_cookie_name = $session_cookie_name;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function initialize(ServerRequestInterface $request)
     {
         $session_id = $this->cookies->get($request, $this->session_cookie_name);
@@ -148,17 +128,11 @@ public function applyToResponse(ResponseInterface $response, TransportInterface
         return $response;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function authenticate(AuthenticatedUserInterface $authenticated_user, array $credentials = [])
     {
         return $this->session_repository->createSession($authenticated_user, $credentials);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function terminate(AuthenticationResultInterface $authenticated_with)
     {
         if (!$authenticated_with instanceof SessionInterface) {

src/Adapter/BrowserSessionAdapterInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ActiveCollab\Authentication\Adapter;
+
+use ActiveCollab\Authentication\AuthenticatedUser\AuthenticatedUserInterface;
+use ActiveCollab\Authentication\AuthenticationResult\AuthenticationResultInterface;
+use ActiveCollab\Authentication\AuthenticationResult\Transport\TransportInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+interface BrowserSessionAdapterInterface extends AdapterInterface
+{
+}

src/Adapter/TokenBearerAdapter.php

@@ -6,6 +6,8 @@
  * (c) A51 doo <[email protected]>. All rights reserved.
  */
 
+declare(strict_types=1);
+
 namespace ActiveCollab\Authentication\Adapter;
 
 use ActiveCollab\Authentication\AuthenticatedUser\AuthenticatedUserInterface;
@@ -19,26 +21,15 @@
 use InvalidArgumentException;
 use Psr\Http\Message\ServerRequestInterface;
 
-/**
- * @package ActiveCollab\Authentication\Adapter
- */
-class TokenBearerAdapter extends Adapter
+class TokenBearerAdapter extends Adapter implements TokenBearerAdapterInterface
 {
-    /**
-     * @var UserRepositoryInterface
-     */
     private $user_repository;
-
-    /**
-     * @var TokenRepositoryInterface
-     */
     private $token_repository;
 
-    /**
-     * @param UserRepositoryInterface  $user_repository
-     * @param TokenRepositoryInterface $token_repository
-     */
-    public function __construct(UserRepositoryInterface $user_repository, TokenRepositoryInterface $token_repository)
+    public function __construct(
+        UserRepositoryInterface $user_repository,
+        TokenRepositoryInterface $token_repository
+    )
     {
         $this->user_repository = $user_repository;
         $this->token_repository = $token_repository;
@@ -55,11 +46,11 @@ public function initialize(ServerRequestInterface $request)
 
         $authorization = $request->getHeaderLine('Authorization');
 
-        if (empty($authorization) || substr($authorization, 0, 6) !== 'Bearer') {
+        if (empty($authorization) || mb_substr($authorization, 0, 6) !== 'Bearer') {
             return null;
         }
 
-        $token_id = trim(substr($authorization, 7));
+        $token_id = trim(mb_substr($authorization, 7));
 
         if ($token_id === null || $token_id === '') {
             throw new InvalidTokenException();

src/Adapter/TokenBearerAdapterInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+/*
+ * This file is part of the Active Collab Authentication project.
+ *
+ * (c) A51 doo <[email protected]>. All rights reserved.
+ */
+
+declare(strict_types=1);
+
+namespace ActiveCollab\Authentication\Adapter;
+
+interface TokenBearerAdapterInterface extends AdapterInterface
+{
+}