From d6265b2562c19e9be82cb4ef1b9237781762db30 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Tue, 5 Nov 2019 14:06:58 +0700 Subject: Extend plist infos on macOS for audio/video --- electron-builder.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/electron-builder.yml b/electron-builder.yml index f6dceabce..a7d4306f6 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -12,12 +12,16 @@ mac: category: public.app-category.productivity icon: ./build-helpers/images/icon.icns darkModeSupport: true + extendInfo: afterSign: ./build-helpers/notarize.js dmg: background: ./build-helpers/images/dmgInstaller.tiff icon: ./build-helpers/images/icon.icns + extendInfo: + NSMicrophoneUsageDescription: "Allow to enable audio messaging services." + NSCameraUsageDescription: "Allow to enable video messaging services." iconSize: 128 contents: [ -- cgit v1.2.3-54-g00ecf From 7f7ec4ba149b9bb91433b25d68385113ba2be5a8 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Tue, 5 Nov 2019 14:19:25 +0700 Subject: Review electron-builder and access description copy --- electron-builder.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/electron-builder.yml b/electron-builder.yml index a7d4306f6..9117c37b2 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -13,15 +13,14 @@ mac: icon: ./build-helpers/images/icon.icns darkModeSupport: true extendInfo: + NSMicrophoneUsageDescription: "This app requires camera access for video messaging services." + NSCameraUsageDescription: "This app requires microphone access for audio messaging services." afterSign: ./build-helpers/notarize.js dmg: background: ./build-helpers/images/dmgInstaller.tiff icon: ./build-helpers/images/icon.icns - extendInfo: - NSMicrophoneUsageDescription: "Allow to enable audio messaging services." - NSCameraUsageDescription: "Allow to enable video messaging services." iconSize: 128 contents: [ -- cgit v1.2.3-54-g00ecf From 9ea54f5cc6caaf543e02e58d5d9c776a7ea6260e Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Tue, 5 Nov 2019 14:19:55 +0700 Subject: Add missing comma via linter --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index bc3c9555a..12ea7f646 100644 --- a/src/index.js +++ b/src/index.js @@ -174,7 +174,7 @@ const createWindow = () => { webPreferences: { nodeIntegration: true, webviewTag: true, - preload: path.join(__dirname, 'sentry.js') + preload: path.join(__dirname, 'sentry.js'), }, }); -- cgit v1.2.3-54-g00ecf From 9c5e8f0c2d04326d98810afefb7fa99f0edb44dc Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Wed, 27 Nov 2019 17:08:02 +0700 Subject: Add list of entitlements including mic/video --- build-helpers/default.entitlements.mac.plist | 14 ++++++++++++++ electron-builder.yml | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 build-helpers/default.entitlements.mac.plist diff --git a/build-helpers/default.entitlements.mac.plist b/build-helpers/default.entitlements.mac.plist new file mode 100644 index 000000000..d361a9fe4 --- /dev/null +++ b/build-helpers/default.entitlements.mac.plist @@ -0,0 +1,14 @@ + + + + + com.apple.security.cs.allow-unsigned-executable-memory + + com.apple.security.cs.disable-library-validation + + com.apple.security.device.camera + + com.apple.security.device.microphone + + + \ No newline at end of file diff --git a/electron-builder.yml b/electron-builder.yml index 9117c37b2..41bcfa8dc 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -12,6 +12,8 @@ mac: category: public.app-category.productivity icon: ./build-helpers/images/icon.icns darkModeSupport: true + entitlements: "./build-helpers/default.entitlements.mac.plist" + entitlementsInherit: "./build-helpers/default.entitlements.mac.plist" extendInfo: NSMicrophoneUsageDescription: "This app requires camera access for video messaging services." NSCameraUsageDescription: "This app requires microphone access for audio messaging services." -- cgit v1.2.3-54-g00ecf From a12642fb332e921db1e90151079629cc1fc9d76f Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Mon, 23 Dec 2019 19:28:04 +0100 Subject: Attempt at updating entitlements list for signed macOS app --- build-helpers/default.entitlements.mac.plist | 14 -------------- build-helpers/entitlements.mas.inherit.plist | 8 ++++++++ build-helpers/entitlements.mas.plist | 20 ++++++++++++++++++++ electron-builder.yml | 4 ++-- 4 files changed, 30 insertions(+), 16 deletions(-) delete mode 100644 build-helpers/default.entitlements.mac.plist create mode 100644 build-helpers/entitlements.mas.inherit.plist create mode 100644 build-helpers/entitlements.mas.plist diff --git a/build-helpers/default.entitlements.mac.plist b/build-helpers/default.entitlements.mac.plist deleted file mode 100644 index d361a9fe4..000000000 --- a/build-helpers/default.entitlements.mac.plist +++ /dev/null @@ -1,14 +0,0 @@ - - - - - com.apple.security.cs.allow-unsigned-executable-memory - - com.apple.security.cs.disable-library-validation - - com.apple.security.device.camera - - com.apple.security.device.microphone - - - \ No newline at end of file diff --git a/build-helpers/entitlements.mas.inherit.plist b/build-helpers/entitlements.mas.inherit.plist new file mode 100644 index 000000000..e33c2158e --- /dev/null +++ b/build-helpers/entitlements.mas.inherit.plist @@ -0,0 +1,8 @@ + + + + + com.apple.security.inherit + + + \ No newline at end of file diff --git a/build-helpers/entitlements.mas.plist b/build-helpers/entitlements.mas.plist new file mode 100644 index 000000000..ef14228f0 --- /dev/null +++ b/build-helpers/entitlements.mas.plist @@ -0,0 +1,20 @@ + + + + + com.apple.security.cs.allow-jit + + com.apple.security.cs.allow-unsigned-executable-memory + + com.apple.security.cs.disable-library-validation + + com.apple.security.device.camera + + com.apple.security.device.microphone + + com.apple.security.device.audio-input + + com.apple.security.network.client + + + \ No newline at end of file diff --git a/electron-builder.yml b/electron-builder.yml index 129a913c9..23625c825 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -12,8 +12,8 @@ mac: category: public.app-category.productivity icon: ./build-helpers/images/icon.icns darkModeSupport: true - entitlements: "./build-helpers/default.entitlements.mac.plist" - entitlementsInherit: "./build-helpers/default.entitlements.mac.plist" + entitlements: "./build-helpers/entitlements.mas.plist" + entitlementsInherit: "./build-helpers/entitlements.mas.inherit.plist" extendInfo: NSMicrophoneUsageDescription: "This app requires camera access for video messaging services." NSCameraUsageDescription: "This app requires microphone access for audio messaging services." -- cgit v1.2.3-54-g00ecf From 14806b2d0010a1a26e57fc9066d44efd79d82871 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Mon, 23 Dec 2019 20:56:54 +0100 Subject: Put same entitlements in inherit file Otherwise the app wasn't starting and crashing with a SIGTRAP. I can't find the GitHub comment recommending to that as a fix to the ecountered issue but will add the link the the commit comments if I run into it again. --- build-helpers/entitlements.mas.inherit.plist | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/build-helpers/entitlements.mas.inherit.plist b/build-helpers/entitlements.mas.inherit.plist index e33c2158e..ef14228f0 100644 --- a/build-helpers/entitlements.mas.inherit.plist +++ b/build-helpers/entitlements.mas.inherit.plist @@ -2,7 +2,19 @@ - com.apple.security.inherit + com.apple.security.cs.allow-jit + + com.apple.security.cs.allow-unsigned-executable-memory + + com.apple.security.cs.disable-library-validation + + com.apple.security.device.camera + + com.apple.security.device.microphone + + com.apple.security.device.audio-input + + com.apple.security.network.client \ No newline at end of file -- cgit v1.2.3-54-g00ecf