litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed the styling

Browse source
This commit is contained in:
AsimA 2018-05-18 16:40:08 +02:00
parent a8d5020ede
commit aeb9754500
13 changed files with 74 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

7
api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AuthenticatorStub.java
View file

@ -105,7 +105,8 @@ public class AuthenticatorStub extends Authenticator {
@Override
public boolean md5HashIsNull(UserAccount userAccount){
if(userAccount!=null) {
if (userAccount.getMd5Password().compareTo("") == 0 || userAccount.getMd5Password() == null)
if (userAccount.getMd5Password().compareTo("") == 0 ||
userAccount.getMd5Password() == null)
return true;
else
return false;
@ -123,8 +124,8 @@ public class AuthenticatorStub extends Authenticator {
if (clearTextPassword == null) {
return false;
}
return verifyArgon2iHash(userAccount.getArgon2Password(),clearTextPassword);
return verifyArgon2iHash(userAccount.getArgon2Password(),
clearTextPassword);
}

4
api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLoginTest.java
View file

@ -100,7 +100,6 @@ public class ProgramLoginTest extends AbstractTestClass {
.singleton(PermissionSets.URI_DBA));
user.setArgon2Password(Authenticator.applyArgon2iEncodingStub(password));
user.setMd5Password("");
//user.setMd5Password(Authenticator.applyMd5Encoding(password));
user.setLoginCount(loginCount);
user.setPasswordChangeRequired(loginCount == 0);
return user;
@ -181,15 +180,12 @@ public class ProgramLoginTest extends AbstractTestClass {
String newPassword) {
if (email != null) {
request.addParameter(PARAM_EMAIL_ADDRESS, email);
System.out.println("1");
}
if (password != null) {
request.addParameter(PARAM_PASSWORD, password);
System.out.println("2");
}
if (newPassword != null) {
request.addParameter(PARAM_NEW_PASSWORD, newPassword);
System.out.println("3");
}
try {

1
api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java
View file

@ -193,7 +193,6 @@ public class AuthenticateTest extends AbstractTestClass {
user.setPermissionSetUris(userInfo.permissionSetUris);
user.setArgon2Password(Authenticator.applyArgon2iEncodingStub(userInfo.password));
user.setMd5Password("");
// user.setMd5Password(Authenticator.applyMd5Encoding(userInfo.password));
user.setLoginCount(userInfo.loginCount);
user.setPasswordChangeRequired(userInfo.loginCount == 0);
return user;

3
api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java
View file

@ -104,7 +104,7 @@ public class UserAccountsDaoJenaTest extends AbstractTestClass {
0L, false, 1, 0L, Status.ACTIVE, "bboop", false, EMPTY, false,
collection(URI_PROFILE1, URI_PROFILE2));
userC = userAccount("", "ccallas@here", "Charlie", "Callas", "XXXX", "",
"YYYY", 0L, false, 1, 0L, Status.ACTIVE, "ccallas", false,
"YYYY", 0L, false, 1, 0L, Status.ACTIVE, "ccallas", false,
EMPTY, false, collection(URI_PROFILE2));
}
@ -392,7 +392,6 @@ public class UserAccountsDaoJenaTest extends AbstractTestClass {
ua.setLastName(lastName);
ua.setArgon2Password(argon2Password);
ua.setMd5Password("");
//ua.setMd5Password(md5Password);
ua.setOldPassword(oldPassword);
ua.setPasswordLinkExpires(passwordLinkExpires);
ua.setPasswordChangeRequired(passwordChangeRequired);