Updates to zend-expressive-authentication 0.2.0.

zendframework · Nov 28, 2017 · f05e278 · f05e278
1 parent 062cab8
commit f05e278
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 58 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 0.2.0 - 2017-11-28
+
+### Added
+
+- Adds support for zend-expressive-authentication 0.2.0.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Removes support for zend-expressive-authentication 0.1.0.
+
+### Fixed
+
+- Nothing.
+
 ## 0.1.0 - 2017-11-20
 
 Initial release.

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "league/oauth2-server": "^6.0",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0.1",
-        "zendframework/zend-expressive-authentication": "^0.1 || ^1.0"
+        "zendframework/zend-expressive-authentication": "^0.2 || ^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0.8",

diff --git a/composer.lock b/composer.lock
diff --git a/src/OAuth2Adapter.php b/src/OAuth2Adapter.php
@@ -51,7 +51,7 @@ public function authenticate(ServerRequestInterface $request) : ?UserInterface
             $result = $this->resourceServer->validateAuthenticatedRequest($request);
             $userId = $result->getAttribute('oauth_user_id', false);
             if (false !== $userId) {
-                return $this->generateUser($userId, '');
+                return $this->generateUser($userId, []);
             }
         } catch (OAuthServerException $exception) {
             return null;

diff --git a/test/OAuth2AdapterTest.php b/test/OAuth2AdapterTest.php
@@ -89,7 +89,7 @@ public function testAuthenticateReturnsAUserIfTheResourceServerProducesAUserId()
 
         $this->assertInstanceOf(UserInterface::class, $user);
         $this->assertSame('some-identifier', $user->getUsername());
-        $this->assertSame('', $user->getUserRole());
+        $this->assertSame([], $user->getUserRoles());
     }
 
     public function testUnauthorizedResponseProducesAResponseWithAWwwAuthenticateHeader()