web/admin: fix missing div in wizard forms (#11794)

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
This commit is contained in:
Jens L.
2024-10-24 17:56:20 +02:00
committed by GitHub
parent f482937474
commit 3fc0904425
3 changed files with 137 additions and 145 deletions

View File

@ -113,9 +113,8 @@ export class ApplicationWizardAuthenticationByOauth extends BaseProviderPanel {
<ak-text-input <ak-text-input
name="clientSecret" name="clientSecret"
label=${msg("Client Secret")} label=${msg("Client Secret")}
value=${ value=${provider?.clientSecret ??
provider?.clientSecret ?? randomString(128, ascii_letters + digits) randomString(128, ascii_letters + digits)}
}
.errorMessages=${errors?.clientSecret ?? []} .errorMessages=${errors?.clientSecret ?? []}
?hidden=${!this.showClientSecret} ?hidden=${!this.showClientSecret}
> >
@ -150,35 +149,36 @@ export class ApplicationWizardAuthenticationByOauth extends BaseProviderPanel {
<ak-form-group> <ak-form-group>
<span slot="header"> ${msg("Advanced flow settings")} </span> <span slot="header"> ${msg("Advanced flow settings")} </span>
<ak-form-element-horizontal <div slot="body" class="pf-c-form">
name="authenticationFlow" <ak-form-element-horizontal
label=${msg("Authentication flow")} name="authenticationFlow"
> label=${msg("Authentication flow")}
<ak-flow-search >
flowType=${FlowsInstancesListDesignationEnum.Authentication} <ak-flow-search
.currentFlow=${provider?.authenticationFlow} flowType=${FlowsInstancesListDesignationEnum.Authentication}
></ak-flow-search> .currentFlow=${provider?.authenticationFlow}
<p class="pf-c-form__helper-text"> ></ak-flow-search>
${msg( <p class="pf-c-form__helper-text">
"Flow used when a user access this provider and is not authenticated.", ${msg(
)} "Flow used when a user access this provider and is not authenticated.",
</p> )}
</ak-form-element-horizontal> </p>
<ak-form-element-horizontal </ak-form-element-horizontal>
label=${msg("Invalidation flow")} <ak-form-element-horizontal
name="invalidationFlow" label=${msg("Invalidation flow")}
required name="invalidationFlow"
>
<ak-flow-search
flowType=${FlowsInstancesListDesignationEnum.Invalidation}
.currentFlow=${provider?.invalidationFlow}
defaultFlowSlug="default-provider-invalidation-flow"
required required
></ak-flow-search> >
<p class="pf-c-form__helper-text"> <ak-flow-search
${msg("Flow used when logging out of this provider.")} flowType=${FlowsInstancesListDesignationEnum.Invalidation}
</p> .currentFlow=${provider?.invalidationFlow}
</ak-form-element-horizontal> defaultFlowSlug="default-provider-invalidation-flow"
required
></ak-flow-search>
<p class="pf-c-form__helper-text">
${msg("Flow used when logging out of this provider.")}
</p>
</ak-form-element-horizontal>
</div> </div>
</ak-form-group> </ak-form-group>
<ak-form-group> <ak-form-group>

View File

@ -161,11 +161,9 @@ export class AkTypeProxyApplicationWizardPage extends BaseProviderPanel {
<ak-textarea-input <ak-textarea-input
name="skipPathRegex" name="skipPathRegex"
label=${ label=${this.mode === ProxyMode.ForwardDomain
this.mode === ProxyMode.ForwardDomain ? msg("Unauthenticated URLs")
? msg("Unauthenticated URLs") : msg("Unauthenticated Paths")}
: msg("Unauthenticated Paths")
}
value=${ifDefined(this.instance?.skipPathRegex)} value=${ifDefined(this.instance?.skipPathRegex)}
.errorMessages=${errors?.skipPathRegex ?? []} .errorMessages=${errors?.skipPathRegex ?? []}
.bighelp=${html` <p class="pf-c-form__helper-text"> .bighelp=${html` <p class="pf-c-form__helper-text">
@ -184,35 +182,36 @@ export class AkTypeProxyApplicationWizardPage extends BaseProviderPanel {
</ak-form-group> </ak-form-group>
<ak-form-group> <ak-form-group>
<span slot="header"> ${msg("Advanced flow settings")} </span> <span slot="header"> ${msg("Advanced flow settings")} </span>
<ak-form-element-horizontal <div slot="body" class="pf-c-form">
name="authenticationFlow" <ak-form-element-horizontal
label=${msg("Authentication flow")} name="authenticationFlow"
> label=${msg("Authentication flow")}
<ak-flow-search >
flowType=${FlowsInstancesListDesignationEnum.Authentication} <ak-flow-search
.currentFlow=${this.instance?.authenticationFlow} flowType=${FlowsInstancesListDesignationEnum.Authentication}
></ak-flow-search> .currentFlow=${this.instance?.authenticationFlow}
<p class="pf-c-form__helper-text"> ></ak-flow-search>
${msg( <p class="pf-c-form__helper-text">
"Flow used when a user access this provider and is not authenticated.", ${msg(
)} "Flow used when a user access this provider and is not authenticated.",
</p> )}
</ak-form-element-horizontal> </p>
<ak-form-element-horizontal </ak-form-element-horizontal>
label=${msg("Invalidation flow")} <ak-form-element-horizontal
name="invalidationFlow" label=${msg("Invalidation flow")}
required name="invalidationFlow"
>
<ak-flow-search
flowType=${FlowsInstancesListDesignationEnum.Invalidation}
.currentFlow=${this.instance?.invalidationFlow}
defaultFlowSlug="default-provider-invalidation-flow"
required required
></ak-flow-search> >
<p class="pf-c-form__helper-text"> <ak-flow-search
${msg("Flow used when logging out of this provider.")} flowType=${FlowsInstancesListDesignationEnum.Invalidation}
</p> .currentFlow=${this.instance?.invalidationFlow}
</ak-form-element-horizontal> defaultFlowSlug="default-provider-invalidation-flow"
required
></ak-flow-search>
<p class="pf-c-form__helper-text">
${msg("Flow used when logging out of this provider.")}
</p>
</ak-form-element-horizontal>
</div> </div>
</ak-form-group> </ak-form-group>
<ak-form-group> <ak-form-group>

View File

@ -146,36 +146,37 @@ export class ApplicationWizardProviderSamlConfiguration extends BaseProviderPane
</ak-form-group> </ak-form-group>
<ak-form-group> <ak-form-group>
<span slot="header"> ${msg("Advanced flow settings")} </span> <span slot="header"> ${msg("Advanced flow settings")}</span>
<ak-form-element-horizontal <div slot="body" class="pf-c-form">
name="authenticationFlow" <ak-form-element-horizontal
label=${msg("Authentication flow")} name="authenticationFlow"
> label=${msg("Authentication flow")}
<ak-flow-search >
flowType=${FlowsInstancesListDesignationEnum.Authentication} <ak-flow-search
.currentFlow=${provider?.authenticationFlow} flowType=${FlowsInstancesListDesignationEnum.Authentication}
></ak-flow-search> .currentFlow=${provider?.authenticationFlow}
<p class="pf-c-form__helper-text"> ></ak-flow-search>
${msg( <p class="pf-c-form__helper-text">
"Flow used when a user access this provider and is not authenticated.", ${msg(
)} "Flow used when a user access this provider and is not authenticated.",
</p> )}
</ak-form-element-horizontal> </p>
<ak-form-element-horizontal </ak-form-element-horizontal>
label=${msg("Invalidation flow")} <ak-form-element-horizontal
name="invalidationFlow" label=${msg("Invalidation flow")}
required name="invalidationFlow"
>
<ak-flow-search
flowType=${FlowsInstancesListDesignationEnum.Invalidation}
.currentFlow=${provider?.invalidationFlow}
defaultFlowSlug="default-provider-invalidation-flow"
required required
></ak-flow-search> >
<p class="pf-c-form__helper-text"> <ak-flow-search
${msg("Flow used when logging out of this provider.")} flowType=${FlowsInstancesListDesignationEnum.Invalidation}
</p> .currentFlow=${provider?.invalidationFlow}
</ak-form-element-horizontal> defaultFlowSlug="default-provider-invalidation-flow"
required
></ak-flow-search>
<p class="pf-c-form__helper-text">
${msg("Flow used when logging out of this provider.")}
</p>
</ak-form-element-horizontal>
</div> </div>
</ak-form-group> </ak-form-group>
<ak-form-group> <ak-form-group>
@ -199,60 +200,52 @@ export class ApplicationWizardProviderSamlConfiguration extends BaseProviderPane
)} )}
</p> </p>
</ak-form-element-horizontal> </ak-form-element-horizontal>
${ ${this.hasSigningKp
this.hasSigningKp ? html` <ak-form-element-horizontal name="signAssertion">
? html` <ak-form-element-horizontal name="signAssertion"> <label class="pf-c-switch">
<label class="pf-c-switch"> <input
<input class="pf-c-switch__input"
class="pf-c-switch__input" type="checkbox"
type="checkbox" ?checked=${first(provider?.signAssertion, true)}
?checked=${first(provider?.signAssertion, true)} />
/> <span class="pf-c-switch__toggle">
<span class="pf-c-switch__toggle"> <span class="pf-c-switch__toggle-icon">
<span class="pf-c-switch__toggle-icon"> <i class="fas fa-check" aria-hidden="true"></i>
<i
class="fas fa-check"
aria-hidden="true"
></i>
</span>
</span> </span>
<span class="pf-c-switch__label" </span>
>${msg("Sign assertions")}</span <span class="pf-c-switch__label"
> >${msg("Sign assertions")}</span
</label> >
<p class="pf-c-form__helper-text"> </label>
${msg( <p class="pf-c-form__helper-text">
"When enabled, the assertion element of the SAML response will be signed.", ${msg(
)} "When enabled, the assertion element of the SAML response will be signed.",
</p> )}
</ak-form-element-horizontal> </p>
<ak-form-element-horizontal name="signResponse"> </ak-form-element-horizontal>
<label class="pf-c-switch"> <ak-form-element-horizontal name="signResponse">
<input <label class="pf-c-switch">
class="pf-c-switch__input" <input
type="checkbox" class="pf-c-switch__input"
?checked=${first(provider?.signResponse, false)} type="checkbox"
/> ?checked=${first(provider?.signResponse, false)}
<span class="pf-c-switch__toggle"> />
<span class="pf-c-switch__toggle-icon"> <span class="pf-c-switch__toggle">
<i <span class="pf-c-switch__toggle-icon">
class="fas fa-check" <i class="fas fa-check" aria-hidden="true"></i>
aria-hidden="true"
></i>
</span>
</span> </span>
<span class="pf-c-switch__label" </span>
>${msg("Sign responses")}</span <span class="pf-c-switch__label"
> >${msg("Sign responses")}</span
</label> >
<p class="pf-c-form__helper-text"> </label>
${msg( <p class="pf-c-form__helper-text">
"When enabled, the assertion element of the SAML response will be signed.", ${msg(
)} "When enabled, the assertion element of the SAML response will be signed.",
</p> )}
</ak-form-element-horizontal>` </p>
: nothing </ak-form-element-horizontal>`
} : nothing}
<ak-form-element-horizontal <ak-form-element-horizontal
label=${msg("Verification Certificate")} label=${msg("Verification Certificate")}