Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

 src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java

@@ -19,10 +19,10 @@


import org.apache.wicket.RestartResponseException;

import org.apache.wicket.markup.html.form.Button;

import org.apache.wicket.markup.html.form.PasswordTextField;

import org.apache.wicket.markup.html.form.StatelessForm;

import org.apache.wicket.model.IModel;

import org.apache.wicket.model.Model;

import org.apache.wicket.protocol.http.WebRequest;

import org.apache.wicket.protocol.http.WebResponse;



import com.gitblit.GitBlitException;

@@ -30,6 +30,7 @@
import com.gitblit.models.UserModel;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.NonTrimmedPasswordTextField;



public class ChangePasswordPage extends RootSubPage {



@@ -51,7 +52,7 @@
      }



      UserModel user = GitBlitWebSession.get().getUser();

      if (!app().users().supportsCredentialChanges(user)) {

      if (!app().authentication().supportsCredentialChanges(user)) {

         error(MessageFormat.format(getString("gb.userServiceDoesNotPermitPasswordChanges"),

               app().settings().getString(Keys.realm.userService, "${baseFolder}/users.conf")), true);

      }

@@ -97,10 +98,12 @@


            user.password = password;

            try {

               app().users().updateUserModel(user.username, user, false);

               app().gitblit().reviseUser(user.username, user);

               if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, false)) {

                  WebRequest request = (WebRequest) getRequestCycle().getRequest();

                  WebResponse response = (WebResponse) getRequestCycle().getResponse();

                  app().session().setCookie(response, user);

                  app().authentication().setCookie(request.getHttpServletRequest(),

                        response.getHttpServletResponse(), user);

               }

            } catch (GitBlitException e) {

               error(e.getMessage());

@@ -111,10 +114,10 @@
            setResponsePage(RepositoriesPage.class);

         }

      };

      PasswordTextField passwordField = new PasswordTextField("password", password);

      NonTrimmedPasswordTextField passwordField = new NonTrimmedPasswordTextField("password", password);

      passwordField.setResetPassword(false);

      form.add(passwordField);

      PasswordTextField confirmPasswordField = new PasswordTextField("confirmPassword",

      NonTrimmedPasswordTextField confirmPasswordField = new NonTrimmedPasswordTextField("confirmPassword",

            confirmPassword);

      confirmPasswordField.setResetPassword(false);

      form.add(confirmPasswordField);