From 296ce5ce62bcde6888df291f97105fa912ed7d35 Mon Sep 17 00:00:00 2001 From: Vijay Raghavan Aravamudhan Date: Wed, 26 May 2021 21:05:50 +0530 Subject: Replace 'remote' with 'electron/remote' (#1448) * Locked new version of 'recipes' submodule with corresponding changes. --- src/models/Service.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/models') diff --git a/src/models/Service.js b/src/models/Service.js index a980ca4a3..b76e92a53 100644 --- a/src/models/Service.js +++ b/src/models/Service.js @@ -1,5 +1,6 @@ import { autorun, computed, observable } from 'mobx'; -import { ipcRenderer, remote } from 'electron'; +import { ipcRenderer } from 'electron'; +import { webContents } from '@electron/remote'; import normalizeUrl from 'normalize-url'; import path from 'path'; @@ -246,7 +247,7 @@ export default class Service { initializeWebViewEvents({ handleIPCMessage, openWindow, stores }) { - const webContents = remote.webContents.fromId(this.webview.getWebContentsId()); + const webviewWebContents = webContents.fromId(this.webview.getWebContentsId()); // If the recipe has implemented modifyRequestHeaders, // Send those headers to ipcMain so that it can be set in session @@ -337,14 +338,14 @@ export default class Service { this.hasCrashed = true; }); - webContents.on('login', (event, request, authInfo, callback) => { + webviewWebContents.on('login', (event, request, authInfo, callback) => { // const authCallback = callback; debug('browser login event', authInfo); event.preventDefault(); if (authInfo.isProxy && authInfo.scheme === 'basic') { debug('Sending service echo ping'); - webContents.send('get-service-id'); + webviewWebContents.send('get-service-id'); debug('Received service id', this.id); -- cgit v1.2.3-54-g00ecf