From 33f250c32d0ba9818e376deeab5908288f9be721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Vay=C3=A1?= <guillermo.vaya@mattermost.com>
Date: Mon, 18 Jan 2021 13:43:13 -0800
Subject: [PATCH] [MM-31987] Allow camera use for jitsi (#1443)

* [MM-31987] allow camera use for jitsi

* update message for access
---
 .gitignore                                   |  3 +--
 build/entitlements.mac.plist                 | 18 ++++++++++++++++++
 electron-builder.json                        |  8 +++++++-
 resources/osx/entitlements.mac.inherit.plist | 13 -------------
 4 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 build/entitlements.mac.plist
 delete mode 100644 resources/osx/entitlements.mac.inherit.plist

diff --git a/.gitignore b/.gitignore
index 850c9322..3c080186 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ node_modules/
 release/
 npm-debug.log*
 
-build/
 dist/
 
 test-results.xml
@@ -18,4 +17,4 @@ testUserData
 src/browser/*.png
 src/browser/*.svg
 src/browser/*.woff2
-src/browser/assets/fonts/
\ No newline at end of file
+src/browser/assets/fonts/
diff --git a/build/entitlements.mac.plist b/build/entitlements.mac.plist
new file mode 100644
index 00000000..b4fb81fc
--- /dev/null
+++ b/build/entitlements.mac.plist
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.device.microphone</key>
+	<true/>
+	<key>com.apple.security.device.camera</key>
+	<true/>
+	<key>com.apple.security.device.audio-input</key>
+	<true/>
+	<key>com.apple.security.cs.allow-jit</key>
+	<true/>
+	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+	<true/>
+	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
+	<true/>
+</dict>
+</plist>
diff --git a/electron-builder.json b/electron-builder.json
index 03bb3c2f..df44b579 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -77,7 +77,13 @@
       }
     ],
     "hardenedRuntime": true,
-    "gatekeeperAssess": true
+    "gatekeeperAssess": true,
+    "entitlements": "./build/entitlements.mac.plist",
+    "entitlementsInherit": "./build/entitlements.mac.plist",
+    "extendInfo": {
+      "NSMicrophoneUsageDescription": "Microphone access may be used by Mattermost plugins, such as Jitsi video conferencing.",
+      "NSCameraUsageDescription": "Camera access may be used by Mattermost plugins, such as Jitsi video conferencing."
+  }
   },
   "dmg": {
     "background": "resources/osx/DMG_BG.png",
diff --git a/resources/osx/entitlements.mac.inherit.plist b/resources/osx/entitlements.mac.inherit.plist
deleted file mode 100644
index 754872a4..00000000
--- a/resources/osx/entitlements.mac.inherit.plist
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>com.apple.security.cs.allow-jit</key>
-    <true/>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
-    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
-    <true/>
-  </dict>
-</plist>
-