Refactor user services and separate authentication (issue-281)

Change-Id: I336e005e02623fc5e11a4f8b4408bea5465a43fd

2 files changed, 3 insertions, 14 deletions

diff --git a/src/main/java/com/gitblit/client/EditTeamDialog.java b/src/main/java/com/gitblit/client/EditTeamDialog.java
index 3c0b928c..0b5b3505 100644
--- a/src/main/java/com/gitblit/client/EditTeamDialog.java
+++ b/src/main/java/com/gitblit/client/EditTeamDialog.java
@@ -146,7 +146,6 @@ public class EditTeamDialog extends JDialog {
 		final Insets _insets = new Insets(5, 5, 5, 5);

 		repositoryPalette = new RegistrantPermissionsPanel(RegistrantType.REPOSITORY);

 		userPalette = new JPalette<String>();

-		userPalette.setEnabled(settings.supportsTeamMembershipChanges);

 

 		JPanel fieldsPanelTop = new JPanel(new BorderLayout());

 		fieldsPanelTop.add(fieldsPanel, BorderLayout.NORTH);

diff --git a/src/main/java/com/gitblit/client/EditUserDialog.java b/src/main/java/com/gitblit/client/EditUserDialog.java
index fd5cf79d..2936a29d 100644
--- a/src/main/java/com/gitblit/client/EditUserDialog.java
+++ b/src/main/java/com/gitblit/client/EditUserDialog.java
@@ -161,18 +161,9 @@ public class EditUserDialog extends JDialog {
 		countryCodeField = new JTextField(anUser.countryCode == null ? "" : anUser.countryCode, 15);

 

 		// credentials are optionally controlled by 3rd-party authentication

-		usernameField.setEnabled(settings.supportsCredentialChanges);

-		passwordField.setEnabled(settings.supportsCredentialChanges);

-		confirmPasswordField.setEnabled(settings.supportsCredentialChanges);

-

-		displayNameField.setEnabled(settings.supportsDisplayNameChanges);

-		emailAddressField.setEnabled(settings.supportsEmailAddressChanges);

-

-		organizationalUnitField.setEnabled(settings.supportsDisplayNameChanges);

-		organizationField.setEnabled(settings.supportsDisplayNameChanges);

-		localityField.setEnabled(settings.supportsDisplayNameChanges);

-		stateProvinceField.setEnabled(settings.supportsDisplayNameChanges);

-		countryCodeField.setEnabled(settings.supportsDisplayNameChanges);

+		usernameField.setEnabled(anUser.isLocalAccount());

+		passwordField.setEnabled(anUser.isLocalAccount());

+		confirmPasswordField.setEnabled(anUser.isLocalAccount());

 

 		JPanel fieldsPanel = new JPanel(new GridLayout(0, 1));

 		fieldsPanel.add(newFieldPanel(Translation.get("gb.username"), usernameField));

@@ -196,7 +187,6 @@ public class EditUserDialog extends JDialog {
 		final Insets _insets = new Insets(5, 5, 5, 5);

 		repositoryPalette = new RegistrantPermissionsPanel(RegistrantType.REPOSITORY);

 		teamsPalette = new JPalette<TeamModel>();

-		teamsPalette.setEnabled(settings.supportsTeamMembershipChanges);

 

 		JPanel fieldsPanelTop = new JPanel(new BorderLayout());

 		fieldsPanelTop.add(fieldsPanel, BorderLayout.NORTH);