From bb705a5a49c9366e9de8f6a4109969077b122fe1 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Fri, 13 Nov 2020 00:32:45 +0100
Subject: [PATCH] openvidu-electron updated to Electron 10

---
 openvidu-electron/package.json | 12 ++++++------
 openvidu-electron/src/app.js   | 26 +++++++++++++++-----------
 openvidu-electron/src/main.js  |  3 ++-
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/openvidu-electron/package.json b/openvidu-electron/package.json
index 2cc5aac0..30efc633 100644
--- a/openvidu-electron/package.json
+++ b/openvidu-electron/package.json
@@ -52,11 +52,11 @@
     "electron-squirrel-startup": "1.0.0"
   },
   "devDependencies": {
-    "@electron-forge/cli": "6.0.0-beta.43",
-    "@electron-forge/maker-deb": "6.0.0-beta.43",
-    "@electron-forge/maker-rpm": "6.0.0-beta.43",
-    "@electron-forge/maker-squirrel": "6.0.0-beta.43",
-    "@electron-forge/maker-zip": "6.0.0-beta.43",
-    "electron": "8.1.1"
+    "@electron-forge/cli": "6.0.0-beta.54",
+    "@electron-forge/maker-deb": "6.0.0-beta.54",
+    "@electron-forge/maker-rpm": "6.0.0-beta.54",
+    "@electron-forge/maker-squirrel": "6.0.0-beta.54",
+    "@electron-forge/maker-zip": "6.0.0-beta.54",
+    "electron": "10.1.5"
   }
 }
diff --git a/openvidu-electron/src/app.js b/openvidu-electron/src/app.js
index 2ddc1791..7334d70d 100644
--- a/openvidu-electron/src/app.js
+++ b/openvidu-electron/src/app.js
@@ -7,12 +7,14 @@ var publisher;
 var mySessionId;
 
 ipcRenderer.on('screen-share-ready', (event, message) => {
-    // User has chosen a screen to share. screenId is message parameter
-    showSession();
-    publisher = openvidu.initPublisher("publisher", {
-        videoSource: "screen:" + message
-    });
-    joinSession();
+    if (!!message) {
+        // User has chosen a screen to share. screenId is message parameter
+        showSession();
+        publisher = openvidu.initPublisher("publisher", {
+            videoSource: "screen:" + message
+        });
+        joinSession();
+    }
 });
 
 function initPublisher() {
@@ -38,7 +40,9 @@ function joinSession() {
     mySessionId = document.getElementById("sessionId").value;
 
     getToken(mySessionId).then(token => {
-        session.connect(token, {clientData: 'OpenVidu Electron'})
+        session.connect(token, {
+                clientData: 'OpenVidu Electron'
+            })
             .then(() => {
                 showSession();
                 session.publish(publisher);
@@ -72,10 +76,11 @@ function openScreenShareModal() {
         minimizable: false,
         maximizable: false,
         webPreferences: {
-            nodeIntegration: true
+            nodeIntegration: true,
+            enableRemoteModule: true
         },
         resizable: false
-    })
+    });
     win.setMenu(null);
     // win.webContents.openDevTools();
 
@@ -141,8 +146,7 @@ function createSession(sessionId) { // See https://docs.openvidu.io/en/stable/re
 function createToken(sessionId) { // See https://docs.openvidu.io/en/stable/reference-docs/REST-API/#post-openviduapisessionsltsession_idgtconnection
     return new Promise((resolve, reject) => {
         axios.post(
-                OPENVIDU_SERVER_URL + "/openvidu/api/sessions/" + sessionId + "/connection",
-                 {
+                OPENVIDU_SERVER_URL + "/openvidu/api/sessions/" + sessionId + "/connection", {
                     headers: {
                         'Authorization': "Basic " + btoa("OPENVIDUAPP:" + OPENVIDU_SERVER_SECRET),
                         'Content-Type': 'application/json',
diff --git a/openvidu-electron/src/main.js b/openvidu-electron/src/main.js
index 8a291876..2f747850 100644
--- a/openvidu-electron/src/main.js
+++ b/openvidu-electron/src/main.js
@@ -19,7 +19,8 @@ const createWindow = () => {
     width: 1280,
     height: 720,
     webPreferences: {
-      nodeIntegration: true
+      nodeIntegration: true,
+      enableRemoteModule: true
     }
   });