From a5f2cb8bd93ce6c29d82d89706d07bd146a3068b Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Tue, 12 Jun 2018 17:40:12 -0500 Subject: [PATCH] fix(google-auth): popup. --- modules/API/external/electronPopupsConfig.json | 8 ++++++++ modules/API/external/external_api.js | 14 ++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 modules/API/external/electronPopupsConfig.json diff --git a/modules/API/external/electronPopupsConfig.json b/modules/API/external/electronPopupsConfig.json new file mode 100644 index 000000000..1bef15060 --- /dev/null +++ b/modules/API/external/electronPopupsConfig.json @@ -0,0 +1,8 @@ +{ + "google-auth": { + "matchPatterns": { + "url": "accounts.google.com" + }, + "target": "electron" + } +} diff --git a/modules/API/external/external_api.js b/modules/API/external/external_api.js index fa5271cb4..870d4da31 100644 --- a/modules/API/external/external_api.js +++ b/modules/API/external/external_api.js @@ -6,6 +6,8 @@ import { Transport } from '../../transport'; +import electronPopupsConfig from './electronPopupsConfig.json'; + const logger = require('jitsi-meet-logger').getLogger(__filename); const ALWAYS_ON_TOP_FILENAMES = [ @@ -712,4 +714,16 @@ export default class JitsiMeetExternalAPI extends EventEmitter { removeEventListeners(eventList) { eventList.forEach(event => this.removeEventListener(event)); } + + /** + * Returns the configuration for electron for the windows that are open + * from Jitsi Meet. + * + * @returns {Promise} + * + * NOTE: For internal use only. + */ + _getElectronPopupsConfig() { + return Promise.resolve(electronPopupsConfig); + } }