Include virtual fields in authenication data.

When a user is authenticated, the session data should include any
virtual fields defined on the entity.

Refs #5420

src/Auth/BaseAuthenticate.php

@@ -119,7 +119,6 @@ protected function _findUser($username, $password = null) {
 
 		$result = $table
 			->where($conditions)
-			->hydrate(false)
 			->first();
 
 		if (empty($result)) {
@@ -128,16 +127,16 @@ protected function _findUser($username, $password = null) {
 
 		if ($password !== null) {
 			$hasher = $this->passwordHasher();
-			$hashedPassword = $result[$fields['password']];
+			$hashedPassword = $result->get($fields['password']);
 			if (!$hasher->check($password, $hashedPassword)) {
 				return false;
 			}
 
 			$this->_needsPasswordRehash = $hasher->needsRehash($hashedPassword);
-			unset($result[$fields['password']]);
+			$result->unsetProperty($fields['password']);
 		}
 
-		return $result;
+		return $result->toArray();
 	}
 
 /**

tests/TestCase/Auth/FormAuthenticateTest.php

@@ -51,6 +51,8 @@ public function setUp() {
 			'userModel' => 'Users'
 		]);
 		$password = password_hash('password', PASSWORD_DEFAULT);
+
+		TableRegistry::clear();
 		$Users = TableRegistry::get('Users');
 		$Users->updateAll(['password' => $password], []);
 		$this->response = $this->getMock('Cake\Network\Response');
@@ -204,6 +206,31 @@ public function testAuthenticateSuccess() {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * Test that authenticate() includes virtual fields.
+ *
+ * @return void
+ */
+	public function testAuthenticateIncludesVirtualFields() {
+		$users = TableRegistry::get('Users');
+		$users->entityClass('TestApp\Model\Entity\VirtualUser');
+
+		$request = new Request('posts/index');
+		$request->data = [
+			'username' => 'mariano',
+			'password' => 'password'
+		];
+		$result = $this->auth->authenticate($request, $this->response);
+		$expected = [
+			'id' => 1,
+			'username' => 'mariano',
+			'bonus' => 'bonus',
+			'created' => new Time('2007-03-17 01:16:23'),
+			'updated' => new Time('2007-03-17 01:18:31')
+		];
+		$this->assertEquals($expected, $result);
+	}
+
 /**
  * test scope failure.
  *

tests/test_app/TestApp/Model/Entity/VirtualUser.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace TestApp\Model\Entity;
+
+use Cake\ORM\Entity;
+
+class VirtualUser extends Entity {
+
+	protected $_virtual = [
+		'bonus'
+	];
+
+	protected function _getBonus() {
+		return 'bonus';
+	}
+}