From 223cca42ca4f24a6d5790077eb0e638d421276f4 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Wed, 6 May 2015 11:40:41 +0200
Subject: [PATCH] SONAR-6468 Remove password_confirmation parameter (validation
 is delegated to UI)

---
 .../sonar/server/user/ws/ChangePasswordAction.java    | 11 +++--------
 .../server/user/ws/ChangePasswordActionTest.java      |  2 --
 .../java/org/sonar/server/user/ws/UsersWsTest.java    |  7 +++----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java
index 14cbf2edd0a..c813976918a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java
@@ -32,7 +32,6 @@ public class ChangePasswordAction implements BaseUsersWsAction {
 
   private static final String PARAM_LOGIN = "login";
   private static final String PARAM_PASSWORD = "password";
-  private static final String PARAM_PASSWORD_CONFIRMATION = "password_confirmation";
 
   private final UserUpdater userUpdater;
 
@@ -57,11 +56,6 @@ public class ChangePasswordAction implements BaseUsersWsAction {
       .setDescription("New password")
       .setRequired(true)
       .setExampleValue("mypassword");
-
-    action.createParam(PARAM_PASSWORD_CONFIRMATION)
-      .setDescription("Must be the same value as \"password\"")
-      .setRequired(true)
-      .setExampleValue("mypassword");
   }
 
   @Override
@@ -69,9 +63,10 @@ public class ChangePasswordAction implements BaseUsersWsAction {
     UserSession.get().checkLoggedIn().checkGlobalPermission(GlobalPermissions.SYSTEM_ADMIN);
 
     String login = request.mandatoryParam(PARAM_LOGIN);
+    String password = request.mandatoryParam(PARAM_PASSWORD);
     UpdateUser updateUser = UpdateUser.create(login)
-      .setPassword(request.mandatoryParam(PARAM_PASSWORD))
-      .setPasswordConfirmation(request.mandatoryParam(PARAM_PASSWORD_CONFIRMATION));
+      .setPassword(password)
+      .setPasswordConfirmation(password);
 
     userUpdater.update(updateUser);
     response.noContent();
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java
index 037783c1493..896c251ad4b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java
@@ -115,7 +115,6 @@ public class ChangePasswordActionTest {
     tester.newPostRequest("api/users", "change_password")
       .setParam("login", "polop")
       .setParam("password", "polop")
-      .setParam("password_confirmation", "polop")
       .execute();
   }
 
@@ -128,7 +127,6 @@ public class ChangePasswordActionTest {
     tester.newPostRequest("api/users", "change_password")
       .setParam("login", "john")
       .setParam("password", "Valar Morghulis")
-      .setParam("password_confirmation", "Valar Morghulis")
       .execute()
       .assertNoContent();
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java
index 73d65418c7e..952d26d1cbc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java
@@ -43,8 +43,7 @@ public class UsersWsTest {
       new UpdateAction(mock(UserIndex.class), mock(UserUpdater.class)),
       new CurrentUserAction(),
       new DeactivateAction(mock(UserIndex.class), mock(UserUpdater.class)),
-      new ChangePasswordAction(mock(UserUpdater.class)),
-      new CurrentUserAction()));
+      new ChangePasswordAction(mock(UserUpdater.class))));
     controller = tester.controller("api/users");
   }
 
@@ -53,7 +52,7 @@ public class UsersWsTest {
     assertThat(controller).isNotNull();
     assertThat(controller.description()).isNotEmpty();
     assertThat(controller.since()).isEqualTo("3.6");
-    assertThat(controller.actions()).hasSize(7);
+    assertThat(controller.actions()).hasSize(6);
   }
 
   @Test
@@ -87,7 +86,7 @@ public class UsersWsTest {
     WebService.Action action = controller.action("change_password");
     assertThat(action).isNotNull();
     assertThat(action.isPost()).isTrue();
-    assertThat(action.params()).hasSize(3);
+    assertThat(action.params()).hasSize(2);
   }
 
   @Test
-- 
2.39.5