Skip to content

Commit 6f6f9f0

Browse files
rafapraxbrianchandotcom
authored andcommitted
LPD-43475 Rename for consistency
1 parent 9ce8b8d commit 6f6f9f0

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/BCryptPasswordEncryptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public String encrypt(
5858
}
5959

6060
@Override
61-
public String getEncryptionAlgorithmConfiguration(
61+
public String getEncryptedPasswordAlgorithmSettings(
6262
String encryptedPassword) {
6363

6464
String rounds = String.valueOf(_ROUNDS);

modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/PBKDF2PasswordEncryptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public String encrypt(
9393
}
9494

9595
@Override
96-
public String getEncryptionAlgorithmConfiguration(
96+
public String getEncryptedPasswordAlgorithmSettings(
9797
String encryptedPassword) {
9898

9999
try {

modules/apps/user/user-test/src/testIntegration/java/com/liferay/user/service/test/UserLocalServiceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,7 @@ private void _assertUserHasPasswordPolicy(boolean ldapUser, User user)
15261526

15271527
Assert.assertEquals(
15281528
oldPasswordsEncryptionAlgorithm,
1529-
PasswordEncryptorUtil.getEncryptionAlgorithmConfiguration(
1529+
PasswordEncryptorUtil.getEncryptedPasswordAlgorithmSettings(
15301530
user.getPassword()));
15311531
}
15321532

@@ -1551,7 +1551,7 @@ private void _assertUserHasPasswordPolicy(boolean ldapUser, User user)
15511551

15521552
Assert.assertEquals(
15531553
newPasswordsEncryptionAlgorithm,
1554-
PasswordEncryptorUtil.getEncryptionAlgorithmConfiguration(
1554+
PasswordEncryptorUtil.getEncryptedPasswordAlgorithmSettings(
15551555
user.getPassword()));
15561556
}
15571557
}

portal-impl/src/com/liferay/portal/service/impl/UserLocalServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6108,7 +6108,7 @@ else if ((authResult == Authenticator.SUCCESS) &&
61086108
if (authenticated) {
61096109
if (!StringUtil.equalsIgnoreCase(
61106110
PasswordEncryptorUtil.
6111-
getEncryptionAlgorithmConfiguration(
6111+
getEncryptedPasswordAlgorithmSettings(
61126112
user.getPassword()),
61136113
_PASSWORDS_ENCRYPTION_ALGORITHM)) {
61146114

portal-kernel/src/com/liferay/portal/kernel/security/pwd/PasswordEncryptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public String encrypt(
5151
String encryptedPassword, boolean upgradeHashSecurity)
5252
throws PwdEncryptorException;
5353

54-
public default String getEncryptionAlgorithmConfiguration(
54+
public default String getEncryptedPasswordAlgorithmSettings(
5555
String encryptedPassword) {
5656

5757
return encryptedPassword.substring(

portal-kernel/src/com/liferay/portal/kernel/security/pwd/PasswordEncryptorUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ public static String encrypt(
8080
return _encrypt(algorithm, plainTextPassword, encryptedPassword, false);
8181
}
8282

83-
public static String getEncryptionAlgorithmConfiguration(
83+
public static String getEncryptedPasswordAlgorithmSettings(
8484
String encryptedPassword) {
8585

8686
PasswordEncryptor passwordEncryptor = _select(
8787
_getEncryptedPasswordAlgorithm(encryptedPassword));
8888

89-
return passwordEncryptor.getEncryptionAlgorithmConfiguration(
89+
return passwordEncryptor.getEncryptedPasswordAlgorithmSettings(
9090
encryptedPassword);
9191
}
9292

0 commit comments

Comments
 (0)