Skip to content

Fixes in change password, update_user, validate_user #3

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes in change password, update_user, validate_user #3

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions classes/auth/login/mongoauth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,12 @@ public function mongo_hash_password($password, $salt) {
}

/**
* Login user
* Check the user exists before logging in
*
* @param string
* @param string
* @return bool
*/
public function login($email = '', $password = '') {

public function validate_user($email = '', $password = '')
{
$email = trim($email) ? : trim(\Input::post(\Config::get('mongoauth.email_post_key', 'email')));
$password = trim($password) ? : trim(\Input::post(\Config::get('mongoauth.password_post_key', 'password')));

Expand All @@ -174,7 +172,21 @@ public function login($email = '', $password = '') {
if ($password != $this->user['password']) {
return false;
}
} else {
}
return $this->user;
}

/**
* Login user
*
* @param string
* @param string
* @return bool
*/
public function login($email = '', $password = '') {

if ( ! ($this->user = $this->validate_user($email, $password)))
{
$this->user = \Config::get('mongoauth.guest_login', true) ? static::$guest_login : false;
\Session::delete('email');
\Session::delete('login_hash');
Expand Down Expand Up @@ -288,19 +300,18 @@ public function create_user($fields, $group = 1) {
public function update_user($values, $email = null) {
$email = $email ? : $this->user['email'];

$email = filter_var(trim($values['email']), FILTER_VALIDATE_EMAIL);
$email_val = filter_var(trim($email), FILTER_VALIDATE_EMAIL);

if (!$email) {
if (!$email_val) {
throw new \MongoUserUpdateException('Email address is not valid');
}

$current_values = \Mongo_Db::instance(\Config::get('mongoauth.db_config'))
->select(\Config::get('mongoauth.fields'))
->where(
array(
'email' => $email
))
->get_one('mongoauth.collection');
->get_one(\Config::get('mongoauth.collection'));

if (empty($current_values)) {
throw new \MongoUserUpdateException('Email not found');
Expand All @@ -312,7 +323,7 @@ public function update_user($values, $email = null) {
}
if (array_key_exists('password', $values)) {
if (empty($values['old_password'])
or $current_values['password'] != $this->hash_password(trim($values['old_password']), $current_values['salt'])) {
or $current_values['password'] != $this->mongo_hash_password(trim($values['old_password']), $current_values['salt'])) {
throw new \MongoUserWrongPassword('Old password is invalid');
}

Expand Down Expand Up @@ -355,7 +366,7 @@ public function update_user($values, $email = null) {
array(
'email' => $email
))
->update('mongoauth.collection', $update);
->update(\Config::get('mongoauth.collection'), $update);

// Refresh user
if ($this->user['email'] == $email) {
Expand All @@ -365,7 +376,7 @@ public function update_user($values, $email = null) {
array(
'email' => $email
))
->get_one('mongoauth.collection');
->get_one(\Config::get('mongoauth.collection'));
}

return $success;
Expand Down Expand Up @@ -415,7 +426,7 @@ public function reset_password($email) {
throw new \MongoUserUpdateException('Failed to reset password, user was invalid.');
}

return $user['password'];
return $user['password'];
}

/**
Expand Down