=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java 2014-09-24 09:23:28 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java 2014-09-25 07:29:20 +0000
@@ -248,7 +248,7 @@
public boolean restore( UserCredentials credentials, String token, String code, String newPassword, RestoreType restoreType )
{
if ( credentials == null || token == null || code == null || newPassword == null
- || !canRestoreNow( credentials, token, code, restoreType ) )
+ || !canRestore( credentials, token, code, restoreType ) )
{
return false;
}
@@ -268,15 +268,15 @@
return true;
}
- public boolean canRestoreNow( UserCredentials credentials, String token, String code, RestoreType restoreType )
+ public boolean canRestore( UserCredentials credentials, String token, String code, RestoreType restoreType )
{
- String logInfoPrefix = "Restore User " + credentials.getUid() + " " + credentials.getUsername();
+ String logPrefix = "Restore user: " + credentials.getUid() + ", username: " + credentials.getUsername();
String errorMessage = verifyToken( credentials, token, restoreType );
if ( errorMessage != null )
{
- log.info( logInfoPrefix + " verifyToken() failed: " + errorMessage );
+ log.info( logPrefix + " verifyToken() failed: " + errorMessage );
return false;
}
@@ -291,11 +291,11 @@
if ( errorMessage != null )
{
- log.info( logInfoPrefix + " canRestore() failed: " + errorMessage + "." );
+ log.info( logPrefix + " canRestore() failed: " + errorMessage );
return false;
}
- log.info( logInfoPrefix + " success." );
+ log.info( logPrefix + " success" );
return true;
}
@@ -307,11 +307,11 @@
*
* - credentials_parameter_is_null
* - token_parameter_is_null
- * - restoreType_parameter_is_null
+ * - restore_type_parameter_is_null
* - cannnot_parse_restore_options ...
* - wrong_prefix_for_restore_type ...
* - could_not_verify_token ...
- * - restoreToken_does_not_match_supplied_token
+ * - restore_token_does_not_match_supplied_token
*
*
* @param credentials the user credentials.
@@ -333,7 +333,7 @@
if ( restoreType == null )
{
- return "restoreType_parameter_is_null";
+ return "restore_type_parameter_is_null";
}
RestoreOptions restoreOptions = RestoreOptions.getRestoreOptions( token );
@@ -357,10 +357,10 @@
if ( !credentials.getRestoreToken().equals( encodedToken ) )
{
- return "restoreToken_does_not_match_supplied_token " + token;
+ return "restore_token_does_not_match_supplied_token " + token;
}
- return null; // Success.
+ return null;
}
@Override
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/SecurityService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/SecurityService.java 2014-09-24 06:56:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/SecurityService.java 2014-09-25 07:29:20 +0000
@@ -111,7 +111,7 @@
* @param restoreType type of restore operation (e.g. pw recovery, invite).
* @return true or false.
*/
- boolean canRestoreNow( UserCredentials credentials, String token, String code, RestoreType restoreType );
+ boolean canRestore( UserCredentials credentials, String token, String code, RestoreType restoreType );
/**
* Tests whether the given token in combination with the given user name is
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AccountController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AccountController.java 2014-09-17 07:03:32 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AccountController.java 2014-09-25 07:29:20 +0000
@@ -232,7 +232,7 @@
return;
}
- boolean canRestore = securityService.canRestoreNow( credentials, inviteToken, inviteCode, RestoreType.INVITE );
+ boolean canRestore = securityService.canRestore( credentials, inviteToken, inviteCode, RestoreType.INVITE );
if ( !canRestore )
{