ZCS-15589: fixed change password

Author: k-kato

client/src/java/com/zimbra/client/ZAuthResult.java

@@ -37,6 +37,7 @@ public class ZAuthResult {
     private List<String> twoFactorAuthMethodEnabled;
     private String primaryTwoFactorAuthMethod;
     private String maskedPasswordRecoveryAddress;
+    private boolean resetPassword;
 
     /*
     public ZAuthResult(Element e) throws ServiceException {
@@ -63,6 +64,7 @@ public ZAuthResult(AuthResponse res) {
         twoFactorAuthMethodEnabled = data.getTwoFactorAuthMethodEnabled();
         primaryTwoFactorAuthMethod = data.getPrefPrimaryTwoFactorAuthMethod();
         maskedPasswordRecoveryAddress = data.getPrefPasswordRecoveryAddress();
+        resetPassword = ZmBoolean.toBool(data.getResetPassword(), false);
     }
 
     public ZAuthToken getAuthToken() {
@@ -149,4 +151,8 @@ public String getPrimaryTwoFactorAuthMethod() {
     public String getMaskedPasswordRecoveryAddress() {
         return maskedPasswordRecoveryAddress;
     }
+
+    public boolean getResetPassword() {
+        return resetPassword;
+    }
 }

client/src/java/com/zimbra/client/ZMailbox.java

@@ -702,7 +702,9 @@ public static ZChangePasswordResult changePassword(Options options) throws Servi
         mailbox.mClientIp = options.getClientIp();
         mailbox.mNotifyPreference = SessionPreference.fromOptions(options);
         mailbox.initPreAuth(options);
-        return mailbox.changePassword(options.getAccount(), options.getAccountBy(), options.getPassword(), options.getNewPassword(), options.getVirtualHost(), options.getAuthToken(), options.getCsrfToken());
+        return mailbox.changePassword(options.getAccount(), options.getAccountBy(), options.getPassword(),
+                options.getNewPassword(), options.getVirtualHost(), options.getAuthToken(),
+                options.getCsrfToken(), false);
     }
 
     public static ZMailbox getByName(String name, String password, String uri) throws ServiceException {
@@ -744,7 +746,7 @@ public ZMailbox(Options options) throws ServiceException {
              * always the case. */
             initTargetAccountInfo(options.getTargetAccount(), options.getTargetAccountBy());
         }
-        if (options.getAuthToken() != null) {
+        if (options.getAuthToken() != null && options.getNewPassword() == null) {
             if (options.getAuthAuthToken()) {
                 authByAuthToken(options);
             } else {
@@ -753,8 +755,11 @@ public ZMailbox(Options options) throws ServiceException {
         } else if (options.getAccount() != null) {
             String password;
             if (options.getNewPassword() != null) {
-                changePassword(options.getAccount(), options.getAccountBy(), options.getPassword(), options.getNewPassword(), options.getVirtualHost(), options.getAuthToken(), options.getCsrfToken());
+                changePassword(options.getAccount(), options.getAccountBy(), options.getPassword(),
+                        options.getNewPassword(), options.getVirtualHost(), options.getAuthToken(),
+                        options.getCsrfToken(), true);
                 password = options.getNewPassword();
+                options.setAuthToken((ZAuthToken)null);
             } else {
                 password = options.getPassword();
             }
@@ -828,15 +833,20 @@ public Element newRequestElement(QName name) {
         }
     }
 
-    private ZChangePasswordResult changePassword(String key, AccountBy by, String oldPassword, String newPassword, String virtualHost, ZAuthToken zat, String csrfToken) throws ServiceException {
+    private ZChangePasswordResult changePassword(String key, AccountBy by, String oldPassword, String newPassword,
+            String virtualHost, ZAuthToken zat, String csrfToken, boolean authTokenAsAttr) throws ServiceException {
         if (mTransport == null) {
             throw ZClientException.CLIENT_ERROR("must call setURI before calling changePassword", null);
         }
 
         AccountSelector account = new AccountSelector(SoapConverter.TO_SOAP_ACCOUNT_BY.apply(by), key);
         ChangePasswordRequest req = new ChangePasswordRequest(account, oldPassword, newPassword);
         req.setVirtualHost(virtualHost);
-        initAuthToken(zat);
+        if (authTokenAsAttr) {
+            req.setAuthToken(new AuthToken(zat.getValue(), false));
+        } else {
+            initAuthToken(zat);
+        }
         initCsrfToken(csrfToken);
 
         ChangePasswordResponse res = invokeJaxb(req);