mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-31 17:16:18 +00:00
Added 'recursive' settings option to BaseAuthenticate and BasicAuthenticate to have a bit more fine grained control in custom Authenticate objects.
This commit is contained in:
parent
485c15d55d
commit
521dff8468
3 changed files with 7 additions and 2 deletions
|
@ -29,6 +29,7 @@ abstract class BaseAuthenticate {
|
||||||
* - `userModel` The model name of the User, defaults to User.
|
* - `userModel` The model name of the User, defaults to User.
|
||||||
* - `scope` Additional conditions to use when looking up and authenticating users,
|
* - `scope` Additional conditions to use when looking up and authenticating users,
|
||||||
* i.e. `array('User.is_active' => 1).`
|
* i.e. `array('User.is_active' => 1).`
|
||||||
|
* - `recursive` The value of the recursive key passed to find(). Defaults to 0.
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
|
@ -38,7 +39,8 @@ abstract class BaseAuthenticate {
|
||||||
'password' => 'password'
|
'password' => 'password'
|
||||||
),
|
),
|
||||||
'userModel' => 'User',
|
'userModel' => 'User',
|
||||||
'scope' => array()
|
'scope' => array(),
|
||||||
|
'recursive' => 0
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -80,7 +82,7 @@ abstract class BaseAuthenticate {
|
||||||
}
|
}
|
||||||
$result = ClassRegistry::init($userModel)->find('first', array(
|
$result = ClassRegistry::init($userModel)->find('first', array(
|
||||||
'conditions' => $conditions,
|
'conditions' => $conditions,
|
||||||
'recursive' => 0
|
'recursive' => $this->settings['recursive']
|
||||||
));
|
));
|
||||||
if (empty($result) || empty($result[$model])) {
|
if (empty($result) || empty($result[$model])) {
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -48,6 +48,7 @@ class BasicAuthenticate extends BaseAuthenticate {
|
||||||
* - `userModel` The model name of the User, defaults to User.
|
* - `userModel` The model name of the User, defaults to User.
|
||||||
* - `scope` Additional conditions to use when looking up and authenticating users,
|
* - `scope` Additional conditions to use when looking up and authenticating users,
|
||||||
* i.e. `array('User.is_active' => 1).`
|
* i.e. `array('User.is_active' => 1).`
|
||||||
|
* - `recursive` The value of the recursive key passed to find(). Defaults to 0.
|
||||||
* - `realm` The realm authentication is for. Defaults the server name.
|
* - `realm` The realm authentication is for. Defaults the server name.
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
|
@ -59,6 +60,7 @@ class BasicAuthenticate extends BaseAuthenticate {
|
||||||
),
|
),
|
||||||
'userModel' => 'User',
|
'userModel' => 'User',
|
||||||
'scope' => array(),
|
'scope' => array(),
|
||||||
|
'recursive' => 0,
|
||||||
'realm' => '',
|
'realm' => '',
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -47,6 +47,7 @@ class BasicAuthenticateTest extends CakeTestCase {
|
||||||
'fields' => array('username' => 'user', 'password' => 'password'),
|
'fields' => array('username' => 'user', 'password' => 'password'),
|
||||||
'userModel' => 'User',
|
'userModel' => 'User',
|
||||||
'realm' => 'localhost',
|
'realm' => 'localhost',
|
||||||
|
'recursive' => 0
|
||||||
));
|
));
|
||||||
|
|
||||||
$password = Security::hash('password', null, true);
|
$password = Security::hash('password', null, true);
|
||||||
|
|
Loading…
Add table
Reference in a new issue