fix: force System Prefs for screen capture on macOS 11+ (#60)

Author: codebytere

README.md

@@ -380,9 +380,11 @@ askForPhotosAccess().then(status => {
 })
 ```
 
-### `permissions.askForScreenCaptureAccess()`
+### `permissions.askForScreenCaptureAccess([openPreferences])`
 
-There is no API for programmatically requesting Screen Capture on macOS at this time, and so calling this method will trigger opening of System Preferences at the Screen Capture pane of Security and Privacy.
+* `openPreferences` Boolean (optional) - Whether to open System Preferences if the request to authorize Screen Capture fails or is denied by the user.
+
+Calling this method for the first time within an app session will trigger a permission modal. If this modal is denied, there is no  API for programmatically requesting Screen Capture on macOS at this time. Calling this method after denial with `openPreferences = true` will trigger opening of System Preferences at the Screen Capture pane of Security and Privacy.
 
 Example:
 

index.js

@@ -36,6 +36,14 @@ function askForFoldersAccess(folder) {
   return permissions.askForFoldersAccess.call(this, folder)
 }
 
+function askForScreenCaptureAccess(openPreferences = false) {
+  if (typeof openPreferences !== 'boolean') {
+    throw new TypeError('openPreferences must be a boolean')
+  }
+
+  return permissions.askForScreenCaptureAccess.call(this, openPreferences)
+}
+
 function askForPhotosAccess(accessLevel = 'add-only') {
   if (!['add-only', 'read-write'].includes(accessLevel)) {
     throw new TypeError(`${accessLevel} must be one of either 'add-only' or 'read-write'`)
@@ -57,6 +65,6 @@ module.exports = {
   askForMusicLibraryAccess: permissions.askForMusicLibraryAccess,
   askForPhotosAccess,
   askForSpeechRecognitionAccess: permissions.askForSpeechRecognitionAccess,
-  askForScreenCaptureAccess: permissions.askForScreenCaptureAccess,
+  askForScreenCaptureAccess,
   getAuthStatus,
 }

permissions.mm

@@ -293,7 +293,7 @@ bool HasOpenSystemPreferencesDialog() {
 // Screen Capture access.
 std::string ScreenAuthStatus() {
   std::string auth_status = kNotDetermined;
-  if (@available(macOS 10.16, *)) {
+  if (@available(macOS 11.0, *)) {
     auth_status = CGPreflightScreenCaptureAccess() ? kAuthorized : kDenied;
   } else if (@available(macOS 10.15, *)) {
     auth_status = kDenied;
@@ -786,8 +786,14 @@ void AskForFullDiskAccess(const Napi::CallbackInfo &info) {
 
 // Request Screen Capture Access.
 void AskForScreenCaptureAccess(const Napi::CallbackInfo &info) {
-  if (@available(macOS 10.16, *)) {
-    CGRequestScreenCaptureAccess();
+  if (@available(macOS 11.0, *)) {
+    if (CGPreflightScreenCaptureAccess() || CGRequestScreenCaptureAccess())
+      return;
+
+    bool should_force_prefs = info[0].As<Napi::Boolean>().Value();
+    if (should_force_prefs && !HasOpenSystemPreferencesDialog()) {
+      OpenPrefPane("Privacy_ScreenCapture");
+    }
   } else if (@available(macOS 10.15, *)) {
     // Tries to create a capture stream. This is necessary to add the app back
     // to the list in sysprefs if the user previously denied.
@@ -801,9 +807,8 @@ void AskForScreenCaptureAccess(const Napi::CallbackInfo &info) {
     if (stream) {
       CFRelease(stream);
     } else {
-      if (!HasOpenSystemPreferencesDialog()) {
+      if (!HasOpenSystemPreferencesDialog())
         OpenPrefPane("Privacy_ScreenCapture");
-      }
     }
   }
 }

test/module.spec.js

@@ -1,5 +1,5 @@
 const { expect } = require('chai')
-const { askForFoldersAccess, getAuthStatus } = require('../index')
+const { askForFoldersAccess, getAuthStatus, askForScreenCaptureAccess } = require('../index')
 
 describe('node-mac-permissions', () => {
   describe('getAuthStatus()', () => {
@@ -43,4 +43,12 @@ describe('node-mac-permissions', () => {
       }).to.throw(/bad-type is not a valid protected folder/)
     })
   })
+
+  describe('askForScreenCaptureAccess()', () => {
+    it('should throw on invalid openPreferences type', () => {
+      expect(() => {
+        askForScreenCaptureAccess('bad-type')
+      }).to.throw(/openPreferences must be a boolean/)
+    })
+  })
 })