You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2015/10/30 18:00:33 UTC
[2/3] usergrid git commit: Rename endpoint to credentials to not
conflict with password reset on PUT
Rename endpoint to credentials to not conflict with password reset on PUT
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/437ac9b7
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/437ac9b7
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/437ac9b7
Branch: refs/heads/1.x
Commit: 437ac9b7b3bc9d765f0e99e9c4bb9061fa91b8e3
Parents: 07e4cc2
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Oct 29 12:37:31 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Oct 29 12:37:31 2015 -0600
----------------------------------------------------------------------
.../apache/usergrid/rest/applications/users/UserResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/437ac9b7/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java
index 5fa67af..1839b87 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java
@@ -164,8 +164,8 @@ public class UserResource extends ServiceResource {
@GET
@RequireSystemAccess
- @Path("password")
- public JSONWithPadding getUserPassword(@QueryParam("callback") @DefaultValue("callback") String callback )
+ @Path("credentials")
+ public JSONWithPadding getUserCredentials(@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
logger.info( "UserResource.setUserPassword" );