Fix user changing their password

Wrong user was being sent to change the password (it was the session user).

Signed-off-by: Andrew Kim <andrekim@cisco.com>

diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java
index 7c45bb8cee04433502b3ad5e3567f8d211c87428..46b8d4e0fe5e0329299a5671a6440ae801fbc853 100644 (file)
--- a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java
+++ b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java
@@ -100,8 +100,6 @@ public class DaylightWebAdmin {
     @ResponseBody
     public Status changePassword(@PathVariable("username") String username, HttpServletRequest request,
             @RequestParam("currentPassword") String currentPassword, @RequestParam("newPassword") String newPassword) {
     @ResponseBody
     public Status changePassword(@PathVariable("username") String username, HttpServletRequest request,
             @RequestParam("currentPassword") String currentPassword, @RequestParam("newPassword") String newPassword) {

-        String user = request.getUserPrincipal().getName();
-        

         IUserManager userManager = (IUserManager) ServiceHelper
                 .getGlobalInstance(IUserManager.class, this);
         if (userManager == null) {
         IUserManager userManager = (IUserManager) ServiceHelper
                 .getGlobalInstance(IUserManager.class, this);
         if (userManager == null) {


@@ -116,7 +114,7 @@ public class DaylightWebAdmin {
             return new Status(StatusCode.BADREQUEST, "Empty passwords not allowed");
         }
         
             return new Status(StatusCode.BADREQUEST, "Empty passwords not allowed");
         }
         

-        Status status = userManager.changeLocalUserPassword(user, currentPassword, newPassword);
+        Status status = userManager.changeLocalUserPassword(username, currentPassword, newPassword);

         
         return status;
     }
         
         return status;
     }