diff options
| author | Joel Johnson <mrjoel@lixil.net> | 2015-07-07 16:31:39 -0600 |
|---|---|---|
| committer | Joel Johnson <mrjoel@lixil.net> | 2015-12-09 07:38:46 -0700 |
| commit | fd0fc5fc9a13456c4038d03cbc6c6b3beed38910 (patch) | |
| tree | 7ae44a7e2133d8731eff0554b313f6d4cdbaa926 | |
| parent | 0b298b78a7c1fcda7f799af0c045a6c2e829a6bf (diff) | |
| download | gitblit-fd0fc5fc9a13456c4038d03cbc6c6b3beed38910.tar.gz gitblit-fd0fc5fc9a13456c4038d03cbc6c6b3beed38910.zip | |
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.
| -rw-r--r-- | src/main/java/com/gitblit/ConfigUserService.java | 3 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/Constants.java | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/com/gitblit/ConfigUserService.java b/src/main/java/com/gitblit/ConfigUserService.java index 200ec8a6..6d7230f7 100644 --- 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);
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);
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java index e925ee47..0a99953a 100644 --- a/src/main/java/com/gitblit/Constants.java +++ b/src/main/java/com/gitblit/Constants.java @@ -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()) {
|