Sfoglia il codice sorgente

remove external account type in lieu of specific type

This was unused and causing provider lookup to fail in
AuthenticationManager.findProvider() by changing it out
from underneath. As a result, the supportXChanges methods
weren't being reported correctly.
tags/v1.8.0
Joel Johnson 9 anni fa
parent
commit
fd0fc5fc9a

+ 0
- 3
src/main/java/com/gitblit/ConfigUserService.java Vedi File

@@ -890,9 +890,6 @@ public class ConfigUserService implements IUserService {
user.displayName = config.getString(USER, username, DISPLAYNAME);
user.emailAddress = config.getString(USER, username, EMAILADDRESS);
user.accountType = AccountType.fromString(config.getString(USER, username, ACCOUNTTYPE));
if (Constants.EXTERNAL_ACCOUNT.equals(user.password) && user.accountType.isLocal()) {
user.accountType = AccountType.EXTERNAL;
}
user.disabled = config.getBoolean(USER, username, DISABLED, false);
user.organizationalUnit = config.getString(USER, username, ORGANIZATIONALUNIT);
user.organization = config.getString(USER, username, ORGANIZATION);

+ 1
- 1
src/main/java/com/gitblit/Constants.java Vedi File

@@ -582,7 +582,7 @@ public class Constants {
}
public static enum AccountType {
LOCAL, EXTERNAL, CONTAINER, LDAP, REDMINE, SALESFORCE, WINDOWS, PAM, HTPASSWD, HTTPHEADER;
LOCAL, CONTAINER, LDAP, REDMINE, SALESFORCE, WINDOWS, PAM, HTPASSWD, HTTPHEADER;
public static AccountType fromString(String value) {
for (AccountType type : AccountType.values()) {

Loading…
Annulla
Salva