Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix DigestAuthenticate component userModel setting #3001

Merged
merged 1 commit into from Mar 11, 2014
Merged

Fix DigestAuthenticate component userModel setting #3001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Controller/Component/Auth/DigestAuthenticate.php
View file
Open in desktop
Expand Up @@ -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.
Expand All @@ -82,7 +82,7 @@ class DigestAuthenticate extends BasicAuthenticate {
'username' => 'username',
'password' => 'password'
),
'userModel' => 'User',
'userModel' => 'Users',
'scope' => array(),
'recursive' => 0,
'contain' => null,
Expand Down
6 changes: 2 additions & 4 deletions tests/TestCase/Controller/Component/Auth/DigestAuthenticateTest.php
View file
Open in desktop
Expand Up @@ -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'
Expand All @@ -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']);
}
Expand Down