1 files changed, 32 insertions, 35 deletions

diff --git a/src/electron/macOSPermissions.js b/src/electron/macOSPermissions.js
index 940b16c6e..887af2903 100644
--- a/src/electron/macOSPermissions.js
+++ b/src/electron/macOSPermissions.js
@@ -1,83 +1,80 @@
-import { app, systemPreferences, dialog } from 'electron';
-import fs from 'fs';
+import { systemPreferences, dialog } from 'electron';
+import { pathExistsSync, mkdirSync, writeFileSync } from 'fs-extra';
 import macosVersion from 'macos-version';
-import path from 'path';
-import { isMac } from '../environment';
-
-let askForScreenCaptureAccess;
-if (isMac) {
-  // eslint-disable-next-line global-require
-  askForScreenCaptureAccess = require('node-mac-permissions').askForScreenCaptureAccess;
-}
+import { dirname } from 'path';
+import { askForScreenCaptureAccess } from 'node-mac-permissions';
+import { userDataPath } from '../environment';
 
 const debug = require('debug')('Ferdi:macOSPermissions');
 
-const permissionExists = macosVersion.isGreaterThanOrEqualTo('10.15');
-const filePath = path.join(app.getPath('userData'), '.has-app-requested-screen-capture-permissions');
+const isExplicitScreenCapturePermissionReqd = macosVersion.isGreaterThanOrEqualTo('10.15');
+debug(`Should check explicitly for screen-capture permissions: ${isExplicitScreenCapturePermissionReqd}`);
 
-function hasPromptedForPermission() {
-  if (!permissionExists) {
-    return false;
-  }
+const filePath = userDataPath('.has-app-requested-screen-capture-permissions');
 
-  if (filePath && fs.existsSync(filePath)) {
-    return true;
+function hasPromptedForScreenCapturePermission() {
+  if (!isExplicitScreenCapturePermissionReqd) {
+    return false;
   }
 
-  return false;
+  debug('Checking if status file exists');
+  return filePath && pathExistsSync(filePath);
 }
 
-function hasScreenCapturePermission() {
-  if (!permissionExists) {
+function hasScreenCapturePermissionAlreadyBeenGranted() {
+  if (!isExplicitScreenCapturePermissionReqd) {
     return true;
   }
 
   const screenCaptureStatus = systemPreferences.getMediaAccessStatus('screen');
+  debug(`screen-capture permissions status: ${screenCaptureStatus}`);
   return screenCaptureStatus === 'granted';
 }
 
 function createStatusFile() {
   try {
-    fs.writeFileSync(filePath, '');
+    writeFileSync(filePath, '');
   } catch (error) {
     if (error.code === 'ENOENT') {
-      fs.mkdirSync(path.dirname(filePath));
-      fs.writeFileSync(filePath, '');
+      mkdirSync(dirname(filePath));
+      writeFileSync(filePath, '');
     }
 
     throw error;
   }
 }
 
-export default async function (mainWindow) {
+export const askFormacOSPermissions = async mainWindow => {
   debug('Checking camera & microphone permissions');
   systemPreferences.askForMediaAccess('camera');
   systemPreferences.askForMediaAccess('microphone');
 
-  if (!hasPromptedForPermission() && !hasScreenCapturePermission()) {
+  if (hasScreenCapturePermissionAlreadyBeenGranted()) {
+    debug('Already obtained screen-capture permissions - writing status file');
+    createStatusFile();
+    return;
+  }
+
+  if (!hasPromptedForScreenCapturePermission()) {
     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, Ferdi needs the permission to record your screen.',
-      buttons: [
-        'Allow screen sharing',
-        'No',
-        'Ask me later',
-      ],
+      detail:
+        'To enable screen sharing for some services, Ferdi 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');
+      debug("Don't ask again");
       createStatusFile();
     }
   }
-}
+};