Make JS aware of password verification

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index 8f077270392bce032708784544697b9058f559fd..77d65877ba342d56b0ffa6e74cf209e73af25920 100644 (file)
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -672,6 +672,7 @@ class UsersController extends Controller {
         * @todo merge into saveUserSettings
         *
         * @NoAdminRequired
+        * @PasswordConfirmationRequired
         *
         * @param string $username
         * @param string $displayName

diff --git a/settings/js/federationsettingsview.js b/settings/js/federationsettingsview.js
index 7aaa225a8610223616f5ec650b969b42f2bcb888..e42828ca456d538316548ee0389a9aceaa547937 100644 (file)
--- a/settings/js/federationsettingsview.js
+++ b/settings/js/federationsettingsview.js
@@ -90,10 +90,18 @@
                _onInputChanged: function(e) {
                        var self = this;
 
+                       var $dialog = $('.oc-dialog:visible');
+                       if (OC.PasswordConfirmation.requiresPasswordConfirmation()) {
+                               if($dialog.length === 0) {
+                                       OC.PasswordConfirmation.requirePasswordConfirmation(_.bind(this._onInputChanged, this, e));
+                               }
+                               return;
+                       }
                        var $target = $(e.target);
                        var value = $target.val();
                        var field = $target.attr('id');
                        this._config.set(field, value);
+
                        var savingData = this._config.save({
                                error: function(jqXHR) {
                                        OC.msg.finishedSaving('#personal-settings-container .msg', jqXHR);