Cancel password confirmation on settings toggles checkbox state

[juliusknorr]

Steps to reproduce

1. Go to public sharing settings
2. Click a checkbox that requires password confirmation (e.g. Allow public sharing)
3. Cancel the password prompt

Expected behaviour

The checkbox state should not be changed

Actual behaviour

The checkbox state changes

Password confirmation introduced in #1447

cc @nickvergessen

[nickvergessen]

Well for the checkboxes this might be possible, but for stuff like the email settings form I'm not sure how to restore the old state and if we even should.

I can only hack this together for each specific case, e.g. like:

diff --git a/core/js/js.js b/core/js/js.js
index e2b8731..a574141 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1530,8 +1530,9 @@ OC.PasswordConfirmation = {
 
        /**
         * @param {function} callback
+        * @param {function} [cancelCallback]
         */
-       requirePasswordConfirmation: function(callback) {
+       requirePasswordConfirmation: function(callback, cancelCallback) {
                var self = this;
 
                if (this.requiresPasswordConfirmation()) {
@@ -1544,6 +1545,8 @@ OC.PasswordConfirmation = {
                                function (result, password) {
                                        if (result && password !== '') {
                                                self._confirmPassword(password);
+                                       } else if (!result && _.isFunction(cancelCallback)) {
+                                               cancelCallback();
                                        }
                                },
                                true,
diff --git a/core/js/public/appconfig.js b/core/js/public/appconfig.js
index d84ddaa..f64f8b3 100644
--- a/core/js/public/appconfig.js
+++ b/core/js/public/appconfig.js
@@ -34,7 +34,7 @@ OCP.AppConfig = {
         */
        _call: function(method, endpoint, options) {
                if ((method === 'post' || method === 'delete') && OC.PasswordConfirmation.requiresPasswordConfirmation()) {
-                       OC.PasswordConfirmation.requirePasswordConfirmation(_.bind(this._call, this, method, endpoint, options));
+                       OC.PasswordConfirmation.requirePasswordConfirmation(_.bind(this._call, this, method, endpoint, options), options.error);
                        return;
                }
 
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 094b12b..fae435c 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -96,15 +96,24 @@ $(document).ready(function(){
        });
 
        $('#shareAPI input:not(.noJSAutoUpdate)').change(function() {
-               var value = $(this).val();
-               if ($(this).attr('type') === 'checkbox') {
+               var $el = $(this),
+                       value = $el.val();
+               if ($el.attr('type') === 'checkbox') {
                        if (this.checked) {
                                value = 'yes';
                        } else {
                                value = 'no';
                        }
                }
-               OCP.AppConfig.setValue('core', $(this).attr('name'), value);
+
+               OCP.AppConfig.setValue('core', $el.attr('name'), value, {
+                       error: function() {
+                               $el.prop('checked', !$el.prop('checked'));
+                               if ($el.attr('id') === 'shareAPIEnabled') {
+                                       $('#shareAPI p:not(#enable)').toggleClass('hidden', !$el.prop('checked'));
+                               }
+                       }
+               });
        });
 
        $('#shareapiDefaultExpireDate').change(function() {

I hope someone has a better idea? @nextcloud/javascript

[MorrisJobke]

Well for the checkboxes this might be possible, but for stuff like the email settings form I'm not sure how to restore the old state and if we even should.

For the email settings just run the blurFunction function - it will take care of the transition back ;)