Merge pull request #1810 from NguyenTranHoangSym/SDA-4113

SDA-4113: Add url from CMD
finos · Mar 30, 2023 · 66322e2 · 66322e2
2 parents 5f4fd98 + 7382a5e
commit 66322e2
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/app/window-handler.ts b/src/app/window-handler.ts
@@ -550,20 +550,17 @@ export class WindowHandler {
       if (this.mainWebContents && !this.mainWebContents.isDestroyed()) {
         // Load welcome screen
         if (this.shouldShowWelcomeScreen && !this.didShowWelcomeScreen) {
-          const userConfigUrl =
-            this.userConfig.url &&
-            this.userConfig.url.indexOf('/login/sso/initsso') > -1
-              ? this.userConfig.url.slice(
-                  0,
-                  this.userConfig.url.indexOf('/login/sso/initsso'),
-                )
-              : this.userConfig.url;
+          const defaultUrl = 'my.symphony.com';
+          const podUrl = this.userConfig.url
+            ? this.userConfig.url
+            : !this.globalConfig.url.includes(defaultUrl) &&
+              this.globalConfig.url;
           this.mainWebContents.send('page-load-welcome', {
             locale: i18n.getLocale(),
             resources: i18n.loadedResources,
           });
           this.mainWebContents.send('welcome', {
-            url: userConfigUrl,
+            url: podUrl,
             message: '',
             urlValid: !!userConfigUrl,
             isPodConfigured: this.isPodConfigured && !!userConfigUrl,