usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject usergrid git commit: Addresses comments in review
Date Fri, 30 Oct 2015 16:52:06 GMT
Repository: usergrid
Updated Branches:
  refs/heads/USERGRID-1079-2x ba629da57 -> 3d1205784


Addresses comments in review


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/3d120578
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3d120578
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3d120578

Branch: refs/heads/USERGRID-1079-2x
Commit: 3d1205784528b5026695910943243a7a38fcbdde
Parents: ba629da
Author: Todd Nine <tnine@apigee.com>
Authored: Fri Oct 30 10:51:58 2015 -0600
Committer: Todd Nine <tnine@apigee.com>
Committed: Fri Oct 30 10:51:58 2015 -0600

----------------------------------------------------------------------
 .../apache/usergrid/rest/applications/users/UserResource.java  | 6 +++---
 .../rest/applications/collection/users/UserResourceIT.java     | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/3d120578/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 1116469..fb2962e 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
@@ -173,11 +173,11 @@ public class UserResource extends ServiceResource {
     public JSONWithPadding getUserCredentials(@QueryParam("callback") @DefaultValue("callback")
String callback )
             throws Exception {
 
-        logger.info( "UserResource.setUserPassword" );
+        logger.info( "UserResource.getUserCredentials" );
 
 
         final ApiResponse response = createApiResponse();
-        response.setAction( "get user password" );
+        response.setAction( "get user credentials" );
 
         final UUID applicationId = getApplicationId();
         final UUID targetUserId = getUserUuid();
@@ -210,7 +210,7 @@ public class UserResource extends ServiceResource {
                                                @QueryParam("callback") @DefaultValue("callback")
String callback )
             throws Exception {
 
-        logger.info( "UserResource.setUserPassword" );
+        logger.info( "UserResource.setUserCredentials" );
 
         if ( json == null ) {
             return null;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/3d120578/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
index deda5eb..f258f94 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
@@ -1154,7 +1154,6 @@ public class UserResourceIT extends AbstractRestIT {
         //here we modify the hash a little, this way we can break password validation, then
re-set it to ensure we're actually updating the credentials info correctly.
         final String borkedSecret = originalSecret.substring( 0, originalSecret.length()
-1 );
 
-        credentials.put( "credentials", borkedSecret );
         credentials.put( "secret", borkedSecret );
 
         //now PUT it
@@ -1192,7 +1191,6 @@ public class UserResourceIT extends AbstractRestIT {
         //now put the correct one
 
 
-        credentials.put( "credentials", originalSecret );
         credentials.put( "secret", originalSecret );
 
 


Mime
View raw message