diff --git a/web/src/admin/applications/ApplicationCheckAccessForm.ts b/web/src/admin/applications/ApplicationCheckAccessForm.ts index 90beb3786..59292e17d 100644 --- a/web/src/admin/applications/ApplicationCheckAccessForm.ts +++ b/web/src/admin/applications/ApplicationCheckAccessForm.ts @@ -114,7 +114,7 @@ export class ApplicationCheckAccessForm extends Form<{ forUser: number }> { `; } - renderInlineForm(): TemplateResult { + renderForm(): TemplateResult { return html` { } renderForm(): TemplateResult { - return html`
- + return html` - - `; + `; } } diff --git a/web/src/admin/blueprints/BlueprintForm.ts b/web/src/admin/blueprints/BlueprintForm.ts index d8d34dd82..f47b967cf 100644 --- a/web/src/admin/blueprints/BlueprintForm.ts +++ b/web/src/admin/blueprints/BlueprintForm.ts @@ -68,8 +68,7 @@ export class BlueprintForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` {

- - `; + `; } } diff --git a/web/src/admin/crypto/CertificateGenerateForm.ts b/web/src/admin/crypto/CertificateGenerateForm.ts index 000c18462..85f2fde9e 100644 --- a/web/src/admin/crypto/CertificateGenerateForm.ts +++ b/web/src/admin/crypto/CertificateGenerateForm.ts @@ -20,7 +20,7 @@ export class CertificateKeyPairForm extends Form { }); } - renderInlineForm(): TemplateResult { + renderForm(): TemplateResult { return html` - + return html` - - `; + `; } } diff --git a/web/src/admin/enterprise/EnterpriseLicenseForm.ts b/web/src/admin/enterprise/EnterpriseLicenseForm.ts index c54c59423..ebce9938d 100644 --- a/web/src/admin/enterprise/EnterpriseLicenseForm.ts +++ b/web/src/admin/enterprise/EnterpriseLicenseForm.ts @@ -46,13 +46,12 @@ export class EnterpriseLicenseForm extends ModelForm { renderForm(): TemplateResult { // prettier-ignore - return html`
+ return html` - -
`; +
`; } } diff --git a/web/src/admin/events/RuleForm.ts b/web/src/admin/events/RuleForm.ts index b0d0c017c..43e54ab89 100644 --- a/web/src/admin/events/RuleForm.ts +++ b/web/src/admin/events/RuleForm.ts @@ -58,8 +58,7 @@ export class RuleForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` { .value=${this.instance?.severity} > - - `; +
`; } } diff --git a/web/src/admin/events/TransportForm.ts b/web/src/admin/events/TransportForm.ts index 5042be939..46fce43cb 100644 --- a/web/src/admin/events/TransportForm.ts +++ b/web/src/admin/events/TransportForm.ts @@ -68,8 +68,7 @@ export class TransportForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` { "Only send notification once, for example when sending a webhook into a chat channel.", )}

-
- `; +
`; } } diff --git a/web/src/admin/flows/FlowForm.ts b/web/src/admin/flows/FlowForm.ts index 2bc32bde5..a78c0f4fa 100644 --- a/web/src/admin/flows/FlowForm.ts +++ b/web/src/admin/flows/FlowForm.ts @@ -78,8 +78,7 @@ export class FlowForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` {

`} - - `; + `; } } diff --git a/web/src/admin/flows/FlowImportForm.ts b/web/src/admin/flows/FlowImportForm.ts index 3db49d056..d04f0c8e9 100644 --- a/web/src/admin/flows/FlowImportForm.ts +++ b/web/src/admin/flows/FlowImportForm.ts @@ -86,7 +86,7 @@ export class FlowImportForm extends Form { `; } - renderInlineForm(): TemplateResult { + renderForm(): TemplateResult { return html`

diff --git a/web/src/admin/flows/StageBindingForm.ts b/web/src/admin/flows/StageBindingForm.ts index 8c5492be2..839f2c26c 100644 --- a/web/src/admin/flows/StageBindingForm.ts +++ b/web/src/admin/flows/StageBindingForm.ts @@ -92,8 +92,7 @@ export class StageBindingForm extends ModelForm { } renderForm(): TemplateResult { - return html`

- ${this.renderTarget()} + return html` ${this.renderTarget()} => { @@ -224,7 +223,6 @@ export class StageBindingForm extends ModelForm { .value=${this.instance?.policyEngineMode} > - -
`; +
`; } } diff --git a/web/src/admin/groups/GroupForm.ts b/web/src/admin/groups/GroupForm.ts index d849d67f8..6525d1aa8 100644 --- a/web/src/admin/groups/GroupForm.ts +++ b/web/src/admin/groups/GroupForm.ts @@ -58,8 +58,7 @@ export class GroupForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` {

${msg("Set custom attributes using YAML or JSON.")}

-
- `; +
`; } } diff --git a/web/src/admin/groups/RelatedGroupList.ts b/web/src/admin/groups/RelatedGroupList.ts index 8a94f4cf0..d0b965648 100644 --- a/web/src/admin/groups/RelatedGroupList.ts +++ b/web/src/admin/groups/RelatedGroupList.ts @@ -46,7 +46,7 @@ export class RelatedGroupAdd extends Form<{ groups: string[] }> { return data; } - renderInlineForm(): TemplateResult { + renderForm(): TemplateResult { return html`
{ } renderForm(): TemplateResult { - return html`
- + return html` { >${msg("Documentation")}

-
- `; +
`; } } diff --git a/web/src/admin/outposts/ServiceConnectionDockerForm.ts b/web/src/admin/outposts/ServiceConnectionDockerForm.ts index c6840d50d..7fd8731ad 100644 --- a/web/src/admin/outposts/ServiceConnectionDockerForm.ts +++ b/web/src/admin/outposts/ServiceConnectionDockerForm.ts @@ -42,8 +42,7 @@ export class ServiceConnectionDockerForm extends ModelForm - + return html` ${msg("When connecting via SSH, this keypair is used for authentication.")}

-
- `; +
`; } } diff --git a/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts b/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts index afa0c1be3..4b4f88f00 100644 --- a/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts +++ b/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts @@ -45,8 +45,7 @@ export class ServiceConnectionKubernetesForm extends ModelForm< } renderForm(): TemplateResult { - return html`
- + return html` ${msg("Verify Kubernetes API SSL Certificate")} - - `; +
`; } } diff --git a/web/src/admin/policies/PolicyBindingForm.ts b/web/src/admin/policies/PolicyBindingForm.ts index 7c830a56b..c98d0082b 100644 --- a/web/src/admin/policies/PolicyBindingForm.ts +++ b/web/src/admin/policies/PolicyBindingForm.ts @@ -133,8 +133,7 @@ export class PolicyBindingForm extends ModelForm { } renderForm(): TemplateResult { - return html`
-
+ return html`
${this.renderModeSelector()}
- - `; + `; } } diff --git a/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts b/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts index 3160189ea..a8198d8f6 100644 --- a/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts +++ b/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts @@ -53,8 +53,7 @@ export class EventMatcherPolicyForm extends ModelForm - + return html` ${msg( "Matches an event against a set of criteria. If any of the configured values match, the policy passes.", )} @@ -187,7 +186,6 @@ export class EventMatcherPolicyForm extends ModelForm
- - `; + `; } } diff --git a/web/src/admin/policies/expiry/ExpiryPolicyForm.ts b/web/src/admin/policies/expiry/ExpiryPolicyForm.ts index 7fede7aa8..0ec7caae3 100644 --- a/web/src/admin/policies/expiry/ExpiryPolicyForm.ts +++ b/web/src/admin/policies/expiry/ExpiryPolicyForm.ts @@ -41,8 +41,7 @@ export class PasswordExpiryPolicyForm extends ModelForm - + return html` ${msg( "Checks if the request's user's password has been changed in the last x days, and denys based on settings.", )} @@ -110,7 +109,6 @@ export class PasswordExpiryPolicyForm extends ModelForm
- - `; + `; } } diff --git a/web/src/admin/policies/expression/ExpressionPolicyForm.ts b/web/src/admin/policies/expression/ExpressionPolicyForm.ts index 13687eac9..707dc9f1c 100644 --- a/web/src/admin/policies/expression/ExpressionPolicyForm.ts +++ b/web/src/admin/policies/expression/ExpressionPolicyForm.ts @@ -43,8 +43,7 @@ export class ExpressionPolicyForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` ${msg( "Executes the python snippet to determine whether to allow or deny a request.", )} @@ -101,7 +100,6 @@ export class ExpressionPolicyForm extends ModelForm {

- - `; + `; } } diff --git a/web/src/admin/policies/password/PasswordPolicyForm.ts b/web/src/admin/policies/password/PasswordPolicyForm.ts index cb936a678..126d7386b 100644 --- a/web/src/admin/policies/password/PasswordPolicyForm.ts +++ b/web/src/admin/policies/password/PasswordPolicyForm.ts @@ -229,8 +229,7 @@ export class PasswordPolicyForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` ${msg( "Checks the value from the policy request against several rules, mostly used to ensure password strength.", )} @@ -348,7 +347,6 @@ export class PasswordPolicyForm extends ModelForm { ${this.showStatic ? this.renderStaticRules() : html``} ${this.showHIBP ? this.renderHIBP() : html``} - ${this.showZxcvbn ? this.renderZxcvbn() : html``} - `; + ${this.showZxcvbn ? this.renderZxcvbn() : html``}`; } } diff --git a/web/src/admin/policies/reputation/ReputationPolicyForm.ts b/web/src/admin/policies/reputation/ReputationPolicyForm.ts index 33903caab..a32d6febf 100644 --- a/web/src/admin/policies/reputation/ReputationPolicyForm.ts +++ b/web/src/admin/policies/reputation/ReputationPolicyForm.ts @@ -41,8 +41,7 @@ export class ReputationPolicyForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` ${msg("Allows/denys requests based on the users and/or the IPs reputation.")} @@ -131,7 +130,6 @@ doesn't pass when either or both of the selected options are equal or above the /> - - `; + `; } } diff --git a/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts b/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts index 359e76799..5629f07d2 100644 --- a/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts @@ -41,8 +41,7 @@ export class PropertyMappingLDAPForm extends ModelForm - + return html`

-
- `; +
`; } } diff --git a/web/src/admin/property-mappings/PropertyMappingNotification.ts b/web/src/admin/property-mappings/PropertyMappingNotification.ts index 36c9344f5..6b9692c4f 100644 --- a/web/src/admin/property-mappings/PropertyMappingNotification.ts +++ b/web/src/admin/property-mappings/PropertyMappingNotification.ts @@ -41,8 +41,7 @@ export class PropertyMappingNotification extends ModelForm - + return html`

-
- `; +
`; } } diff --git a/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts b/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts index 54f7c07d8..b61bc168c 100644 --- a/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts @@ -41,8 +41,7 @@ export class PropertyMappingSAMLForm extends ModelForm - + return html`

-
- `; +
`; } } diff --git a/web/src/admin/property-mappings/PropertyMappingSCIMForm.ts b/web/src/admin/property-mappings/PropertyMappingSCIMForm.ts index 36c5df7a5..24d567d11 100644 --- a/web/src/admin/property-mappings/PropertyMappingSCIMForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingSCIMForm.ts @@ -41,8 +41,7 @@ export class PropertyMappingSCIMForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` { ${msg("See documentation for a list of all variables.")}

-
- `; +
`; } } diff --git a/web/src/admin/property-mappings/PropertyMappingScopeForm.ts b/web/src/admin/property-mappings/PropertyMappingScopeForm.ts index 945f0b01e..9dc01c174 100644 --- a/web/src/admin/property-mappings/PropertyMappingScopeForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingScopeForm.ts @@ -41,8 +41,7 @@ export class PropertyMappingScopeForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` { ${msg("See documentation for a list of all variables.")}

-
- `; +
`; } } diff --git a/web/src/admin/property-mappings/PropertyMappingTestForm.ts b/web/src/admin/property-mappings/PropertyMappingTestForm.ts index 10617238f..00a288d15 100644 --- a/web/src/admin/property-mappings/PropertyMappingTestForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingTestForm.ts @@ -118,7 +118,7 @@ export class PolicyTestForm extends Form { `; } - renderInlineForm(): TemplateResult { + renderForm(): TemplateResult { return html` => { diff --git a/web/src/admin/providers/ldap/LDAPProviderForm.ts b/web/src/admin/providers/ldap/LDAPProviderForm.ts index 8e125312c..f7853e7e1 100644 --- a/web/src/admin/providers/ldap/LDAPProviderForm.ts +++ b/web/src/admin/providers/ldap/LDAPProviderForm.ts @@ -60,8 +60,7 @@ export class LDAPProviderFormPage extends ModelForm { // weird-- we're looking up Authentication flows, but we're storing them in the Authorization // field of the target Provider. renderForm(): TemplateResult { - return html`
- + return html` {

- - `; + `; } } diff --git a/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts b/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts index e20c63d9a..95bb9fdae 100644 --- a/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts +++ b/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts @@ -167,8 +167,7 @@ export class OAuth2ProviderFormPage extends ModelForm { renderForm(): TemplateResult { const provider = this.instance; - return html`
- {

- - `; + `; } } diff --git a/web/src/admin/providers/proxy/ProxyProviderForm.ts b/web/src/admin/providers/proxy/ProxyProviderForm.ts index f5d931408..9886c9be3 100644 --- a/web/src/admin/providers/proxy/ProxyProviderForm.ts +++ b/web/src/admin/providers/proxy/ProxyProviderForm.ts @@ -266,8 +266,7 @@ export class ProxyProviderFormPage extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` - - `; + `; } } diff --git a/web/src/admin/providers/radius/RadiusProviderForm.ts b/web/src/admin/providers/radius/RadiusProviderForm.ts index 9b1dc5452..e38307074 100644 --- a/web/src/admin/providers/radius/RadiusProviderForm.ts +++ b/web/src/admin/providers/radius/RadiusProviderForm.ts @@ -49,8 +49,7 @@ export class RadiusProviderFormPage extends ModelForm { // weird-- we're looking up Authentication flows, but we're storing them in the Authorization // field of the target Provider. renderForm(): TemplateResult { - return html`
- + return html` {

- - `; + `; } } diff --git a/web/src/admin/providers/saml/SAMLProviderForm.ts b/web/src/admin/providers/saml/SAMLProviderForm.ts index 012abdcae..c48993e84 100644 --- a/web/src/admin/providers/saml/SAMLProviderForm.ts +++ b/web/src/admin/providers/saml/SAMLProviderForm.ts @@ -66,8 +66,7 @@ export class SAMLProviderFormPage extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` { - - `; + `; } } diff --git a/web/src/admin/providers/saml/SAMLProviderImportForm.ts b/web/src/admin/providers/saml/SAMLProviderImportForm.ts index b9eb8efce..b63c1512b 100644 --- a/web/src/admin/providers/saml/SAMLProviderImportForm.ts +++ b/web/src/admin/providers/saml/SAMLProviderImportForm.ts @@ -29,7 +29,7 @@ export class SAMLProviderImportForm extends Form { }); } - renderInlineForm(): TemplateResult { + renderForm(): TemplateResult { return html` diff --git a/web/src/admin/providers/scim/SCIMProviderForm.ts b/web/src/admin/providers/scim/SCIMProviderForm.ts index 20a736ca5..cdc935973 100644 --- a/web/src/admin/providers/scim/SCIMProviderForm.ts +++ b/web/src/admin/providers/scim/SCIMProviderForm.ts @@ -61,8 +61,7 @@ export class SCIMProviderFormPage extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` {

- - `; + `; } } diff --git a/web/src/admin/sources/ldap/LDAPSourceForm.ts b/web/src/admin/sources/ldap/LDAPSourceForm.ts index 67e415fc8..a927eae29 100644 --- a/web/src/admin/sources/ldap/LDAPSourceForm.ts +++ b/web/src/admin/sources/ldap/LDAPSourceForm.ts @@ -63,8 +63,7 @@ export class LDAPSourceForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` {

- - `; + `; } } diff --git a/web/src/admin/sources/oauth/OAuthSourceForm.ts b/web/src/admin/sources/oauth/OAuthSourceForm.ts index fdf4d22b0..9fa70aef3 100644 --- a/web/src/admin/sources/oauth/OAuthSourceForm.ts +++ b/web/src/admin/sources/oauth/OAuthSourceForm.ts @@ -231,8 +231,7 @@ export class OAuthSourceForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` {

- - `; + `; } } diff --git a/web/src/admin/sources/plex/PlexSourceForm.ts b/web/src/admin/sources/plex/PlexSourceForm.ts index 729654edb..1318a1ae9 100644 --- a/web/src/admin/sources/plex/PlexSourceForm.ts +++ b/web/src/admin/sources/plex/PlexSourceForm.ts @@ -178,8 +178,7 @@ export class PlexSourceForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` {

- - `; + `; } } diff --git a/web/src/admin/sources/saml/SAMLSourceForm.ts b/web/src/admin/sources/saml/SAMLSourceForm.ts index ac168ae5b..9e9fb8392 100644 --- a/web/src/admin/sources/saml/SAMLSourceForm.ts +++ b/web/src/admin/sources/saml/SAMLSourceForm.ts @@ -83,8 +83,7 @@ export class SAMLSourceForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` {

- - `; + `; } } diff --git a/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts b/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts index 98d8fa5d9..4d74059be 100644 --- a/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts +++ b/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts @@ -50,8 +50,7 @@ export class AuthenticatorDuoStageForm extends ModelForm - + return html` ${msg( "Stage used to configure a duo-based authenticator. This stage should be used for configuration flows.", )} @@ -189,7 +188,6 @@ export class AuthenticatorDuoStageForm extends ModelForm
- - `; + `; } } diff --git a/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts b/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts index 3fe57ba44..2fbb24b10 100644 --- a/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts +++ b/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts @@ -42,10 +42,10 @@ export class DuoDeviceImportForm extends ModelForm - ${this.instance?.adminIntegrationKey !== "" ? this.renderFormAutomatic() : html``} - ${this.renderFormManual()} - `; + return html` ${this.instance?.adminIntegrationKey !== "" + ? this.renderFormAutomatic() + : html``} + ${this.renderFormManual()}`; } renderFormManual(): TemplateResult { diff --git a/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts index f7f46b7ed..4522d050b 100644 --- a/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts +++ b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts @@ -207,8 +207,9 @@ export class AuthenticatorSMSStageForm extends ModelForm - ${msg("Stage used to configure an SMS-based TOTP authenticator.")} + return html` + ${msg("Stage used to configure an SMS-based TOTP authenticator.")} + - - `; + `; } } diff --git a/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts b/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts index 4ad86d541..f9f2684d0 100644 --- a/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts +++ b/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts @@ -48,8 +48,7 @@ export class AuthenticatorStaticStageForm extends ModelForm - + return html` ${msg( "Stage used to configure a static authenticator (i.e. static tokens). This stage should be used for configuration flows.", )} @@ -156,7 +155,6 @@ export class AuthenticatorStaticStageForm extends ModelForm
- - `; + `; } } diff --git a/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts b/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts index 55de84e00..ff44f9349 100644 --- a/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts +++ b/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts @@ -50,8 +50,7 @@ export class AuthenticatorTOTPStageForm extends ModelForm - + return html` ${msg( "Stage used to configure a TOTP authenticator (i.e. Authy/Google Authenticator).", )} @@ -146,7 +145,6 @@ export class AuthenticatorTOTPStageForm extends ModelForm
- - `; + `; } } diff --git a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts index 6cc8e8ed9..146422988 100644 --- a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts +++ b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts @@ -71,8 +71,7 @@ export class AuthenticatorValidateStageForm extends ModelForm - + return html` ${msg( "Stage used to validate any authenticator. This stage should be used during authentication or authorization flows.", )} @@ -254,7 +253,6 @@ export class AuthenticatorValidateStageForm extends ModelForm - - `; + `; } } diff --git a/web/src/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts b/web/src/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts index 0ab4afbaf..9bd8bebe1 100644 --- a/web/src/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts +++ b/web/src/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts @@ -55,10 +55,9 @@ export class AuthenticateWebAuthnStageForm extends ModelForm - + return html` ${msg( - "Stage used to configure a WebAutnn authenticator (i.e. Yubikey, FaceID/Windows Hello).", + "Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello).", )} @@ -214,7 +213,6 @@ export class AuthenticateWebAuthnStageForm extends ModelForm - - `; + `; } } diff --git a/web/src/admin/stages/captcha/CaptchaStageForm.ts b/web/src/admin/stages/captcha/CaptchaStageForm.ts index 2fec02eaf..cc8299f30 100644 --- a/web/src/admin/stages/captcha/CaptchaStageForm.ts +++ b/web/src/admin/stages/captcha/CaptchaStageForm.ts @@ -40,8 +40,7 @@ export class CaptchaStageForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` ${msg( "This stage checks the user's current session against the Google reCaptcha (or compatible) service.", )} @@ -133,7 +132,6 @@ export class CaptchaStageForm extends ModelForm {

- - `; + `; } } diff --git a/web/src/admin/stages/consent/ConsentStageForm.ts b/web/src/admin/stages/consent/ConsentStageForm.ts index 487c63c88..84866b10d 100644 --- a/web/src/admin/stages/consent/ConsentStageForm.ts +++ b/web/src/admin/stages/consent/ConsentStageForm.ts @@ -49,8 +49,7 @@ export class ConsentStageForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` ${msg( "Prompt for the user's consent. The consent can either be permanent or expire in a defined amount of time.", )} @@ -120,7 +119,6 @@ export class ConsentStageForm extends ModelForm { - - `; + `; } } diff --git a/web/src/admin/stages/deny/DenyStageForm.ts b/web/src/admin/stages/deny/DenyStageForm.ts index 7be798c37..929496a78 100644 --- a/web/src/admin/stages/deny/DenyStageForm.ts +++ b/web/src/admin/stages/deny/DenyStageForm.ts @@ -39,8 +39,7 @@ export class DenyStageForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` ${msg( "Statically deny the flow. To use this stage effectively, disable *Evaluate when flow is planned* on the respective binding.", )} @@ -52,7 +51,6 @@ export class DenyStageForm extends ModelForm { class="pf-c-form-control" required /> - - `; +
`; } } diff --git a/web/src/admin/stages/dummy/DummyStageForm.ts b/web/src/admin/stages/dummy/DummyStageForm.ts index 61620bfa2..03fbbb4c3 100644 --- a/web/src/admin/stages/dummy/DummyStageForm.ts +++ b/web/src/admin/stages/dummy/DummyStageForm.ts @@ -40,8 +40,7 @@ export class DummyStageForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` ${msg( "Dummy stage used for testing. Shows a simple continue button and always passes.", )} @@ -68,7 +67,6 @@ export class DummyStageForm extends ModelForm { ${msg("Throw error?")} - - `; +
`; } } diff --git a/web/src/admin/stages/email/EmailStageForm.ts b/web/src/admin/stages/email/EmailStageForm.ts index 406051448..a08b5c115 100644 --- a/web/src/admin/stages/email/EmailStageForm.ts +++ b/web/src/admin/stages/email/EmailStageForm.ts @@ -147,8 +147,7 @@ export class EmailStageForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` ${msg( "Verify the user's email address by sending them a one-time-link. Can also be used for recovery to verify the user's authenticity.", )} @@ -256,7 +255,6 @@ export class EmailStageForm extends ModelForm { - ${this.renderConnectionSettings()} - `; + ${this.renderConnectionSettings()}`; } } diff --git a/web/src/admin/stages/identification/IdentificationStageForm.ts b/web/src/admin/stages/identification/IdentificationStageForm.ts index 5e4ebd828..769caaa76 100644 --- a/web/src/admin/stages/identification/IdentificationStageForm.ts +++ b/web/src/admin/stages/identification/IdentificationStageForm.ts @@ -68,8 +68,7 @@ export class IdentificationStageForm extends ModelForm - + return html` ${msg("Let the user identify themselves with their username or Email address.")} @@ -299,7 +298,6 @@ export class IdentificationStageForm extends ModelForm - - `; + `; } } diff --git a/web/src/admin/stages/invitation/InvitationForm.ts b/web/src/admin/stages/invitation/InvitationForm.ts index 0ee755389..be110eb46 100644 --- a/web/src/admin/stages/invitation/InvitationForm.ts +++ b/web/src/admin/stages/invitation/InvitationForm.ts @@ -43,8 +43,7 @@ export class InvitationForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- {

${msg("When enabled, the invitation will be deleted after usage.")}

-
-
`; +
`; } } diff --git a/web/src/admin/stages/invitation/InvitationStageForm.ts b/web/src/admin/stages/invitation/InvitationStageForm.ts index 8a566af44..549c58ae6 100644 --- a/web/src/admin/stages/invitation/InvitationStageForm.ts +++ b/web/src/admin/stages/invitation/InvitationStageForm.ts @@ -40,8 +40,7 @@ export class InvitationStageForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` ${msg("This stage can be included in enrollment flows to accept invitations.")} @@ -81,7 +80,6 @@ export class InvitationStageForm extends ModelForm {

- - `; + `; } } diff --git a/web/src/admin/stages/password/PasswordStageForm.ts b/web/src/admin/stages/password/PasswordStageForm.ts index 8fa88521f..ce503ef00 100644 --- a/web/src/admin/stages/password/PasswordStageForm.ts +++ b/web/src/admin/stages/password/PasswordStageForm.ts @@ -62,8 +62,9 @@ export class PasswordStageForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- ${msg("Validate the user's password against the selected backend(s).")} + return html` + ${msg("Validate the user's password against the selected backend(s).")} + {

- -
`; + `; } } diff --git a/web/src/admin/stages/prompt/PromptForm.ts b/web/src/admin/stages/prompt/PromptForm.ts index 21c982fe4..2ce0b77d8 100644 --- a/web/src/admin/stages/prompt/PromptForm.ts +++ b/web/src/admin/stages/prompt/PromptForm.ts @@ -283,8 +283,7 @@ export class PromptForm extends ModelForm { } renderEditForm(): TemplateResult { - return html`
- + return html` { class="pf-c-form-control" required /> - - `; +
`; } } diff --git a/web/src/admin/stages/prompt/PromptStageForm.ts b/web/src/admin/stages/prompt/PromptStageForm.ts index 2b69b61ca..f3841e10f 100644 --- a/web/src/admin/stages/prompt/PromptStageForm.ts +++ b/web/src/admin/stages/prompt/PromptStageForm.ts @@ -60,8 +60,7 @@ export class PromptStageForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` ${msg( "Show arbitrary input fields to the user, for example during enrollment. Data is saved in the flow context under the 'prompt_data' variable.", )} @@ -146,7 +145,6 @@ export class PromptStageForm extends ModelForm {

- - `; + `; } } diff --git a/web/src/admin/stages/user_delete/UserDeleteStageForm.ts b/web/src/admin/stages/user_delete/UserDeleteStageForm.ts index 2a3de7337..3d15b52ff 100644 --- a/web/src/admin/stages/user_delete/UserDeleteStageForm.ts +++ b/web/src/admin/stages/user_delete/UserDeleteStageForm.ts @@ -39,8 +39,7 @@ export class UserDeleteStageForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` ${msg( "Delete the currently pending user. CAUTION, this stage does not ask for confirmation. Use a consent stage to ensure the user is aware of their actions.", )} @@ -52,7 +51,6 @@ export class UserDeleteStageForm extends ModelForm { class="pf-c-form-control" required /> - - `; +
`; } } diff --git a/web/src/admin/stages/user_login/UserLoginStageForm.ts b/web/src/admin/stages/user_login/UserLoginStageForm.ts index 16ac5db7b..6ba879799 100644 --- a/web/src/admin/stages/user_login/UserLoginStageForm.ts +++ b/web/src/admin/stages/user_login/UserLoginStageForm.ts @@ -42,8 +42,7 @@ export class UserLoginStageForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- ${msg("Log the currently pending user in.")} + return html` ${msg("Log the currently pending user in.")} {

- -
`; + `; } } diff --git a/web/src/admin/stages/user_logout/UserLogoutStageForm.ts b/web/src/admin/stages/user_logout/UserLogoutStageForm.ts index bde31c5e8..7e90aade6 100644 --- a/web/src/admin/stages/user_logout/UserLogoutStageForm.ts +++ b/web/src/admin/stages/user_logout/UserLogoutStageForm.ts @@ -39,8 +39,7 @@ export class UserLogoutStageForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- ${msg("Remove the user from the current session.")} + return html` ${msg("Remove the user from the current session.")} { class="pf-c-form-control" required /> - -
`; +
`; } } diff --git a/web/src/admin/stages/user_write/UserWriteStageForm.ts b/web/src/admin/stages/user_write/UserWriteStageForm.ts index 958ada1c5..0cfefc57c 100644 --- a/web/src/admin/stages/user_write/UserWriteStageForm.ts +++ b/web/src/admin/stages/user_write/UserWriteStageForm.ts @@ -44,8 +44,7 @@ export class UserWriteStageForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` ${msg( `Write any data from the flow's context's 'prompt_data' to the currently pending user. If no user is pending, a new user is created, and data is written to them.`, @@ -161,7 +160,6 @@ export class UserWriteStageForm extends ModelForm {

- - `; + `; } } diff --git a/web/src/admin/tenants/TenantForm.ts b/web/src/admin/tenants/TenantForm.ts index 9a3b88d61..38614b5cb 100644 --- a/web/src/admin/tenants/TenantForm.ts +++ b/web/src/admin/tenants/TenantForm.ts @@ -46,8 +46,11 @@ export class TenantForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` {

- - `; + `; } } diff --git a/web/src/admin/tokens/TokenForm.ts b/web/src/admin/tokens/TokenForm.ts index 88023488c..904c8cdac 100644 --- a/web/src/admin/tokens/TokenForm.ts +++ b/web/src/admin/tokens/TokenForm.ts @@ -58,8 +58,7 @@ export class TokenForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- { )}

- ${this.showExpiry ? this.renderExpiry() : html``} -
`; + ${this.showExpiry ? this.renderExpiry() : html``}`; } } diff --git a/web/src/admin/users/RelatedUserList.ts b/web/src/admin/users/RelatedUserList.ts index 3ebc5dbb5..d34c19bc5 100644 --- a/web/src/admin/users/RelatedUserList.ts +++ b/web/src/admin/users/RelatedUserList.ts @@ -68,7 +68,7 @@ export class RelatedUserAdd extends Form<{ users: number[] }> { return data; } - renderInlineForm(): TemplateResult { + renderForm(): TemplateResult { return html`${this.group?.isSuperuser ? html`` : html``}
diff --git a/web/src/admin/users/ServiceAccountForm.ts b/web/src/admin/users/ServiceAccountForm.ts index b5a0dc9b7..96dbb89be 100644 --- a/web/src/admin/users/ServiceAccountForm.ts +++ b/web/src/admin/users/ServiceAccountForm.ts @@ -34,7 +34,7 @@ export class ServiceAccountForm extends Form { this.result = undefined; } - renderInlineForm(): TemplateResult { + renderForm(): TemplateResult { return html` { `; } - renderForm(): TemplateResult { + renderFormWrapper(): TemplateResult { if (this.result) { return this.renderResponseForm(); } - return super.renderForm(); + return super.renderFormWrapper(); } } diff --git a/web/src/admin/users/UserForm.ts b/web/src/admin/users/UserForm.ts index b2cdef833..bdd8ed662 100644 --- a/web/src/admin/users/UserForm.ts +++ b/web/src/admin/users/UserForm.ts @@ -64,8 +64,11 @@ export class UserForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- + return html` {

${msg("Set custom attributes using YAML or JSON.")}

-
- `; +
`; } } diff --git a/web/src/admin/users/UserPasswordForm.ts b/web/src/admin/users/UserPasswordForm.ts index e96d2486f..f17cdba6f 100644 --- a/web/src/admin/users/UserPasswordForm.ts +++ b/web/src/admin/users/UserPasswordForm.ts @@ -25,7 +25,7 @@ export class UserPasswordForm extends Form { }); } - renderInlineForm(): TemplateResult { + renderForm(): TemplateResult { return html` extends AKElement { } } - renderForm(): TemplateResult { - const inline = this.renderInlineForm(); + renderFormWrapper(): TemplateResult { + const inline = this.renderForm(); if (inline) { - return html`
+ return html` { + ev.preventDefault(); + }} + > ${inline}
`; } return html``; } - /** - * Inline form render callback when inheriting this class, should be overwritten - * instead of `this.renderForm` - */ - renderInlineForm(): TemplateResult | undefined { + renderForm(): TemplateResult | undefined { return undefined; } @@ -378,7 +379,7 @@ export abstract class Form extends AKElement { } renderVisible(): TemplateResult { - return html` ${this.renderNonFieldErrors()} ${this.renderForm()}`; + return html` ${this.renderNonFieldErrors()} ${this.renderFormWrapper()}`; } render(): TemplateResult { diff --git a/web/src/user/user-settings/mfa/MFADeviceForm.ts b/web/src/user/user-settings/mfa/MFADeviceForm.ts index 0901d0bc9..a418eeb02 100644 --- a/web/src/user/user-settings/mfa/MFADeviceForm.ts +++ b/web/src/user/user-settings/mfa/MFADeviceForm.ts @@ -64,15 +64,13 @@ export class MFADeviceForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- - - -
`; + return html` + + `; } } diff --git a/web/src/user/user-settings/tokens/UserTokenForm.ts b/web/src/user/user-settings/tokens/UserTokenForm.ts index 6e5219a3d..05bb3b111 100644 --- a/web/src/user/user-settings/tokens/UserTokenForm.ts +++ b/web/src/user/user-settings/tokens/UserTokenForm.ts @@ -43,8 +43,7 @@ export class UserTokenForm extends ModelForm { } renderForm(): TemplateResult { - return html`
- { value="${ifDefined(this.instance?.description)}" class="pf-c-form-control" /> - -
`; +
`; } } diff --git a/web/xliff/de.xlf b/web/xliff/de.xlf index d831532c1..67ff47d1c 100644 --- a/web/xliff/de.xlf +++ b/web/xliff/de.xlf @@ -4021,10 +4021,6 @@ doesn't pass when either or both of the selected options are equal or above the When multiple stages are selected, the user can choose which one they want to enroll. Wenn mehrere Stufen ausgewählt sind, kann der Benutzer wählen, welche er registrieren möchte. - - Stage used to configure a WebAutnn authenticator (i.e. Yubikey, FaceID/Windows Hello). - Phase zum Konfigurieren eines WebAutnn-Authentifikators (z. B. Yubikey, FaceID/Windows Hello). - User verification Benutzerüberprüfung @@ -5933,6 +5929,9 @@ Bindings to groups/users are checked against the user of the event. Flow Info + + + Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). diff --git a/web/xliff/en.xlf b/web/xliff/en.xlf index dc4a9f124..184db9c02 100644 --- a/web/xliff/en.xlf +++ b/web/xliff/en.xlf @@ -4245,10 +4245,6 @@ doesn't pass when either or both of the selected options are equal or above the When multiple stages are selected, the user can choose which one they want to enroll. When multiple stages are selected, the user can choose which one they want to enroll. - - Stage used to configure a WebAutnn authenticator (i.e. Yubikey, FaceID/Windows Hello). - Stage used to configure a WebAutnn authenticator (i.e. Yubikey, FaceID/Windows Hello). - User verification User verification @@ -6247,6 +6243,9 @@ Bindings to groups/users are checked against the user of the event. Flow Info + + + Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). diff --git a/web/xliff/es.xlf b/web/xliff/es.xlf index e24886318..e8a81058c 100644 --- a/web/xliff/es.xlf +++ b/web/xliff/es.xlf @@ -3948,10 +3948,6 @@ doesn't pass when either or both of the selected options are equal or above the When multiple stages are selected, the user can choose which one they want to enroll. - - Stage used to configure a WebAutnn authenticator (i.e. Yubikey, FaceID/Windows Hello). - Etapa utilizada para configurar un autenticador WebAutnn (es decir, Yubikey, FaceID/Windows Hello). - User verification Verificación del usuario @@ -5841,6 +5837,9 @@ Bindings to groups/users are checked against the user of the event. Flow Info + + + Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). diff --git a/web/xliff/fr.xlf b/web/xliff/fr.xlf index 8c3e4f6f5..ef28fbb6b 100644 --- a/web/xliff/fr.xlf +++ b/web/xliff/fr.xlf @@ -5303,11 +5303,6 @@ doesn't pass when either or both of the selected options are equal or above the When multiple stages are selected, the user can choose which one they want to enroll. Lorsque plusieurs étapes sont sélectionnées, les utilisateurs peuvent choisir celle qu’ils souhaient utiliser pour s’enrôler. - - - Stage used to configure a WebAutnn authenticator (i.e. Yubikey, FaceID/Windows Hello). - Étape de configuration d'un authentificateur WebAuthn (Yubikey, FaceID/Windows Hello). - User verification @@ -7823,6 +7818,9 @@ Les liaisons avec les groupes/utilisateurs sont vérifiées par rapport à l'uti Flow Info + + + Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). diff --git a/web/xliff/pl.xlf b/web/xliff/pl.xlf index 609b27630..1b7e45c40 100644 --- a/web/xliff/pl.xlf +++ b/web/xliff/pl.xlf @@ -4118,10 +4118,6 @@ doesn't pass when either or both of the selected options are equal or above the When multiple stages are selected, the user can choose which one they want to enroll. W przypadku wybrania wielu etapów użytkownik może wybrać, na który chce się zapisać. - - Stage used to configure a WebAutnn authenticator (i.e. Yubikey, FaceID/Windows Hello). - Etap używany do konfiguracji tokena uwierzytelniającego WebAuthn (tj. Yubikey, FaceID/Windows Hello). - User verification Weryfikacja użytkownika @@ -6080,6 +6076,9 @@ Bindings to groups/users are checked against the user of the event. Flow Info + + + Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). diff --git a/web/xliff/pseudo-LOCALE.xlf b/web/xliff/pseudo-LOCALE.xlf index 22d95eebf..9dad51bb7 100644 --- a/web/xliff/pseudo-LOCALE.xlf +++ b/web/xliff/pseudo-LOCALE.xlf @@ -4208,10 +4208,6 @@ doesn't pass when either or both of the selected options are equal or above the When multiple stages are selected, the user can choose which one they want to enroll. - - - Stage used to configure a WebAutnn authenticator (i.e. Yubikey, FaceID/Windows Hello). - User verification @@ -6182,6 +6178,9 @@ Bindings to groups/users are checked against the user of the event. Flow Info + + + Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). diff --git a/web/xliff/tr.xlf b/web/xliff/tr.xlf index 3d205ba57..f463488df 100644 --- a/web/xliff/tr.xlf +++ b/web/xliff/tr.xlf @@ -3947,10 +3947,6 @@ doesn't pass when either or both of the selected options are equal or above the When multiple stages are selected, the user can choose which one they want to enroll. - - Stage used to configure a WebAutnn authenticator (i.e. Yubikey, FaceID/Windows Hello). - Aşama bir WebAutnn kimlik doğrulayıcısını (örn. Yubikey, FaceID/Windows Hello) yapılandırmak için kullanılır. - User verification Kullanıcı doğrulaması @@ -5834,6 +5830,9 @@ Bindings to groups/users are checked against the user of the event. Flow Info + + + Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). diff --git a/web/xliff/zh-Hans.xlf b/web/xliff/zh-Hans.xlf index 005605c39..9ac2df4ba 100644 --- a/web/xliff/zh-Hans.xlf +++ b/web/xliff/zh-Hans.xlf @@ -5305,11 +5305,6 @@ doesn't pass when either or both of the selected options are equal or above the When multiple stages are selected, the user can choose which one they want to enroll. 选中多个阶段时,用户可以选择要注册哪个。 - - - Stage used to configure a WebAutnn authenticator (i.e. Yubikey, FaceID/Windows Hello). - 用来配置 WebAuthn 身份验证器(即 Yubikey、FaceID/Windows Hello)的阶段。 - User verification @@ -7828,6 +7823,9 @@ Bindings to groups/users are checked against the user of the event. Flow Info + + + Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). diff --git a/web/xliff/zh-Hant.xlf b/web/xliff/zh-Hant.xlf index 45a082416..7d26d5eb6 100644 --- a/web/xliff/zh-Hant.xlf +++ b/web/xliff/zh-Hant.xlf @@ -3984,10 +3984,6 @@ doesn't pass when either or both of the selected options are equal or above the When multiple stages are selected, the user can choose which one they want to enroll. 选中多个阶段时,用户可以选择要注册哪个。 - - Stage used to configure a WebAutnn authenticator (i.e. Yubikey, FaceID/Windows Hello). - 用于配置 Webautnn 身份验证器(即 Yubikey、FaceID/Windows Hello)的阶段。 - User verification 用户验证 @@ -5886,6 +5882,9 @@ Bindings to groups/users are checked against the user of the event. Flow Info + + + Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). diff --git a/web/xliff/zh_TW.xlf b/web/xliff/zh_TW.xlf index ee0b59c1a..9a4de8148 100644 --- a/web/xliff/zh_TW.xlf +++ b/web/xliff/zh_TW.xlf @@ -3984,10 +3984,6 @@ doesn't pass when either or both of the selected options are equal or above the When multiple stages are selected, the user can choose which one they want to enroll. 选中多个阶段时,用户可以选择要注册哪个。 - - Stage used to configure a WebAutnn authenticator (i.e. Yubikey, FaceID/Windows Hello). - 用于配置 Webautnn 身份验证器(即 Yubikey、FaceID/Windows Hello)的阶段。 - User verification 用户验证 @@ -5885,6 +5881,9 @@ Bindings to groups/users are checked against the user of the event. Flow Info + + + Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello).