Skip to content

fix: initialize default SSO URL before saving #3121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sagarkt wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: initialize default SSO URL before saving #3121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/Pages/GlobalConfigurations/Authorization/SSOLoginServices/SSOLogin.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ import { OIDCType, SSOConfigType, SSOLoginProps, SSOLoginState, SSOLoginTabType
import '@Components/login/login.scss'
import './ssoLogin.scss'

const getDefaultSSOURL = (): string => `${window.location.origin}/orchestrator`

const SSOLoginTab: FC<SSOLoginTabType> = ({ handleSSOClick, checked, lastActiveSSO, value, SSOName }) => (
<label className="dc__tertiary-tab__radio">
<input
Expand Down Expand Up @@ -254,7 +256,7 @@ class SSOLogin extends Component<SSOLoginProps & RouterV5Props<{}>, SSOLoginStat
return {
id: ssoConfig.id,
name: ssoConfig.name,
url: ssoConfig.url || '',
url: ssoConfig.url || getDefaultSSOURL(),
config: {
name: ssoConfig.config.name,
type: ssoConfig.config.type,
Expand Down Expand Up @@ -716,6 +718,9 @@ class SSOLogin extends Component<SSOLoginProps & RouterV5Props<{}>, SSOLoginStat
...this.state.ssoConfig,
url: value,
},
isError: {
url: '',
},
})
}

Expand Down Expand Up @@ -743,7 +748,7 @@ class SSOLogin extends Component<SSOLoginProps & RouterV5Props<{}>, SSOLoginStat
<div className="flex left column dc__gap-24">
<div>
For <span className="fw-6">redirectURI or callbackURI</span> use: &nbsp;
{`${window.location.origin}/orchestrator`}
{getDefaultSSOURL()}
/api/dex/callback
<br />
Please ensure above URL is registered with the identity provider.
Expand Down Expand Up @@ -798,10 +803,10 @@ class SSOLogin extends Component<SSOLoginProps & RouterV5Props<{}>, SSOLoginStat
<div className="">Click to use:</div>
<button
type="button"
onClick={() => this.handleSSOURLLocation(`${window.location.origin}/orchestrator`)}
onClick={() => this.handleSSOURLLocation(getDefaultSSOURL())}
className="login__btn cg-5"
>
{window.location.origin}/orchestrator
{getDefaultSSOURL()}
</button>
</div>
</div>
Expand Down