mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-19 03:50:54 +01:00
Add a "roles" array to user.query
Summary: - Add "role" information, so clients can identify disabled users. - Formally deprecate `user.info` Test Plan: Ran "user.query" and "user.whoami", inspected output. Verified "user.info" appears as deprecated in method list and console. Reviewers: csilvers, btrahan Reviewed By: csilvers CC: aran Differential Revision: https://secure.phabricator.com/D2565
This commit is contained in:
parent
0ddfd0b4fb
commit
2f138d0501
2 changed files with 21 additions and 1 deletions
|
@ -25,12 +25,24 @@ abstract class ConduitAPI_user_Method extends ConduitAPIMethod {
|
||||||
PhabricatorUser $user,
|
PhabricatorUser $user,
|
||||||
PhabricatorUserStatus $current_status = null) {
|
PhabricatorUserStatus $current_status = null) {
|
||||||
|
|
||||||
|
$roles = array();
|
||||||
|
if ($user->getIsDisabled()) {
|
||||||
|
$roles[] = 'disabled';
|
||||||
|
}
|
||||||
|
if ($user->getIsSystemAgent()) {
|
||||||
|
$roles[] = 'agent';
|
||||||
|
}
|
||||||
|
if ($user->getIsAdmin()) {
|
||||||
|
$roles[] = 'admin';
|
||||||
|
}
|
||||||
|
|
||||||
$return = array(
|
$return = array(
|
||||||
'phid' => $user->getPHID(),
|
'phid' => $user->getPHID(),
|
||||||
'userName' => $user->getUserName(),
|
'userName' => $user->getUserName(),
|
||||||
'realName' => $user->getRealName(),
|
'realName' => $user->getRealName(),
|
||||||
'image' => $user->loadProfileImageURI(),
|
'image' => $user->loadProfileImageURI(),
|
||||||
'uri' => PhabricatorEnv::getURI('/p/'.$user->getUsername().'/'),
|
'uri' => PhabricatorEnv::getURI('/p/'.$user->getUsername().'/'),
|
||||||
|
'roles' => $roles,
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($current_status) {
|
if ($current_status) {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright 2011 Facebook, Inc.
|
* Copyright 2012 Facebook, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -22,6 +22,14 @@
|
||||||
final class ConduitAPI_user_info_Method
|
final class ConduitAPI_user_info_Method
|
||||||
extends ConduitAPI_user_Method {
|
extends ConduitAPI_user_Method {
|
||||||
|
|
||||||
|
public function getMethodStatus() {
|
||||||
|
return self::METHOD_STATUS_DEPRECATED;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getMethodStatusDescription() {
|
||||||
|
return "Replaced by 'user.query'.";
|
||||||
|
}
|
||||||
|
|
||||||
public function getMethodDescription() {
|
public function getMethodDescription() {
|
||||||
return "Retrieve information about a user by PHID.";
|
return "Retrieve information about a user by PHID.";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue