mirror of
https://github.com/finos/SymphonyElectron.git
synced 2025-02-25 18:55:29 -06:00
This reverts commit 2e4dceef7a
.
This commit is contained in:
parent
2e4dceef7a
commit
19ea15510a
@ -115,14 +115,15 @@ export const setChromeFlags = () => {
|
|||||||
export const setSessionProperties = () => {
|
export const setSessionProperties = () => {
|
||||||
logger.info(`chrome-flags: Settings session properties`);
|
logger.info(`chrome-flags: Settings session properties`);
|
||||||
const { customFlags } = config.getConfigFields(['customFlags']) as IConfig;
|
const { customFlags } = config.getConfigFields(['customFlags']) as IConfig;
|
||||||
|
const { defaultSession } = session;
|
||||||
|
|
||||||
if (
|
if (
|
||||||
session.defaultSession &&
|
defaultSession &&
|
||||||
customFlags &&
|
customFlags &&
|
||||||
customFlags.authServerWhitelist &&
|
customFlags.authServerWhitelist &&
|
||||||
customFlags.authServerWhitelist !== ''
|
customFlags.authServerWhitelist !== ''
|
||||||
) {
|
) {
|
||||||
session.defaultSession.allowNTLMCredentialsForDomains(
|
defaultSession.allowNTLMCredentialsForDomains(
|
||||||
customFlags.authServerWhitelist,
|
customFlags.authServerWhitelist,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
20
src/app/display-media-request-handler.ts
Normal file
20
src/app/display-media-request-handler.ts
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import { session } from 'electron';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is currently supported only on macOS 15+.
|
||||||
|
* setDisplayMediaRequestHandler injects into navigator.mediaDevices.getDisplayMedia().
|
||||||
|
* With the macOS-only option { useSystemPicker: true },
|
||||||
|
* everyting is handled natively by the OS.
|
||||||
|
*
|
||||||
|
* For all other OSes and versions, the regular screen share flow will be used.
|
||||||
|
*/
|
||||||
|
export const setDisplayMediaRequestHandler = () => {
|
||||||
|
const { defaultSession } = session;
|
||||||
|
|
||||||
|
defaultSession.setDisplayMediaRequestHandler(
|
||||||
|
async (_request, _callback) => {
|
||||||
|
// TODO - Add support for Windows.
|
||||||
|
},
|
||||||
|
{ useSystemPicker: true },
|
||||||
|
);
|
||||||
|
};
|
@ -8,6 +8,7 @@ import { cleanUpAppCache, createAppCacheFile } from './app-cache-handler';
|
|||||||
import { setChromeFlags, setSessionProperties } from './chrome-flags';
|
import { setChromeFlags, setSessionProperties } from './chrome-flags';
|
||||||
import { config } from './config-handler';
|
import { config } from './config-handler';
|
||||||
import './dialog-handler';
|
import './dialog-handler';
|
||||||
|
import { setDisplayMediaRequestHandler } from './display-media-request-handler';
|
||||||
import './main-api-handler';
|
import './main-api-handler';
|
||||||
import { handlePerformanceSettings } from './perf-handler';
|
import { handlePerformanceSettings } from './perf-handler';
|
||||||
import { protocolHandler } from './protocol-handler';
|
import { protocolHandler } from './protocol-handler';
|
||||||
@ -108,6 +109,7 @@ const startApplication = async () => {
|
|||||||
// Picks global config values and updates them in the user config
|
// Picks global config values and updates them in the user config
|
||||||
await config.updateUserConfigOnStart();
|
await config.updateUserConfigOnStart();
|
||||||
setSessionProperties();
|
setSessionProperties();
|
||||||
|
setDisplayMediaRequestHandler();
|
||||||
await autoUpdate.init();
|
await autoUpdate.init();
|
||||||
await windowHandler.createApplication();
|
await windowHandler.createApplication();
|
||||||
logger.info(`main: created application`);
|
logger.info(`main: created application`);
|
||||||
|
Loading…
Reference in New Issue
Block a user