Added `contain` option to AuthComponent's Authentication objects #594

Merged
merged 2 commits into from May 10, 2012
Jump to file or symbol
Failed to load files and symbols.
+14 −4
Split
@@ -30,6 +30,7 @@
* - `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.
+ * - `contain` Extra models to contain and store in session.
*
* @var array
*/
@@ -40,7 +41,8 @@
),
'userModel' => 'User',
'scope' => array(),
- 'recursive' => 0
+ 'recursive' => 0,
+ 'contain' => null,
);
/**
@@ -82,13 +84,16 @@ protected function _findUser($username, $password) {
}
$result = ClassRegistry::init($userModel)->find('first', array(
'conditions' => $conditions,
- 'recursive' => (int)$this->settings['recursive']
+ 'recursive' => (int)$this->settings['recursive'],
+ 'contain' => $this->settings['contain'],
));
if (empty($result) || empty($result[$model])) {
return false;
}
- unset($result[$model][$fields['password']]);
- return $result[$model];
+ $user = $result[$model];
+ unset($user[$fields['password']]);
+ unset($result[$model]);
+ return array_merge($user, $result);
}
/**
@@ -50,6 +50,7 @@ class BasicAuthenticate extends BaseAuthenticate {
* - `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.
+ * - `contain` Extra models to contain and store in session.
* - `realm` The realm authentication is for. Defaults the server name.
*
* @var array
@@ -62,6 +63,7 @@ class BasicAuthenticate extends BaseAuthenticate {
'userModel' => 'User',
'scope' => array(),
'recursive' => 0,
+ 'contain' => null,
'realm' => '',
);
@@ -63,6 +63,8 @@ class DigestAuthenticate extends BaseAuthenticate {
* - `userModel` The model name of the User, defaults to User.
* - `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.
+ * - `contain` Extra models to contain and store in session.
* - `realm` The realm authentication is for, Defaults to the servername.
* - `nonce` A nonce used for authentication. Defaults to `uniqid()`.
* - `qop` Defaults to auth, no other values are supported at this time.
@@ -79,6 +81,7 @@ class DigestAuthenticate extends BaseAuthenticate {
'userModel' => 'User',
'scope' => array(),
'recursive' => 0,
+ 'contain' => null,
'realm' => '',
'qop' => 'auth',
'nonce' => '',