Merge pull request #2011 from Lej77/patch-1

Request optional permissions without toolbar button

Author: piroor

webextensions/common/common.js

@@ -168,6 +168,7 @@ export const configs = new Configs({
   simulateSVGContextFill: true,
 
   requestingPermissions: null,
+  requestingPermissionsNatively: null,
 
   // https://dxr.mozilla.org/mozilla-central/rev/2535bad09d720e71a982f3f70dd6925f66ab8ec7/browser/base/content/browser.css#137
   newTabAnimationDuration: 100,

webextensions/common/permissions.js

@@ -81,14 +81,37 @@ export function bindToCheckbox(permissions, checkbox, options = {}) {
         return;
       }
 
-      const granted = await isGranted(permissions);
+      checkbox.checked = false;
+      if (configs.requestingPermissionsNatively) {
+        return;
+      }
+      let granted;
+
+      // Following code will throw error on Firefox 60 and earlier (but not on Firefox ESR 60) due to https://bugzilla.mozilla.org/show_bug.cgi?id=1382953
+      // Also must not have used await before calling browser.permissions.request or it will throw an error.
+      try {
+        configs.requestingPermissionsNatively = permissions;
+        granted = await browser.permissions.request(permissions);
+      } catch (error) {
+
+      } finally {
+        configs.requestingPermissionsNatively = null;
+      }
+
+      if (granted === undefined) {
+        granted = await isGranted(permissions);
+      } else if (!granted) {
+        return;
+      }
+
       if (granted) {
-        options.onChanged(true);
+        checkbox.checked = true;
+        if (options.onChanged)
+          options.onChanged(true);
         return;
       }
 
       configs.requestingPermissions = permissions;
-      checkbox.checked = false;
       browser.browserAction.setBadgeText({ text: '!' });
       browser.browserAction.setPopup({ popup: '' });
 
@@ -98,14 +121,6 @@ export function bindToCheckbox(permissions, checkbox, options = {}) {
         icon:    'resources/24x24.svg'
       });
       return;
-
-      /*
-      // following codes don't work as expected due to https://bugzilla.mozilla.org/show_bug.cgi?id=1382953
-      if (!await browser.permissions.request(permissions)) {
-        checkbox.checked = false;
-        return;
-      }
-      */
     }
     catch(error) {
       console.log(error);
@@ -120,6 +135,8 @@ export function requestPostProcess() {
 
   const permissions = configs.requestingPermissions;
   configs.requestingPermissions = null;
+  configs.requestingPermissionsNatively = permissions;
+
   browser.browserAction.setBadgeText({ text: '' });
   browser.permissions.request(permissions).then(granted => {
     log('permission requested: ', permissions, granted);
@@ -128,6 +145,8 @@ export function requestPostProcess() {
         type:        Constants.kCOMMAND_NOTIFY_PERMISSIONS_GRANTED,
         permissions: permissions
       });
+  }).finally(() => {
+    configs.requestingPermissionsNatively = null;
   });
   return true;
 }