diff --git a/ui/desktop/app/services/ipc.js b/ui/desktop/app/services/ipc.js index 8173c1b8b..4c0cca671 100644 --- a/ui/desktop/app/services/ipc.js +++ b/ui/desktop/app/services/ipc.js @@ -1,7 +1,6 @@ import Service from '@ember/service'; import { getOwner } from '@ember/application'; import { Promise } from 'rsvp'; -import config from '../config/environment'; /** * An IPC request is a promise-like object that issues a request via @@ -54,12 +53,11 @@ export class IPCRequest { * @param {string} method * @param {object} payload * @param {Window} window - A reference to the window object - * @param {?string} origin */ - constructor(method, payload, window, origin = config.ipc.defaultOrigin) { + constructor(method, payload, window) { this.method = method; this.payload = payload; - this.origin = origin; + this.origin = window?.location?.origin; this.#channel = new MessageChannel(); this.#promise = new Promise((resolve /*, reject*/) => { this.#channel.port1.onmessage = (event) => { @@ -141,10 +139,9 @@ export default class IpcService extends Service { * Creates a new IPC request and returns it. * @param {string} method * @param {object} payload - * @param {object} origin * @return {IPCRequest} */ - invoke(method, payload, origin) { - return new IPCRequest(method, payload, this.window, origin); + invoke(method, payload) { + return new IPCRequest(method, payload, this.window); } } diff --git a/ui/desktop/config/environment.js b/ui/desktop/config/environment.js index 993d18e9b..e358c0cac 100644 --- a/ui/desktop/config/environment.js +++ b/ui/desktop/config/environment.js @@ -31,12 +31,6 @@ module.exports = function (environment) { namespace: 'v1', }, - ipc: { - defaultOrigin: process.env.EMBER_CLI_ELECTRON - ? 'serve://boundary' - : 'http://localhost:4200', - }, - appName: APP_NAME, }; diff --git a/ui/desktop/electron-app/src/preload.js b/ui/desktop/electron-app/src/preload.js index 8c9757b0d..c4b698a01 100644 --- a/ui/desktop/electron-app/src/preload.js +++ b/ui/desktop/electron-app/src/preload.js @@ -1,5 +1,6 @@ const { ipcRenderer } = require('electron'); -const emberAppOrigin = 'serve://boundary'; +// Messages must originate from this origin +const emberAppOrigin = window.location.origin; process.once('loaded', () => {