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.

diff --git a/src/main/java/com/gitblit/ConfigUserService.java b/src/main/java/com/gitblit/ConfigUserService.java
index 200ec8a6560927f76e53327f538b7fcf052f6fc3..6d7230f715bdba63ff750fa05a4ff35cf6f3deff 100644 (file)
--- a/src/main/java/com/gitblit/ConfigUserService.java
+++ b/src/main/java/com/gitblit/ConfigUserService.java
@@ -890,9 +890,6 @@ public class ConfigUserService implements IUserService {
                                        user.displayName = config.getString(USER, username, DISPLAYNAME);\r
                                        user.emailAddress = config.getString(USER, username, EMAILADDRESS);\r
                                        user.accountType = AccountType.fromString(config.getString(USER, username, ACCOUNTTYPE));\r
-                                       if (Constants.EXTERNAL_ACCOUNT.equals(user.password) && user.accountType.isLocal()) {\r
-                                               user.accountType = AccountType.EXTERNAL;\r
-                                       }\r
                                        user.disabled = config.getBoolean(USER, username, DISABLED, false);\r
                                        user.organizationalUnit = config.getString(USER, username, ORGANIZATIONALUNIT);\r
                                        user.organization = config.getString(USER, username, ORGANIZATION);\r

diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index e925ee47e050356ffad0643633cdbd89016e860e..0a99953a626810a78a7a172c9a67ab743c8fa12c 100644 (file)
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -582,7 +582,7 @@ public class Constants {
        }\r
 \r
        public static enum AccountType {\r
-               LOCAL, EXTERNAL, CONTAINER, LDAP, REDMINE, SALESFORCE, WINDOWS, PAM, HTPASSWD, HTTPHEADER;\r
+               LOCAL, CONTAINER, LDAP, REDMINE, SALESFORCE, WINDOWS, PAM, HTPASSWD, HTTPHEADER;\r
 \r
                public static AccountType fromString(String value) {\r
                        for (AccountType type : AccountType.values()) {\r