Support to get/set/delete the full name of an account via REST
Change-Id: I248033b4121641f5035aabada4f11a99fb6934a5 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
committed by
Gerrit Code Review
parent
77e974c707
commit
b6df03968d
@@ -80,6 +80,87 @@ returned that describes the created account.
|
|||||||
}
|
}
|
||||||
----
|
----
|
||||||
|
|
||||||
|
[[get-account-name]]
|
||||||
|
Get Account Name
|
||||||
|
~~~~~~~~~~~~~~~~
|
||||||
|
[verse]
|
||||||
|
'GET /accounts/link:#account-id[\{account-id\}]/name'
|
||||||
|
|
||||||
|
Retrieves the full name of an account.
|
||||||
|
|
||||||
|
.Request
|
||||||
|
----
|
||||||
|
GET /accounts/self/name HTTP/1.0
|
||||||
|
----
|
||||||
|
|
||||||
|
.Response
|
||||||
|
----
|
||||||
|
HTTP/1.1 200 OK
|
||||||
|
Content-Disposition: attachment
|
||||||
|
Content-Type: application/json;charset=UTF-8
|
||||||
|
|
||||||
|
)]}'
|
||||||
|
"John Doe"
|
||||||
|
----
|
||||||
|
|
||||||
|
If the account does not have a name an empty string is returned.
|
||||||
|
|
||||||
|
[[set-account-name]]
|
||||||
|
Set Account Name
|
||||||
|
~~~~~~~~~~~~~~~~
|
||||||
|
[verse]
|
||||||
|
'PUT /accounts/link:#account-id[\{account-id\}]/name'
|
||||||
|
|
||||||
|
Sets the full name of an account.
|
||||||
|
|
||||||
|
The new account name must be provided in the request body inside
|
||||||
|
a link:#account-name-input[AccountNameInput] entity.
|
||||||
|
|
||||||
|
.Request
|
||||||
|
----
|
||||||
|
PUT /accounts/self/name HTTP/1.0
|
||||||
|
Content-Type: application/json;charset=UTF-8
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "John F. Doe"
|
||||||
|
}
|
||||||
|
----
|
||||||
|
|
||||||
|
As response the new account name is returned.
|
||||||
|
|
||||||
|
.Response
|
||||||
|
----
|
||||||
|
HTTP/1.1 200 OK
|
||||||
|
Content-Disposition: attachment
|
||||||
|
Content-Type: application/json;charset=UTF-8
|
||||||
|
|
||||||
|
)]}'
|
||||||
|
"John F. Doe"
|
||||||
|
----
|
||||||
|
|
||||||
|
If the name was deleted the response is "`204 No Content`".
|
||||||
|
|
||||||
|
Some realms may not allow to modify the account name. In this case the
|
||||||
|
request is rejected with "`405 Method Not Allowed`".
|
||||||
|
|
||||||
|
[[delete-account-name]]
|
||||||
|
Delete Account Name
|
||||||
|
~~~~~~~~~~~~~~~~~~~
|
||||||
|
[verse]
|
||||||
|
'DELETE /accounts/link:#account-id[\{account-id\}]/name'
|
||||||
|
|
||||||
|
Deletes the name of an account.
|
||||||
|
|
||||||
|
.Request
|
||||||
|
----
|
||||||
|
DELETE /accounts/self/name HTTP/1.0
|
||||||
|
----
|
||||||
|
|
||||||
|
.Response
|
||||||
|
----
|
||||||
|
HTTP/1.1 204 No Content
|
||||||
|
----
|
||||||
|
|
||||||
[[list-account-capabilities]]
|
[[list-account-capabilities]]
|
||||||
List Account Capabilities
|
List Account Capabilities
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
@@ -484,6 +565,19 @@ A list of link:rest-api-groups.html#group-id[group IDs] that identify
|
|||||||
the groups to which the user should be added.
|
the groups to which the user should be added.
|
||||||
|============================
|
|============================
|
||||||
|
|
||||||
|
[[account-name-input]]
|
||||||
|
AccountNameInput
|
||||||
|
~~~~~~~~~~~~~~~~
|
||||||
|
The `AccountNameInput` entity contains information for setting a name
|
||||||
|
for an account.
|
||||||
|
|
||||||
|
[options="header",width="50%",cols="1,^2,4"]
|
||||||
|
|=============================
|
||||||
|
|Field Name ||Description
|
||||||
|
|`name` |optional|The new full name of the account. +
|
||||||
|
If not set or if set to an empty string, the account name is deleted.
|
||||||
|
|=============================
|
||||||
|
|
||||||
[[capability-info]]
|
[[capability-info]]
|
||||||
CapabilityInfo
|
CapabilityInfo
|
||||||
~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~
|
||||||
|
|||||||
@@ -17,4 +17,13 @@ package com.google.gerrit.extensions.restapi;
|
|||||||
/** Method is not acceptable on the resource (HTTP 405 Method Not Allowed). */
|
/** Method is not acceptable on the resource (HTTP 405 Method Not Allowed). */
|
||||||
public class MethodNotAllowedException extends RestApiException {
|
public class MethodNotAllowedException extends RestApiException {
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
public MethodNotAllowedException() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param msg error text for client describing why the method is not allowed. */
|
||||||
|
public MethodNotAllowedException(String msg) {
|
||||||
|
super(msg);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
// Copyright (C) 2013 The Android Open Source Project
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package com.google.gerrit.server.account;
|
||||||
|
|
||||||
|
import com.google.common.base.Strings;
|
||||||
|
import com.google.gerrit.extensions.restapi.RestReadView;
|
||||||
|
|
||||||
|
public class GetName implements RestReadView<AccountResource> {
|
||||||
|
@Override
|
||||||
|
public String apply(AccountResource rsrc) {
|
||||||
|
return Strings.nullToEmpty(rsrc.getUser().getAccount().getFullName());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -32,6 +32,9 @@ public class Module extends RestApiModule {
|
|||||||
|
|
||||||
put(ACCOUNT_KIND).to(PutAccount.class);
|
put(ACCOUNT_KIND).to(PutAccount.class);
|
||||||
get(ACCOUNT_KIND).to(GetAccount.class);
|
get(ACCOUNT_KIND).to(GetAccount.class);
|
||||||
|
get(ACCOUNT_KIND, "name").to(GetName.class);
|
||||||
|
put(ACCOUNT_KIND, "name").to(PutName.class);
|
||||||
|
delete(ACCOUNT_KIND, "name").to(PutName.class);
|
||||||
get(ACCOUNT_KIND, "avatar").to(GetAvatar.class);
|
get(ACCOUNT_KIND, "avatar").to(GetAvatar.class);
|
||||||
get(ACCOUNT_KIND, "avatar.change.url").to(GetAvatarChangeUrl.class);
|
get(ACCOUNT_KIND, "avatar.change.url").to(GetAvatarChangeUrl.class);
|
||||||
child(ACCOUNT_KIND, "capabilities").to(Capabilities.class);
|
child(ACCOUNT_KIND, "capabilities").to(Capabilities.class);
|
||||||
|
|||||||
@@ -0,0 +1,84 @@
|
|||||||
|
// Copyright (C) 2013 The Android Open Source Project
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package com.google.gerrit.server.account;
|
||||||
|
|
||||||
|
import com.google.common.base.Strings;
|
||||||
|
import com.google.gerrit.extensions.restapi.AuthException;
|
||||||
|
import com.google.gerrit.extensions.restapi.DefaultInput;
|
||||||
|
import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
|
||||||
|
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
|
||||||
|
import com.google.gerrit.extensions.restapi.Response;
|
||||||
|
import com.google.gerrit.extensions.restapi.RestModifyView;
|
||||||
|
import com.google.gerrit.reviewdb.client.Account;
|
||||||
|
import com.google.gerrit.reviewdb.client.Account.FieldName;
|
||||||
|
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||||
|
import com.google.gerrit.server.CurrentUser;
|
||||||
|
import com.google.gerrit.server.IdentifiedUser;
|
||||||
|
import com.google.gerrit.server.account.PutName.Input;
|
||||||
|
import com.google.gwtorm.server.OrmException;
|
||||||
|
import com.google.inject.Inject;
|
||||||
|
import com.google.inject.Provider;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
|
|
||||||
|
public class PutName implements RestModifyView<AccountResource, Input> {
|
||||||
|
static class Input {
|
||||||
|
@DefaultInput
|
||||||
|
String name;
|
||||||
|
}
|
||||||
|
|
||||||
|
private final Provider<CurrentUser> self;
|
||||||
|
private final Realm realm;
|
||||||
|
private final Provider<ReviewDb> dbProvider;
|
||||||
|
private final AccountCache byIdCache;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
PutName(Provider<CurrentUser> self, Realm realm,
|
||||||
|
Provider<ReviewDb> dbProvider, AccountCache byIdCache) {
|
||||||
|
this.self = self;
|
||||||
|
this.realm = realm;
|
||||||
|
this.dbProvider = dbProvider;
|
||||||
|
this.byIdCache = byIdCache;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object apply(AccountResource rsrc, Input input) throws AuthException,
|
||||||
|
MethodNotAllowedException, ResourceNotFoundException, OrmException {
|
||||||
|
IdentifiedUser s = (IdentifiedUser) self.get();
|
||||||
|
if (s.getAccountId().get() != rsrc.getUser().getAccountId().get()
|
||||||
|
&& !self.get().getCapabilities().canAdministrateServer()) {
|
||||||
|
throw new AuthException("not allowed to change name");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!realm.allowsEdit(FieldName.FULL_NAME)) {
|
||||||
|
throw new MethodNotAllowedException("The realm doesn't allow editing names");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (input == null) {
|
||||||
|
input = new Input();
|
||||||
|
}
|
||||||
|
|
||||||
|
Account a = dbProvider.get().accounts().get(rsrc.getUser().getAccountId());
|
||||||
|
if (a == null) {
|
||||||
|
throw new ResourceNotFoundException("No such account: "
|
||||||
|
+ rsrc.getUser().getAccountId());
|
||||||
|
}
|
||||||
|
a.setFullName(input.name);
|
||||||
|
dbProvider.get().accounts().update(Collections.singleton(a));
|
||||||
|
byIdCache.evict(a.getId());
|
||||||
|
return Strings.isNullOrEmpty(a.getFullName()) ?
|
||||||
|
Response.none() : a.getFullName();
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user