SDA-4113: Add url from CMD #1810
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
src/app/window-handler.ts
Outdated
| const defaultUrl = 'my.symphony.com'; | ||
| const podUrl = !this.globalConfig.url.includes(defaultUrl) | ||
| ? this.globalConfig.url | ||
| : this.userConfig.url; | ||
| const userConfigUrl = |
There was a problem hiding this comment.
I think it can be removed
src/app/window-handler.ts
Outdated
| const defaultUrl = 'my.symphony.com'; | ||
| const podUrl = !this.globalConfig.url.includes(defaultUrl) | ||
| ? this.globalConfig.url | ||
| : this.userConfig.url; | ||
| const userConfigUrl = | ||
| this.userConfig.url && | ||
| this.userConfig.url.indexOf('/login/sso/initsso') > -1 |
There was a problem hiding this comment.
same logic should be on podUrl
NguyenTranHoangSym
force-pushed
the
SDA-4113
branch
from
f24b1d6
to
3438ce1
Compare
src/app/window-handler.ts
Outdated
| @@ -549,23 +549,28 @@ export class WindowHandler { | |||
| if (this.mainWebContents && !this.mainWebContents.isDestroyed()) { | |||
| // Load welcome screen | |||
| if (this.shouldShowWelcomeScreen && !this.didShowWelcomeScreen) { | |||
| const userConfigUrl = | |||
| const defaultUrl = 'my.symphony.com'; | |||
| const customUrl = this.userConfig.url.slice( | |||
There was a problem hiding this comment.
I believe you need to be safer here, url can be not set if it's a first time launch --> slice of undefined --> error
Also, you could rename it customUserConfigUrl
There was a problem hiding this comment.
here I think there is no need to do the check on sso, let's do it once and forall on podUrl, wdyt?
There was a problem hiding this comment.
@sbenmoussati
Hmm I dont seem to get the idea here. customUserConfigUrl meant to get the config instead.
at PodUrl:
Check if userconfig contains sso
get the value and assign to customUserConfigUrl
NguyenTranHoangSym
force-pushed
the
SDA-4113
branch
from
3438ce1
to
16bba0e
Compare
sbenmoussati
approved these changes
Mar 29, 2023
NguyenTranHoangSym
force-pushed
the
SDA-4113
branch
from
16bba0e
to
7382a5e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
POD_URL will now be able to update URL at welcome screen
Related PRs