Joel Johnson
2015-07-07 fd0fc5fc9a13456c4038d03cbc6c6b3beed38910
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.
2 files modified
5 ■■■■ changed files
src/main/java/com/gitblit/ConfigUserService.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/Constants.java 2 ●●● patch | view | raw | blame | history
src/main/java/com/gitblit/ConfigUserService.java
@@ -890,9 +890,6 @@
                    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);
src/main/java/com/gitblit/Constants.java
@@ -582,7 +582,7 @@
    }
    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()) {