Skip to content

Commit

Permalink
remove external account type in lieu of specific type
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mrjoel committed Dec 9, 2015
1 parent 0b298b7 commit fd0fc5f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions src/main/java/com/gitblit/ConfigUserService.java
Expand Up @@ -890,9 +890,6 @@ protected synchronized void read() {
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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gitblit/Constants.java
Expand Up @@ -582,7 +582,7 @@ public boolean isStandard() {
}

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()) {
Expand Down

0 comments on commit fd0fc5f

Please sign in to comment.