do not log the user when reseting password

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1301144 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
index 411abeea2e0f15e8efd606908540bbbe7157e3bd..d682788fa43b2843668bd5fc31c08c68e226575b 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
@@ -50,6 +50,6 @@
       </form>
   </div>
   <div class="modal-footer" id="modal-password-change-footer">
-    <button class="btn primary" onclick="return" id="modal-change-password-ok">${$.i18n.prop('register')}</button>
+    <button class="btn btn-primary" onclick="return" id="modal-change-password-ok">${$.i18n.prop('ok')}</button>
   </div>
 </div>
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
index e8d98e2a49295672609c26edffab3a032f76e1c5..29e60f2a3f24793141b07e8ecd719faf8ce0732d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
@@ -412,9 +412,40 @@ $(function() {
 
   resetPasswordForm=function(key){
     $.log("resetPasswordForm:"+key);
-    validateKey(key,false);
-    $.log("resetPasswordForm#validateKey ok");
-    //displaySearch();
+    changePasswordBox(null,false,null,function(){
+        $.log("ok chgt pwd")
+        $.log("user.js#changePassword");
+        var valid = $("#password-change-form").valid();
+        if (valid==false) {
+            return;
+        }
+        var url = 'restServices/redbackServices/passwordService/changePasswordWithKey?';
+        url += "password="+$("#passwordChangeFormNewPassword").val();
+        url += "&passwordConfirmation="+$("#passwordChangeFormNewPasswordConfirm").val();
+        url += "&key="+key;
+        $.log("url:"+url);
+
+        $.ajax({
+          url: url,
+          success: function(result){
+            $.log("changePassword#success result:"+result);
+            var user = mapUser(result);
+            if (user) {
+              window.modalChangePasswordBox.modal('hide');
+              displaySuccessMessage($.i18n.prop('change.password.success.section.title'));
+            } else {
+              displayErrorMessage("issue appended");
+            }
+            window.modalChangePasswordBox.modal('hide');
+          },
+          error: function(result) {
+           var obj = jQuery.parseJSON(result.responseText);
+           displayRedbackError(obj,"modal-password-change-content");
+          }
+        });
+
+      }
+    );
   }
 
   passwordReset=function(){
@@ -496,7 +527,7 @@ $(function() {
    * @param previousPassword display and validate previous password text field
    * @param registration are we in registration mode ?
    */
-  changePasswordBox=function(previousPassword,registration,user){
+  changePasswordBox=function(previousPassword,registration,user,okFn){
     screenChange();
     $.log("changePasswordBox previousPassword:"+previousPassword+",registration:"+registration+",user:"+user);
     if (previousPassword==true){
@@ -513,7 +544,11 @@ $(function() {
       })
       $("#modal-password-change").delegate("#modal-change-password-ok", "click keydown keypress", function(e) {
         e.preventDefault();
-        changePassword(previousPassword,registration,user);
+        if ( $.isFunction(okFn)){
+          okFn();
+        } else {
+          changePassword(previousPassword,registration,user);
+        }
       });
     }
     window.modalChangePasswordBox.modal('show');
@@ -649,8 +684,8 @@ $(function() {
         var user = mapUser(result);
         if (user) {
           window.modalChangePasswordBox.modal('hide');
-          $.log("changePassword#sucess,registration:"+registration);
           if (registration==true) {
+            $.log("changePassword#sucess,registration:"+registration);
             displaySuccessMessage($.i18n.prop('change.password.success.section.title'))
             loginCall(user.username(), $("#passwordChangeFormNewPassword").val(),successLoginCallbackFn);
           } else {
@@ -659,10 +694,6 @@ $(function() {
         } else {
           displayErrorMessage("issue appended");
         }
-
-      },
-      complete: function(){
-        $("#small-spinner").remove();
         window.modalChangePasswordBox.modal('hide');
       },
       error: function(result) {