Skip to content
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.

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

Change OIDC template to OAuth2/OIDC in Custom Applications. #2559

Merged
merged 8 commits into from
Oct 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ export const InboundCustomProtocolForm: FunctionComponent<InboundCustomFormProps
onSubmit(updateConfiguration(values));
} }
>
<Grid className="form-container with-max-width">
<Grid>
{ generateFormElements() }
{ /* Certificates */ }
<Grid.Row columns={ 1 }>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,24 @@ export const InboundFormFactory: FunctionComponent<InboundFormFactoryInterface>
data-testid={ testId }
/>
);
case SupportedAuthProtocolTypes.OAUTH2_OIDC:
return (
<InboundOIDCForm
isLoading={ isLoading }
setIsLoading={ setIsLoading }
certificate={ certificate }
tenantDomain={ tenantDomain }
allowedOriginList={ allowedOrigins }
initialValues={ initialValues }
metadata={ metadata }
onSubmit={ onSubmit }
onApplicationRegenerate={ onApplicationRegenerate }
onApplicationRevoke={ onApplicationRevoke }
readOnly={ readOnly }
template={ template }
data-testid={ testId }
/>
);
case SupportedAuthProtocolTypes.SAML:
if (showSAMLCreation && SAMLCreationOption && SAMLCreationOption !== SAMLConfigModes.MANUAL) {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2629,7 +2629,7 @@ export const InboundOIDCForm: FunctionComponent<InboundOIDCFormPropsInterface> =
}
} }
>
<Grid className="form-container with-max-width">
<Grid>
{
(initialValues?.state === State.REVOKED) && (
<Grid.Row columns={ 1 }>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ export const InboundPassiveStsForm: FunctionComponent<InboundPassiveStsFormProps
onSubmit(updateConfiguration(values));
} }
>
<Grid className="form-container with-max-width">
<Grid>
<Grid.Row columns={ 1 }>
<Grid.Column mobile={ 16 } tablet={ 16 } computer={ 16 }>
<Field
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ export const InboundSAMLForm: FunctionComponent<InboundSAMLFormPropsInterface> =
}
} }
>
<Grid className="form-container with-max-width">
<Grid>
<Grid.Row columns={ 1 }>
<Grid.Column mobile={ 16 } tablet={ 16 } computer={ 16 }>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export const InboundWSTrustForm: FunctionComponent<InboundWSTrustFormPropsInterf
onSubmit(updateConfiguration(values));
} }
>
<Grid className="form-container with-max-width">
<Grid>
<Grid.Row columns={ 1 }>
<Grid.Column mobile={ 16 } tablet={ 16 } computer={ 16 }>
<Field
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export const InboundProtocolsMeta: AuthProtocolMetaListItemInterface[] = [
export const SupportedAuthProtocolTypeDisplayNames = {
[ SupportedAuthProtocolTypes.SAML ]: "SAML",
[ SupportedAuthProtocolTypes.OIDC ] : "OpenID Connect",
[ SupportedAuthProtocolTypes.OAUTH2_OIDC ] : "OAuth2.0/OpenID Connect",
[ SupportedAuthProtocolTypes.WS_FEDERATION ]: "Passive STS",
[ SupportedAuthProtocolTypes.WS_TRUST ]: "WS-Trust",
[ SupportedAuthProtocolTypes.CUSTOM ]: "Custom"
Expand Down

Large diffs are not rendered by default.

Loading