adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unnecessary overriding of '_findUser()' in 'DigestAuthenticate'.

Browse source
This commit is contained in:
ADmad 2013-05-08 04:10:13 +05:30
parent 7d06f7b304
commit 56fa0dccda
1 changed files with 5 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
View file

@ -116,7 +116,11 @@ class DigestAuthenticate extends BasicAuthenticate {
if (empty($digest)) { if (empty($digest)) {
return false; return false;
} }
$user = $this->_findUser($digest['username']);
list(, $model) = pluginSplit($this->settings['userModel']);
$user = $this->_findUser(array(
$model . '.' . $this->settings['fields']['username'] => $digest['username']
));
if (empty($user)) { if (empty($user)) {
return false; return false;
} }
@ -128,34 +132,6 @@ class DigestAuthenticate extends BasicAuthenticate {
return false; return false;
} }
/**
* Find a user record using the standard options.
*
* @param string $username The username/identifier.
* @param string $password Unused password, digest doesn't require passwords.
* @return Mixed Either false on failure, or an array of user data.
*/
protected function _findUser($username, $password = null) {
$userModel = $this->settings['userModel'];
list(, $model) = pluginSplit($userModel);
$fields = $this->settings['fields'];
$conditions = array(
$model . '.' . $fields['username'] => $username,
);
if (!empty($this->settings['scope'])) {
$conditions = array_merge($conditions, $this->settings['scope']);
}
$result = ClassRegistry::init($userModel)->find('first', array(
'conditions' => $conditions,
'recursive' => $this->settings['recursive']
));
if (empty($result) || empty($result[$model])) {
return false;
}
return $result[$model];
}
/** /**
* Gets the digest headers from the request/environment. * Gets the digest headers from the request/environment.
* *