Permalink
Browse files

Fix DigestAuthenticate component userModel setting

DigestAuthenticate component's userModel setting incorrectly defaulted
to User instead of Users.
  • Loading branch information...
1 parent 360fe38 commit 1e9bcbbd05a5308cec275952bfdc853208f79890 @vekakela vekakela committed Mar 11, 2014
View
4 src/Controller/Component/Auth/DigestAuthenticate.php
@@ -64,7 +64,7 @@ class DigestAuthenticate extends BasicAuthenticate {
* Settings for this object.
*
* - `fields` The fields to use to identify a user by.
- * - `userModel` The model name of the User, defaults to User.
+ * - `userModel` The model name of the User, defaults to Users.
* - `scope` Additional conditions to use when looking up and authenticating users,
* i.e. `array('User.is_active' => 1).`
* - `recursive` The value of the recursive key passed to find(). Defaults to 0.
@@ -82,7 +82,7 @@ class DigestAuthenticate extends BasicAuthenticate {
'username' => 'username',
'password' => 'password'
),
- 'userModel' => 'User',
+ 'userModel' => 'Users',
'scope' => array(),
'recursive' => 0,
'contain' => null,
View
6 tests/TestCase/Controller/Component/Auth/DigestAuthenticateTest.php
@@ -46,8 +46,6 @@ public function setUp() {
$this->Collection = $this->getMock('Cake\Controller\ComponentRegistry');
$this->auth = new DigestAuthenticate($this->Collection, array(
- 'fields' => array('username' => 'username', 'password' => 'password'),
- 'userModel' => 'Users',
'realm' => 'localhost',
'nonce' => 123,
'opaque' => '123abc'
@@ -68,11 +66,11 @@ public function setUp() {
public function testConstructor() {
$object = new DigestAuthenticate($this->Collection, array(
'userModel' => 'AuthUser',
- 'fields' => array('username' => 'user', 'password' => 'password'),
+ 'fields' => array('username' => 'user', 'password' => 'pass'),
'nonce' => 123456
));
$this->assertEquals('AuthUser', $object->settings['userModel']);
- $this->assertEquals(array('username' => 'user', 'password' => 'password'), $object->settings['fields']);
+ $this->assertEquals(array('username' => 'user', 'password' => 'pass'), $object->settings['fields']);
$this->assertEquals(123456, $object->settings['nonce']);
$this->assertEquals(env('SERVER_NAME'), $object->settings['realm']);
}

0 comments on commit 1e9bcbb

Please sign in to comment.