Move email verification into PhabricatorUserEditor

Summary: Both email verify and welcome links now verify email, centralize them and record them in the user activity log.

Test Plan:
  - Followed a "verify email" link and got verified.
  - Followed a "welcome" (verifying) link.
  - Followed a "reset" (non-verifying) link.
  - Looked in the activity log for the verifications.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Differential Revision: https://secure.phabricator.com/D9284
This commit is contained in:
epriestley
2014-06-03 16:45:18 -07:00
parent 09d306b5b1
commit 83112cc2e8
4 changed files with 67 additions and 25 deletions

View File

@@ -102,18 +102,9 @@ final class PhabricatorAuthOneTimeLoginController
$token->delete();
if ($target_email) {
$target_user->openTransaction();
$target_email->setIsVerified(1);
$target_email->save();
// If this was the user's primary email address, also mark their
// account as verified.
$primary_email = $target_user->loadPrimaryEmail();
if ($primary_email->getID() == $target_email->getID()) {
$target_user->setIsEmailVerified(1);
$target_user->save();
}
$target_user->saveTransaction();
id(new PhabricatorUserEditor())
->setActor($target_user)
->verifyEmail($target_user, $target_email);
}
unset($unguarded);