Eliminate Gravatar profile linking and improve api

James Moger

2014-03-03 94e12c168f5eec300fd23d0de25c7dc93a96c429

 src/main/java/com/gitblit/client/EditUserDialog.java

@@ -47,6 +47,7 @@
import javax.swing.JTextField;

import javax.swing.KeyStroke;



import com.gitblit.Constants;

import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.Constants.PermissionType;

@@ -57,7 +58,6 @@
import com.gitblit.models.ServerSettings;

import com.gitblit.models.TeamModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.ModelUtils;

import com.gitblit.utils.StringUtils;



public class EditUserDialog extends JDialog {

@@ -79,29 +79,29 @@
   private JPasswordField passwordField;



   private JPasswordField confirmPasswordField;

	


   private JTextField displayNameField;

	


   private JTextField emailAddressField;



   private JCheckBox canAdminCheckbox;

	


   private JCheckBox canForkCheckbox;

	


   private JCheckBox canCreateCheckbox;



   private JCheckBox notFederatedCheckbox;

	


   private JTextField organizationalUnitField;

	


   private JTextField organizationField;



   private JTextField localityField;

	


   private JTextField stateProvinceField;

	


   private JTextField countryCodeField;

	


   private RegistrantPermissionsPanel repositoryPalette;



   private JPalette<TeamModel> teamsPalette;

@@ -132,6 +132,7 @@
      KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);

      JRootPane rootPane = new JRootPane();

      rootPane.registerKeyboardAction(new ActionListener() {

         @Override

         public void actionPerformed(ActionEvent actionEvent) {

            setVisible(false);

         }

@@ -146,32 +147,23 @@
            25);

      displayNameField = new JTextField(anUser.displayName == null ? "" : anUser.displayName, 25);

      emailAddressField = new JTextField(anUser.emailAddress == null ? "" : anUser.emailAddress, 25);

      canAdminCheckbox = new JCheckBox(Translation.get("gb.canAdminDescription"), anUser.canAdmin);		
      canAdminCheckbox = new JCheckBox(Translation.get("gb.canAdminDescription"), anUser.canAdmin);

      canForkCheckbox = new JCheckBox(Translation.get("gb.canForkDescription"), anUser.canFork);

      canCreateCheckbox = new JCheckBox(Translation.get("gb.canCreateDescription"), anUser.canCreate);

      notFederatedCheckbox = new JCheckBox(

            Translation.get("gb.excludeFromFederationDescription"),

            anUser.excludeFromFederation);

		


      organizationalUnitField = new JTextField(anUser.organizationalUnit == null ? "" : anUser.organizationalUnit, 25);

      organizationField = new JTextField(anUser.organization == null ? "" : anUser.organization, 25);

      localityField = new JTextField(anUser.locality == null ? "" : anUser.locality, 25);

      stateProvinceField = new JTextField(anUser.stateProvince == null ? "" : anUser.stateProvince, 25);

      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);

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

      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));

@@ -191,11 +183,10 @@
      attributesPanel.add(newFieldPanel(Translation.get("gb.locality") + " (L)", localityField));

      attributesPanel.add(newFieldPanel(Translation.get("gb.stateProvince") + " (ST)", stateProvinceField));

      attributesPanel.add(newFieldPanel(Translation.get("gb.countryCode") + " (C)", countryCodeField));

		


      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);

@@ -207,6 +198,7 @@


         private static final long serialVersionUID = 1L;



         @Override

         public Insets getInsets() {

            return _insets;

         }

@@ -217,6 +209,7 @@


         private static final long serialVersionUID = 1L;



         @Override

         public Insets getInsets() {

            return _insets;

         }

@@ -233,6 +226,7 @@


      JButton createButton = new JButton(Translation.get("gb.save"));

      createButton.addActionListener(new ActionListener() {

         @Override

         public void actionPerformed(ActionEvent event) {

            if (validateFields()) {

               canceled = false;

@@ -243,6 +237,7 @@


      JButton cancelButton = new JButton(Translation.get("gb.cancel"));

      cancelButton.addActionListener(new ActionListener() {

         @Override

         public void actionPerformed(ActionEvent event) {

            canceled = true;

            setVisible(false);

@@ -330,6 +325,9 @@
            return false;

         }



         // change the cookie

         user.cookie = StringUtils.getSHA1(user.username + password);



         String type = settings.get(Keys.realm.passwordStorage).getString("md5");

         if (type.equalsIgnoreCase("md5")) {

            // store MD5 digest of password

@@ -349,7 +347,7 @@
         // no change in password

         user.password = password;

      }

		


      user.displayName = displayNameField.getText().trim();

      user.emailAddress = emailAddressField.getText().trim();



@@ -363,7 +361,7 @@
      user.locality = localityField.getText().trim();

      user.stateProvince = stateProvinceField.getText().trim();

      user.countryCode = countryCodeField.getText().trim();

		


      for (RegistrantAccessPermission rp : repositoryPalette.getPermissions()) {

         user.setRepositoryPermission(rp.registrant, rp.permission);

      }

@@ -394,17 +392,31 @@
            if (repo.accessRestriction.exceeds(AccessRestrictionType.NONE)

                  && repo.authorizationControl.equals(AuthorizationControl.NAMED)) {

               restricted.add(repo.name);

            }				
            }

         }

         repoMap.put(repo.name.toLowerCase(), repo);

      }

      StringUtils.sortRepositorynames(restricted);

		


      List<String> list = new ArrayList<String>();

      // repositories

      list.add(".*");

      // all repositories excluding personal repositories

      if (ModelUtils.getUserRepoPrefix().length() == 1) list.add("[^" + ModelUtils.getUserRepoPrefix() +"].*");



      String prefix;

      if (settings.hasKey(Keys.git.userRepositoryPrefix)) {

         prefix = settings.get(Keys.git.userRepositoryPrefix).currentValue;

         if (StringUtils.isEmpty(prefix)) {

            prefix = Constants.DEFAULT_USER_REPOSITORY_PREFIX;

         }

      } else {

         prefix = Constants.DEFAULT_USER_REPOSITORY_PREFIX;

      }



      if (prefix.length() == 1) {

         // all repositories excluding personal repositories

         list.add("[^" + prefix + "].*");

      }



      String lastProject = null;

      for (String repo : restricted) {

         String projectPath = StringUtils.getFirstPathElement(repo).toLowerCase();

@@ -426,7 +438,7 @@
            list.remove(rp.registrant.toLowerCase());

         }

      }

		


      // update owner and missing permissions for editing

      for (RegistrantAccessPermission permission : permissions) {

         if (permission.mutable && PermissionType.EXPLICIT.equals(permission.permissionType)) {

@@ -457,7 +469,7 @@
      }

      teamsPalette.setObjects(teams, selected);

   }

	


   public UserModel getUser() {

      if (canceled) {

         return null;