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

Extracting common logic into the base class.

Browse source
This commit is contained in:
mark_story 2011-01-21 20:52:38 -05:00
parent 4610a0bf3c
commit bcd8dcd0f7
3 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
cake/libs/controller/components/auth/base_authenticate.php
View file

@ -59,6 +59,36 @@ abstract class BaseAuthenticate {
return Security::hash($password, null, true); return Security::hash($password, null, true);
} }
/**
* Find a user record using the standard options.
*
* @param string $username The username/identifier.
* @param string $password The unhashed password.
* @return Mixed Either false on failure, or an array of user data.
*/
protected function _findUser($username, $password) {
$userModel = $this->settings['userModel'];
list($plugin, $model) = pluginSplit($userModel);
$fields = $this->settings['fields'];
$conditions = array(
$model . '.' . $fields['username'] => $username,
$model . '.' . $fields['password'] => $this->hash($password),
);
if (!empty($this->settings['scope'])) {
$conditions = array_merge($conditions, $this->settings['scope']);
}
$result = ClassRegistry::init($userModel)->find('first', array(
'conditions' => $conditions,
'recursive' => 0
));
if (empty($result) || empty($result[$model])) {
return false;
}
unset($result[$model][$fields['password']]);
return $result[$model];
}
/** /**
* Authenticate a user based on the request information. * Authenticate a user based on the request information.
* *

20
cake/libs/controller/components/auth/basic_authenticate.php
View file

@ -66,30 +66,16 @@ class BasicAuthenticate extends BaseAuthenticate {
return false; return false;
} }
$userModel = $this->settings['userModel']; $result = $this->_findUser($username, $pass);
list($plugin, $model) = pluginSplit($userModel);
$fields = $this->settings['fields'];
$conditions = array( if (empty($result)) {
$model . '.' . $fields['username'] => $username,
$model . '.' . $fields['password'] => $this->hash($pass),
);
if (!empty($this->settings['scope'])) {
$conditions = array_merge($conditions, $this->settings['scope']);
}
$result = ClassRegistry::init($userModel)->find('first', array(
'conditions' => $conditions,
'recursive' => 0
));
if (empty($result) || empty($result[$model])) {
$response->header($this->loginHeaders()); $response->header($this->loginHeaders());
$response->header('Location', Router::reverse($request)); $response->header('Location', Router::reverse($request));
$response->statusCode(401); $response->statusCode(401);
$response->send(); $response->send();
return false; return false;
} }
unset($result[$model][$fields['password']]); return $result;
return $result[$model];
} }
/** /**

18
cake/libs/controller/components/auth/form_authenticate.php
View file

@ -58,22 +58,10 @@ class FormAuthenticate extends BaseAuthenticate {
) { ) {
return false; return false;
} }
$conditions = array( return $this->_findUser(
$model . '.' . $fields['username'] => $request->data[$model][$fields['username']], $request->data[$model][$fields['username']],
$model . '.' . $fields['password'] => $this->hash($request->data[$model][$fields['password']]), $request->data[$model][$fields['password']]
); );
if (!empty($this->settings['scope'])) {
$conditions = array_merge($conditions, $this->settings['scope']);
}
$result = ClassRegistry::init($userModel)->find('first', array(
'conditions' => $conditions,
'recursive' => 0
));
if (empty($result) || empty($result[$model])) {
return false;
}
unset($result[$model][$fields['password']]);
return $result[$model];
} }
} }