4 files changed, 97 insertions, 117 deletions

diff --git a/package-lock.json b/package-lock.json
index 801d17746..913d50b4c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26512,113 +26512,6 @@
         }
       }
     },
-    "mac-screen-capture-permissions": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mac-screen-capture-permissions/-/mac-screen-capture-permissions-1.1.0.tgz",
-      "integrity": "sha512-jMRumlB3FScui/7yW+5FqqbuO7CQ0XOJVT5oTsb7W9eRQDhCIpJpIF0XxLVXwq2DIOp0fYsz1LFiBjnyDYULyQ==",
-      "requires": {
-        "electron-util": "^0.13.0",
-        "execa": "^2.0.4",
-        "macos-version": "^5.2.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "electron-util": {
-          "version": "0.13.1",
-          "resolved": "https://registry.npmjs.org/electron-util/-/electron-util-0.13.1.tgz",
-          "integrity": "sha512-CvOuAyQPaPtnDp7SspwnT1yTb1yynw6yp4LrZCfEJ7TG/kJFiZW9RqMHlCEFWMn3QNoMkNhGVeCvWJV5NsYyuQ==",
-          "requires": {
-            "electron-is-dev": "^1.1.0",
-            "new-github-issue-url": "^0.2.1"
-          }
-        },
-        "execa": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz",
-          "integrity": "sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==",
-          "requires": {
-            "cross-spawn": "^7.0.0",
-            "get-stream": "^5.0.0",
-            "is-stream": "^2.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^3.0.0",
-            "onetime": "^5.1.0",
-            "p-finally": "^2.0.0",
-            "signal-exit": "^3.0.2",
-            "strip-final-newline": "^2.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "is-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
-        },
-        "npm-run-path": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz",
-          "integrity": "sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==",
-          "requires": {
-            "path-key": "^3.0.0"
-          }
-        },
-        "onetime": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-          "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-          "requires": {
-            "mimic-fn": "^2.1.0"
-          }
-        },
-        "p-finally": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
-          "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="
-        },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
     "macos-release": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz",
@@ -28178,6 +28071,22 @@
         }
       }
     },
+    "node-mac-permissions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/node-mac-permissions/-/node-mac-permissions-2.2.0.tgz",
+      "integrity": "sha512-oLEZY46M47A/rcMacPEqo/5z6u7alXdMXhtE7xPDyMixZF35Grl9KGx3N2adE3//lEtGL6Tig98p+1gkonkwQg==",
+      "requires": {
+        "bindings": "^1.5.0",
+        "node-addon-api": "^2.0.0"
+      },
+      "dependencies": {
+        "node-addon-api": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz",
+          "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="
+        }
+      }
+    },
     "node-modules-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
diff --git a/package.json b/package.json
index 2acae006c..1174f9810 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,6 @@
     "hex-to-rgba": "1.0.2",
     "jsonwebtoken": "8.5.1",
     "lodash": "4.17.21",
-    "mac-screen-capture-permissions": "1.1.0",
     "macos-version": "5.2.0",
     "marked": "0.7.0",
     "mdi": "^1.9.33",
@@ -106,6 +105,7 @@
     "moment": "2.29.1",
     "ms": "2.1.2",
     "node-fetch": "2.6.1",
+    "node-mac-permissions": "2.2.0",
     "normalize-url": "5.0.0",
     "os-name": "4.0.0",
     "pretty-bytes": "^5.6.0",
diff --git a/src/electron/macOSPermissions.js b/src/electron/macOSPermissions.js
index 4ba6a7619..682a46a41 100644
--- a/src/electron/macOSPermissions.js
+++ b/src/electron/macOSPermissions.js
@@ -1,14 +1,84 @@
-import { systemPreferences } from 'electron';
-import {
-  hasScreenCapturePermission,
-  hasPromptedForPermission,
-} from 'mac-screen-capture-permissions';
+import { app, systemPreferences, dialog } from 'electron';
+import fs from 'fs';
+import macosVersion from 'macos-version';
+import path from 'path';
+import { isMac } from '../environment';
 
-export default function () {
+let askForScreenCaptureAccess;
+if (isMac) {
+  // eslint-disable-next-line global-require
+  askForScreenCaptureAccess = require('node-mac-permissions').askForScreenCaptureAccess;
+}
+
+const debug = require('debug')('Franz:macOSPermissions');
+
+const permissionExists = macosVersion.isGreaterThanOrEqualTo('10.15');
+const filePath = path.join(app.getPath('userData'), '.has-app-requested-screen-capture-permissions');
+
+function hasPromptedForPermission() {
+  if (!permissionExists) {
+    return false;
+  }
+
+  if (filePath && fs.existsSync(filePath)) {
+    return true;
+  }
+
+  return false;
+}
+
+function hasScreenCapturePermission() {
+  if (!permissionExists) {
+    return true;
+  }
+
+  const screenCaptureStatus = systemPreferences.getMediaAccessStatus('screen');
+  return screenCaptureStatus === 'granted';
+}
+
+function createStatusFile() {
+  try {
+    fs.writeFileSync(filePath, '');
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      fs.mkdirSync(path.dirname(filePath));
+      fs.writeFileSync(filePath, '');
+    }
+
+    throw error;
+  }
+}
+
+
+export default async function (mainWindow) {
+  debug('Checking camera & microphone permissions');
   systemPreferences.askForMediaAccess('camera');
   systemPreferences.askForMediaAccess('microphone');
 
-  if (!hasPromptedForPermission()) {
-    hasScreenCapturePermission();
+  if (!hasPromptedForPermission() && !hasScreenCapturePermission()) {
+    debug('Checking screen capture permissions');
+
+    const { response } = await dialog.showMessageBox(mainWindow, {
+      type: 'info',
+      message: 'Enable Screen Sharing',
+      detail: 'To enable screen sharing for some services, Franz needs the permission to record your screen.',
+      buttons: [
+        'Allow screen sharing',
+        'No',
+        'Ask me later',
+      ],
+      defaultId: 0,
+      cancelId: 2,
+    });
+
+    console.log('result', response);
+    if (response === 0) {
+      debug('Asking for access');
+      askForScreenCaptureAccess();
+      createStatusFile();
+    } else if (response === 1) {
+      debug('Don\'t ask again');
+      createStatusFile();
+    }
   }
 }
diff --git a/src/index.js b/src/index.js
index 2586ab401..d251af958 100644
--- a/src/index.js
+++ b/src/index.js
@@ -10,6 +10,7 @@ import fs from 'fs-extra';
 import path from 'path';
 import windowStateKeeper from 'electron-window-state';
 import { enforceMacOSAppLocation } from 'electron-util';
+import ms from 'ms';
 
 // TODO: This seems to be duplicated between here and 'config.js'
 // Set app directory before loading user modules
@@ -328,7 +329,7 @@ const createWindow = () => {
   });
 
   if (isMac) {
-    askFormacOSPermissions();
+    setTimeout(() => askFormacOSPermissions(mainWindow), ms('30s'));
   }
 
   mainWindow.on('show', () => {