Merge branch '14-user-add-support-for-removing-account' into dev
This commit is contained in:
commit
6d8025c5d6
7 changed files with 95 additions and 3 deletions
|
|
@ -58,6 +58,13 @@ class Auth extends Component
|
|||
return $user->getMessages();
|
||||
}
|
||||
}
|
||||
// Here we activate the user.
|
||||
// As for OAuth we perform registration if the user does not exist.
|
||||
// We should therefore activate deleted accounts.
|
||||
else if ($user->Status == User::STATUS_DELETED) {
|
||||
$user->Status = User::STATUS_ACTIVE;
|
||||
$user->save();
|
||||
}
|
||||
|
||||
$this->setIdentity($user->getId());
|
||||
|
||||
|
|
|
|||
Reference in a new issue