usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [21/50] [abbrv] usergrid git commit: USERGRID-1241: retrieve token info only once
Date Thu, 04 Feb 2016 17:57:45 GMT
USERGRID-1241: retrieve token info only once


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

Branch: refs/heads/asf-site
Commit: a434b523eca4d234a8f3b078cefcf930c127bb15
Parents: 27b60fe
Author: Mike Dunker <mdunker@apigee.com>
Authored: Fri Jan 29 10:27:10 2016 -0800
Committer: Mike Dunker <mdunker@apigee.com>
Committed: Fri Jan 29 10:27:10 2016 -0800

----------------------------------------------------------------------
 .../org/apache/usergrid/rest/management/users/UserResource.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/a434b523/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
index 185559e..11dd9d4 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
@@ -223,7 +223,7 @@ public class UserResource extends AbstractContextResource {
                 organizationId = tokenInfo.getWorkflowOrgId();
             }
 
-            if ( management.checkPasswordResetTokenForAdminUser( user.getUuid(), token )
) {
+            if ( management.checkPasswordResetTokenForAdminUser( user.getUuid(), tokenInfo
) ) {
                 return handleViewable( "resetpw_set_form", this, organizationId );
             }
             else {
@@ -276,7 +276,7 @@ public class UserResource extends AbstractContextResource {
             //      }
 
             if ( ( password1 != null ) || ( password2 != null ) ) {
-                if ( management.checkPasswordResetTokenForAdminUser( user.getUuid(), token
) ) {
+                if ( management.checkPasswordResetTokenForAdminUser( user.getUuid(), tokenInfo
) ) {
                     if ( ( password1 != null ) && password1.equals( password2 ) )
{
                         management.setAdminUserPassword( user.getUuid(), password1 );
                         management.revokeAccessTokenForAdminUser( user.getUuid(), token );


Mime
View raw message