Archived
1
0
Fork 0

Merge branch '14-user-add-support-for-removing-account' into dev

This commit is contained in:
Henrik Hautakoski 2018-08-13 01:11:52 +02:00
commit 6d8025c5d6
No known key found for this signature in database
GPG key ID: 839F3A7EAFAEAFAA
7 changed files with 95 additions and 3 deletions

View file

@ -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());