require nette/security 3.1 (BC break)

Author: petrparolek

composer.json

@@ -20,7 +20,7 @@
   ],
   "require": {
     "php": ">=7.2",
-    "nette/security": "^3.0.0"
+    "nette/security": "^3.1"
   },
   "require-dev": {
     "ninjify/nunjuck": "^0.4",

src/Auth/DebugAuthenticator.php

@@ -3,11 +3,11 @@
 namespace Contributte\Security\Auth;
 
 use Nette\Security\AuthenticationException;
-use Nette\Security\IAuthenticator;
-use Nette\Security\Identity;
+use Nette\Security\Authenticator;
 use Nette\Security\IIdentity;
+use Nette\Security\SimpleIdentity;
 
-class DebugAuthenticator implements IAuthenticator
+class DebugAuthenticator implements Authenticator
 {
 
 	/** @var bool */
@@ -27,20 +27,19 @@ public function setIdentity(IIdentity $identity): void
 	}
 
 	/**
-	 * @param string[] $credentials
 	 * @throws AuthenticationException
 	 */
-	public function authenticate(array $credentials): IIdentity
+	public function authenticate(string $username, string $password): IIdentity
 	{
 		if ($this->pass === false) {
-			throw new AuthenticationException('Cannot login', IAuthenticator::FAILURE);
+			throw new AuthenticationException('Cannot login', Authenticator::FAILURE);
 		}
 
 		if ($this->identity !== null) {
 			return $this->identity;
 		}
 
-		return new Identity(1, null, null);
+		return new SimpleIdentity(1, null, null);
 	}
 
 }

src/Auth/StaticAuthenticator.php

@@ -4,12 +4,12 @@
 
 use InvalidArgumentException;
 use Nette\Security\AuthenticationException;
-use Nette\Security\IAuthenticator;
-use Nette\Security\Identity;
+use Nette\Security\Authenticator;
 use Nette\Security\IIdentity;
 use Nette\Security\Passwords;
+use Nette\Security\SimpleIdentity;
 
-class StaticAuthenticator implements IAuthenticator
+class StaticAuthenticator implements Authenticator
 {
 
 	/** @var mixed[][] */
@@ -40,15 +40,12 @@ public function __construct(array $list, Passwords $passwords)
 	}
 
 	/**
-	 * @param string[] $credentials
 	 * @throws AuthenticationException
 	 */
-	public function authenticate(array $credentials): IIdentity
+	public function authenticate(string $username, string $password): IIdentity
 	{
-		[$username, $password] = $credentials;
-
 		if (!isset($this->list[$username])) {
-			throw new AuthenticationException(sprintf('User `%s` not found', $username), IAuthenticator::IDENTITY_NOT_FOUND);
+			throw new AuthenticationException(sprintf('User `%s` not found', $username), Authenticator::IDENTITY_NOT_FOUND);
 		}
 
 		$user = $this->list[$username];
@@ -57,7 +54,7 @@ public function authenticate(array $credentials): IIdentity
 			($user['unsecured'] === true && !hash_equals($password, $user['password'])) ||
 			($user['unsecured'] === false && !$this->passwords->verify($password, $user['password']))
 		) {
-			throw new AuthenticationException('Invalid password', IAuthenticator::INVALID_CREDENTIAL);
+			throw new AuthenticationException('Invalid password', Authenticator::INVALID_CREDENTIAL);
 		}
 
 		return $user['identity'];
@@ -69,7 +66,7 @@ public function authenticate(array $credentials): IIdentity
 	private function createIdentity(string $username, array $values): IIdentity
 	{
 		if (!isset($values['identity'])) {
-			return new Identity($username);
+			return new SimpleIdentity($username);
 		}
 
 		$identity = $values['identity'];
@@ -79,7 +76,7 @@ private function createIdentity(string $username, array $values): IIdentity
 		}
 
 		if (is_array($values['identity'])) {
-			return new Identity(
+			return new SimpleIdentity(
 				$identity['id'] ?? $username,
 				$identity['roles'] ?? null,
 				$identity['date'] ?? null

tests/cases/Auth/DebugAuthenticator.phpt

@@ -14,13 +14,13 @@ use Tester\Assert;
 // Optimistic
 test(function (): void {
 	$auth = new DebugAuthenticator(true);
-	Assert::type(IIdentity::class, $auth->authenticate(['foo', 'bar']));
+	Assert::type(IIdentity::class, $auth->authenticate('foo', 'bar'));
 });
 
 // Pessimistic
 test(function (): void {
 	Assert::exception(function (): void {
 		$auth = new DebugAuthenticator(false);
-		$auth->authenticate([]);
+		$auth->authenticate('', '');
 	}, AuthenticationException::class);
 });

tests/cases/Auth/StaticAuthenticator.phpt

@@ -21,7 +21,7 @@ test(function (): void {
 		],
 	], (new Passwords(PASSWORD_BCRYPT)));
 
-	Assert::type(IIdentity::class, $auth->authenticate(['[email protected]', 'foobar']));
+	Assert::type(IIdentity::class, $auth->authenticate('[email protected]', 'foobar'));
 });
 
 // Success - plain password
@@ -33,7 +33,7 @@ test(function (): void {
 		],
 	], (new Passwords(PASSWORD_BCRYPT)));
 
-	Assert::type(IIdentity::class, $auth->authenticate(['[email protected]', 'foobar']));
+	Assert::type(IIdentity::class, $auth->authenticate('[email protected]', 'foobar'));
 });
 
 // User not found
@@ -46,7 +46,7 @@ test(function (): void {
 	], (new Passwords(PASSWORD_BCRYPT)));
 
 	Assert::exception(function () use ($auth): void {
-		$auth->authenticate(['foo', 'bar']);
+		$auth->authenticate('foo', 'bar');
 	}, AuthenticationException::class, 'User `foo` not found');
 });
 
@@ -60,6 +60,6 @@ test(function (): void {
 	], (new Passwords(PASSWORD_BCRYPT)));
 
 	Assert::exception(function () use ($auth): void {
-		$auth->authenticate(['[email protected]', 'bar']);
+		$auth->authenticate('[email protected]', 'bar');
 	}, AuthenticationException::class, 'Invalid password');
 });