Page MenuHomePhabricator
Files F14041015

D9284.id22318.diff
No OneTemporary
Actions

D9284.id22318.diff
View Options

diff --git a/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php b/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
--- a/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
+++ b/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
@@ -102,18 +102,9 @@
$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);
diff --git a/src/applications/auth/controller/PhabricatorEmailVerificationController.php b/src/applications/auth/controller/PhabricatorEmailVerificationController.php
--- a/src/applications/auth/controller/PhabricatorEmailVerificationController.php
+++ b/src/applications/auth/controller/PhabricatorEmailVerificationController.php
@@ -52,20 +52,10 @@
'This email address has already been verified.');
$continue = pht('Continue to Phabricator');
} else if ($request->isFormPost()) {
- $email->openTransaction();
- $email->setIsVerified(1);
- $email->save();
-
- // If the user just verified their primary email address, mark their
- // account as email verified.
- $user_primary = $user->loadPrimaryEmail();
- if ($user_primary->getID() == $email->getID()) {
- $user->setIsEmailVerified(1);
- $user->save();
- }
-
- $email->saveTransaction();
+ id(new PhabricatorUserEditor())
+ ->setActor($user)
+ ->verifyEmail($user, $email);
$title = pht('Address Verified');
$content = pht(
diff --git a/src/applications/people/editor/PhabricatorUserEditor.php b/src/applications/people/editor/PhabricatorUserEditor.php
--- a/src/applications/people/editor/PhabricatorUserEditor.php
+++ b/src/applications/people/editor/PhabricatorUserEditor.php
@@ -494,6 +494,65 @@
}
+ /**
+ * Verify a user's email address.
+ *
+ * This verifies an individual email address. If the address is the user's
+ * primary address and their account was not previously verified, their
+ * account is marked as email verified.
+ *
+ * @task email
+ */
+ public function verifyEmail(
+ PhabricatorUser $user,
+ PhabricatorUserEmail $email) {
+ $actor = $this->requireActor();
+
+ if (!$user->getID()) {
+ throw new Exception('User has not been created yet!');
+ }
+ if (!$email->getID()) {
+ throw new Exception('Email has not been created yet!');
+ }
+
+ $user->openTransaction();
+ $user->beginWriteLocking();
+
+ $user->reload();
+ $email->reload();
+
+ if ($email->getUserPHID() != $user->getPHID()) {
+ throw new Exception(pht('User does not own email!'));
+ }
+
+ if (!$email->getIsVerified()) {
+ $email->setIsVerified(1);
+ $email->save();
+
+ $log = PhabricatorUserLog::initializeNewLog(
+ $actor,
+ $user->getPHID(),
+ PhabricatorUserLog::ACTION_EMAIL_VERIFY);
+ $log->setNewValue($email->getAddress());
+ $log->save();
+ }
+
+ if (!$user->getIsEmailVerified()) {
+ // If the user just verified their primary email address, mark their
+ // account as email verified.
+ $user_primary = $user->loadPrimaryEmail();
+ if ($user_primary->getID() == $email->getID()) {
+ $user->setIsEmailVerified(1);
+ $user->save();
+ }
+ }
+
+ $user->endWriteLocking();
+ $user->saveTransaction();
+
+ }
+
+
/* -( Internals )---------------------------------------------------------- */
diff --git a/src/applications/people/storage/PhabricatorUserLog.php b/src/applications/people/storage/PhabricatorUserLog.php
--- a/src/applications/people/storage/PhabricatorUserLog.php
+++ b/src/applications/people/storage/PhabricatorUserLog.php
@@ -25,6 +25,7 @@
const ACTION_EMAIL_PRIMARY = 'email-primary';
const ACTION_EMAIL_REMOVE = 'email-remove';
const ACTION_EMAIL_ADD = 'email-add';
+ const ACTION_EMAIL_VERIFY = 'email-verify';
const ACTION_CHANGE_PASSWORD = 'change-password';
const ACTION_CHANGE_USERNAME = 'change-username';
@@ -67,6 +68,7 @@
self::ACTION_EMAIL_PRIMARY => pht('Email: Change Primary'),
self::ACTION_EMAIL_ADD => pht('Email: Add Address'),
self::ACTION_EMAIL_REMOVE => pht('Email: Remove Address'),
+ self::ACTION_EMAIL_VERIFY => pht('Email: Verify'),
self::ACTION_CHANGE_PASSWORD => pht('Change Password'),
self::ACTION_CHANGE_USERNAME => pht('Change Username'),
self::ACTION_ENTER_HISEC => pht('Hisec: Enter'),

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 12, 3:13 PM (1 d, 13 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6740604
Default Alt Text
D9284.id22318.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility