Repository: cloudstack Updated Branches: refs/heads/master b41a78ce0 -> 38928a44b
CLOUDSTACK-6323: Change getUser API arg to userapikey By default the getUser API picks apikey arg from HTTP request to return the User object with that api key. We use apikey in the request, so it would return the same user calling the API. This commit uses the USER_API_KEY in the API annotation instead. Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> (cherry picked from commit 72e06b4d9b40c42d28cc148a331c9c5461a10f6e) Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/38928a44 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/38928a44 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/38928a44 Branch: refs/heads/master Commit: 38928a44b595a7be1bf222b18154885195894f3f Parents: b41a78c Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Fri Aug 8 12:52:58 2014 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Fri Aug 8 12:55:13 2014 +0200 ---------------------------------------------------------------------- .../org/apache/cloudstack/api/command/admin/user/GetUserCmd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/38928a44/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java index b2c6734..d58f695 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java @@ -38,7 +38,7 @@ public class GetUserCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.API_KEY, type = CommandType.STRING, required = true, description = "API key of the user") + @Parameter(name = ApiConstants.USER_API_KEY, type = CommandType.STRING, required = true, description = "API key of the user") private String apiKey; /////////////////////////////////////////////////////
