archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Conduit - return primary email if its verified in user methods

Browse Source 
Summary: Ref T7263. We need this in the oauth case and otherwise it makes sense to include.

Test Plan: used the conduit console and saw my email address included in the results!

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Maniphest Tasks: T7263

Differential Revision: https://secure.phabricator.com/D11791
This commit is contained in:
Bob Trahan
2015-02-17 14:13:49 -08:00
parent 81d2f2686c
commit d6bbbcb620
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/applications/people/conduit/UserConduitAPIMethod.php
View File

@@ -23,8 +23,10 @@ abstract class UserConduitAPIMethod extends ConduitAPIMethod {
$primary = $user->loadPrimaryEmail(); $primary = $user->loadPrimaryEmail();
if ($primary && $primary->getIsVerified()) { if ($primary && $primary->getIsVerified()) {
$email = $primary->getAddress();
$roles[] = 'verified'; $roles[] = 'verified';
} else { } else {
$email = null;
$roles[] = 'unverified'; $roles[] = 'unverified';
} }
@@ -37,12 +39,13 @@ abstract class UserConduitAPIMethod extends ConduitAPIMethod {
} }
$return = array( $return = array(
'phid' => $user->getPHID(), 'phid' => $user->getPHID(),
'userName' => $user->getUserName(), 'userName' => $user->getUserName(),
'realName' => $user->getRealName(), 'realName' => $user->getRealName(),
'image' => $user->getProfileImageURI(), 'primaryEmail' => $email,
'uri' => PhabricatorEnv::getURI('/p/'.$user->getUsername().'/'), 'image' => $user->getProfileImageURI(),
'roles' => $roles, 'uri' => PhabricatorEnv::getURI('/p/'.$user->getUsername().'/'),
'roles' => $roles,
); );
if ($current_status) { if ($current_status) {