You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2016/02/04 18:57:45 UTC
[21/50] [abbrv] usergrid git commit: USERGRID-1241: retrieve token
info only once
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 <md...@apigee.com>
Authored: Fri Jan 29 10:27:10 2016 -0800
Committer: Mike Dunker <md...@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 );