if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-12-29 02:11:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1751 from sbenmoussati/bugfix/SDA-4076

Browse Source 
SDA-4076 Add support for app restart while enabling browser authentication before defining pod URL at first time launch
This commit is contained in:
NguyenTranHoangSym 2023-03-07 23:25:38 -05:00 committed by GitHub
commit 1dab2992dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -565,7 +565,7 @@ export class WindowHandler {
url: userConfigUrl, url: userConfigUrl,
message: '', message: '',
urlValid: !!userConfigUrl, urlValid: !!userConfigUrl,
isPodConfigured: this.isPodConfigured, isPodConfigured: this.isPodConfigured && !!userConfigUrl,
isSeamlessLoginEnabled: this.config.enableSeamlessLogin, isSeamlessLoginEnabled: this.config.enableSeamlessLogin,
}); });
this.didShowWelcomeScreen = true; this.didShowWelcomeScreen = true;

2
src/renderer/components/welcome.tsx
View File

@ -151,7 +151,7 @@ export default class Welcome extends React.Component<{}, IState> {
const url = _event.target.value.trim(); const url = _event.target.value.trim();
const match = const match =
url.match( url.match(
/(https?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/g, /^https:\/\/.(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/g,
) != null; ) != null;
if (url === 'https://[POD].symphony.com' || !match) { if (url === 'https://[POD].symphony.com' || !match) {
this.updateState(_event, { this.updateState(_event, {