if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

SDA-4014 Browser login setting name change (#1755)

Browse Source
This commit is contained in:
Salah Benmoussati
2023-03-09 10:17:52 +01:00
committed by GitHub
parent e0197135e5
commit 79ae1f3ff0
7 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/Symphony.config
View File

@@ -4,7 +4,7 @@
"autoUpdateChannel": "latest",
"isAutoUpdateEnabled": true,
"autoUpdateCheckInterval": "30",
"enableSeamlessLogin": false,
"enableBrowserLogin": false,
"overrideUserAgent": false,
"minimizeOnClose" : "ENABLED",
"launchOnStartup" : "ENABLED",

6
installer/win/WixSharpInstaller/Symphony.cs
View File

@@ -158,7 +158,7 @@ class Script
new PublicProperty("POINTER_LOCK", "true"),
new PublicProperty("USER_DATA_PATH", ""),
new PublicProperty("OVERRIDE_USER_AGENT", "false"),
new PublicProperty("ENABLE_SEAMLESS_LOGIN", "false"),
new PublicProperty("ENABLE_BROWSER_LOGIN", "false"),
new PublicProperty("CHROME_FLAGS", ""),
new Property("MSIINSTALLPERUSER", "1"),
new Property("PROGRAMSFOLDER", System.Environment.ExpandEnvironmentVariables(@"%PROGRAMFILES%"))
@@ -187,7 +187,7 @@ class Script
new ElevatedManagedAction(CustomActions.UpdateConfig, Return.check, When.After, Step.InstallFiles, Condition.NOT_BeingRemoved )
{
// The UpdateConfig action needs the built-in property INSTALLDIR as well as most of the custom properties
UsesProperties = "INSTALLDIR,POD_URL,CONTEXT_ORIGIN_URL,MINIMIZE_ON_CLOSE,ALWAYS_ON_TOP,AUTO_START,BRING_TO_FRONT,MEDIA,LOCATION,NOTIFICATIONS,MIDI_SYSEX,POINTER_LOCK,FULL_SCREEN,OPEN_EXTERNAL,CUSTOM_TITLE_BAR,DEV_TOOLS_ENABLED,AUTO_LAUNCH_PATH,USER_DATA_PATH,OVERRIDE_USER_AGENT,CHROME_FLAGS,ENABLE_SEAMLESS_LOGIN"
UsesProperties = "INSTALLDIR,POD_URL,CONTEXT_ORIGIN_URL,MINIMIZE_ON_CLOSE,ALWAYS_ON_TOP,AUTO_START,BRING_TO_FRONT,MEDIA,LOCATION,NOTIFICATIONS,MIDI_SYSEX,POINTER_LOCK,FULL_SCREEN,OPEN_EXTERNAL,CUSTOM_TITLE_BAR,DEV_TOOLS_ENABLED,AUTO_LAUNCH_PATH,USER_DATA_PATH,OVERRIDE_USER_AGENT,CHROME_FLAGS,ENABLE_BROWSER_LOGIN"
},
// CleanRegistry
@@ -361,7 +361,7 @@ public class CustomActions
data = ReplaceBooleanProperty(data, "fullscreen", session.Property("FULL_SCREEN"));
data = ReplaceBooleanProperty(data, "devToolsEnabled", session.Property("DEV_TOOLS_ENABLED"));
data = ReplaceBooleanProperty(data, "overrideUserAgent", session.Property("OVERRIDE_USER_AGENT"));
data = ReplaceBooleanProperty(data, "enableSeamlessLogin", session.Property("ENABLE_SEAMLESS_LOGIN"));
data = ReplaceBooleanProperty(data, "enableBrowserLogin", session.Property("ENABLE_BROWSER_LOGIN"));
// Write the contents back to the file
System.IO.File.WriteAllText(filename, data);
}

6
installer/win/install_instructions_win.md
View File

@@ -530,7 +530,7 @@ Expected values:
-------------------------------------------------------------------
### ENABLE_SEAMLESS_LOGIN
### ENABLE_BROWSER_LOGIN
Expected values:
@@ -541,11 +541,11 @@ Expected values:
#### Example, install with user-agent override
msiexec /i Symphony.msi ENABLE_SEAMLESS_LOGIN="true"
msiexec /i Symphony.msi ENABLE_BROWSER_LOGIN="true"
#### Example, install without user-agent override
msiexec /i Symphony.msi ENABLE_SEAMLESS_LOGIN="false"
msiexec /i Symphony.msi ENABLE_BROWSER_LOGIN="false"
or

12
src/app/app-menu.ts
View File

@@ -84,7 +84,7 @@ const menuItemConfigFields = [
'isCustomTitleBar',
'devToolsEnabled',
'isAutoUpdateEnabled',
'enableSeamlessLogin',
'enableBrowserLogin',
];
let {
@@ -96,7 +96,7 @@ let {
isCustomTitleBar,
devToolsEnabled,
isAutoUpdateEnabled,
enableSeamlessLogin,
enableBrowserLogin,
} = config.getConfigFields(menuItemConfigFields) as IConfig;
let initialAnalyticsSent = false;
const CORP_URL = 'https://corporate.symphony.com';
@@ -242,7 +242,7 @@ export class AppMenu {
isCustomTitleBar = configData.isCustomTitleBar;
devToolsEnabled = configData.devToolsEnabled;
isAutoUpdateEnabled = configData.isAutoUpdateEnabled;
enableSeamlessLogin = configData.enableSeamlessLogin;
enableBrowserLogin = configData.enableBrowserLogin;
// fetch updated cloud config
this.cloudConfig = config.getFilteredCloudConfigFields(
this.menuItemConfigFields,
@@ -519,10 +519,10 @@ export class AppMenu {
},
{
type: 'checkbox',
label: i18n.t('Third-party browser login')(),
checked: enableSeamlessLogin,
label: i18n.t('Browser login')(),
checked: enableBrowserLogin,
click: () => {
restartDialog({ enableSeamlessLogin: !enableSeamlessLogin });
restartDialog({ enableBrowserLogin: !enableBrowserLogin });
},
},
this.buildSeparator(),

2
src/app/config-handler.ts
View File

@@ -58,7 +58,7 @@ export interface IConfig {
installVariant?: string;
bootCount?: number;
startedAfterAutoUpdate?: boolean;
enableSeamlessLogin: boolean;
enableBrowserLogin: boolean;
}
export interface IGlobalConfig {

6
src/app/window-handler.ts
View File

@@ -221,7 +221,7 @@ export class WindowHandler {
'customFlags',
'clientSwitch',
'enableRendererLogs',
'enableSeamlessLogin',
'enableBrowserLogin',
]);
logger.info(
`window-handler: main windows initialized with following config data`,
@@ -252,7 +252,7 @@ export class WindowHandler {
this.isPodConfigured = !config.isFirstTimeLaunch();
this.didShowWelcomeScreen = false;
this.shouldShowWelcomeScreen =
config.isFirstTimeLaunch() || this.config.enableSeamlessLogin;
config.isFirstTimeLaunch() || this.config.enableBrowserLogin;
this.windowOpts = {
...this.getWindowOpts(
@@ -566,7 +566,7 @@ export class WindowHandler {
message: '',
urlValid: !!userConfigUrl,
isPodConfigured: this.isPodConfigured && !!userConfigUrl,
isSeamlessLoginEnabled: this.config.enableSeamlessLogin,
isSeamlessLoginEnabled: this.config.enableBrowserLogin,
});
this.didShowWelcomeScreen = true;
}

3
src/locale/en-US.json
View File

@@ -252,5 +252,6 @@
"BE_RIGHT_BACK": "Be right back",
"IN_A_MEETING": "In a meeting"
},
"Status": "Status"
"Status": "Status",
"Browser login": "Browser login"
}