SimpleAuthenticator implements Autheticator

Author: dg

src/Security/SimpleAuthenticator.php

@@ -13,9 +13,9 @@
 
 
 /**
- * Trivial implementation of IAuthenticator.
+ * Trivial implementation of Authenticator.
  */
-class SimpleAuthenticator implements IAuthenticator
+class SimpleAuthenticator implements Authenticator
 {
 	use Nette\SmartObject;
 
@@ -47,9 +47,13 @@ public function __construct(array $userlist, array $usersRoles = [], array $user
 	 * and returns IIdentity on success or throws AuthenticationException
 	 * @throws AuthenticationException
 	 */
-	public function authenticate(array $credentials): IIdentity
+	public function authenticate(/*string*/ $username, string $password = null): IIdentity
 	{
-		[$username, $password] = $credentials;
+		if (is_array($username)) {
+			[$username, $password] = $username; // back compatibility
+			trigger_error(__METHOD__ . '() now accepts arguments (string $username, string $password).', E_USER_DEPRECATED);
+		}
+
 		foreach ($this->userlist as $name => $pass) {
 			if (strcasecmp($name, $username) === 0) {
 				if ((string) $pass === (string) $password) {

tests/Security.DI/SecurityExtension.authenticator.phpt

@@ -52,7 +52,7 @@ $expectedRoles = [
 ];
 
 foreach ($userList as $username => $password) {
-	$identity = $authenticator->authenticate([$username, $password]);
+	$identity = $authenticator->authenticate($username, $password);
 	Assert::equal($username, $identity->getId());
 	Assert::equal($expectedRoles[$username], $identity->getRoles());
 }

tests/Security/SimpleAuthenticator.Data.phpt

@@ -31,7 +31,7 @@ $expectedData = [
 $authenticator = new SimpleAuthenticator($users, [], $usersData);
 
 foreach ($users as $username => $password) {
-	$identity = $authenticator->authenticate([$username, $password]);
+	$identity = $authenticator->authenticate($username, $password);
 	Assert::equal($username, $identity->getId());
 	Assert::equal($expectedData[$username], $identity->getData());
 }

tests/Security/SimpleAuthenticator.Roles.phpt

@@ -31,7 +31,7 @@ $expectedRoles = [
 $authenticator = new SimpleAuthenticator($users, $usersRoles);
 
 foreach ($users as $username => $password) {
-	$identity = $authenticator->authenticate([$username, $password]);
+	$identity = $authenticator->authenticate($username, $password);
 	Assert::equal($username, $identity->getId());
 	Assert::equal($expectedRoles[$username], $identity->getRoles());
 }

tests/Security/SimpleAuthenticator.phpt

@@ -20,18 +20,18 @@ $users = [
 
 $authenticator = new SimpleAuthenticator($users);
 
-$identity = $authenticator->authenticate(['john', 'password123!']);
+$identity = $authenticator->authenticate('john', 'password123!');
 Assert::type(Nette\Security\IIdentity::class, $identity);
 Assert::equal('john', $identity->getId());
 
-$identity = $authenticator->authenticate(['admin', 'admin']);
+$identity = $authenticator->authenticate('admin', 'admin');
 Assert::type(Nette\Security\IIdentity::class, $identity);
 Assert::equal('admin', $identity->getId());
 
 Assert::exception(function () use ($authenticator) {
-	$authenticator->authenticate(['admin', 'wrong password']);
+	$authenticator->authenticate('admin', 'wrong password');
 }, Nette\Security\AuthenticationException::class, 'Invalid password.');
 
 Assert::exception(function () use ($authenticator) {
-	$authenticator->authenticate(['nobody', 'password']);
+	$authenticator->authenticate('nobody', 'password');
 }, Nette\Security\AuthenticationException::class, "User 'nobody' not found.");