Merge pull request #2559 from brionmario/feature-imrpove-totp

Change `OIDC` template to `OAuth2/OIDC` in Custom Applications.

Author: brionmario

apps/console/src/features/applications/components/forms/inbound-custom-form.tsx

@@ -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 }>

apps/console/src/features/applications/components/forms/inbound-form-factory.tsx

@@ -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 (

apps/console/src/features/applications/components/forms/inbound-oidc-form.tsx

@@ -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 }>

apps/console/src/features/applications/components/forms/inbound-passive-sts-form.tsx

@@ -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

apps/console/src/features/applications/components/forms/inbound-saml-form.tsx

@@ -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 }>
                                 {

apps/console/src/features/applications/components/forms/inbound-ws-trust-form.tsx

@@ -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

apps/console/src/features/applications/components/meta/inbound-protocols.meta.ts

@@ -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"