web: (ESLint) No else return (#14558)

web: (ESLint) no-else-return.

web/package.json

@@ -387,11 +387,11 @@
     ],
     "prettier": "@goauthentik/prettier-config",
     "overrides": {
-        "rapidoc": {
-            "@apitools/openapi-parser@": "0.0.37"
-        },
         "chromedriver": {
             "axios": "^1.8.4"
+        },
+        "rapidoc": {
+            "@apitools/openapi-parser@": "0.0.37"
         }
     }
 }

web/src/admin/admin-overview/cards/WorkerStatusCard.ts

@@ -33,12 +33,11 @@ export class WorkersStatusCard extends AdminStatusCard<Worker[]> {
                 icon: "fa fa-times-circle pf-m-danger",
                 message: html`${msg("Worker with incorrect version connected.")}`,
             });
-        } else {
+        }
         return Promise.resolve<AdminStatus>({
             icon: "fa fa-check-circle pf-m-success",
         });
     }
-    }
 
     renderValue() {
         return html`${this.value?.length}`;

web/src/admin/applications/entitlements/ApplicationEntitlementForm.ts

@@ -30,9 +30,8 @@ export class ApplicationEntitlementForm extends ModelForm<ApplicationEntitlement
     getSuccessMessage(): string {
         if (this.instance?.pbmUuid) {
             return msg("Successfully updated entitlement.");
-        } else {
-            return msg("Successfully created entitlement.");
         }
+        return msg("Successfully created entitlement.");
     }
 
     static get styles(): CSSResult[] {
@@ -48,12 +47,11 @@ export class ApplicationEntitlementForm extends ModelForm<ApplicationEntitlement
                 pbmUuid: this.instance.pbmUuid || "",
                 applicationEntitlementRequest: data,
             });
-        } else {
+        }
         return new CoreApi(DEFAULT_CONFIG).coreApplicationEntitlementsCreate({
             applicationEntitlementRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <ak-form-element-horizontal label=${msg("Name")} ?required=${true} name="name">

web/src/admin/blueprints/BlueprintForm.ts

@@ -58,12 +58,11 @@ export class BlueprintForm extends ModelForm<BlueprintInstance, string> {
                 instanceUuid: this.instance.pk,
                 blueprintInstanceRequest: data,
             });
-        } else {
+        }
         return new ManagedApi(DEFAULT_CONFIG).managedBlueprintsCreate({
             blueprintInstanceRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <ak-form-element-horizontal label=${msg("Name")} ?required=${true} name="name">

web/src/admin/brands/BrandForm.ts

@@ -42,12 +42,11 @@ export class BrandForm extends ModelForm<Brand, string> {
                 brandUuid: this.instance.brandUuid,
                 brandRequest: data,
             });
-        } else {
+        }
         return new CoreApi(DEFAULT_CONFIG).coreBrandsCreate({
             brandRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <ak-form-element-horizontal label=${msg("Domain")} required name="domain">

web/src/admin/crypto/CertificateKeyPairForm.ts

@@ -30,12 +30,11 @@ export class CertificateKeyPairForm extends ModelForm<CertificateKeyPair, string
                 kpUuid: this.instance.pk || "",
                 patchedCertificateKeyPairRequest: data,
             });
-        } else {
+        }
         return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsCreate({
             certificateKeyPairRequest: data as unknown as CertificateKeyPairRequest,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <ak-form-element-horizontal label=${msg("Name")} name="name" ?required=${true}>

web/src/admin/events/RuleForm.ts

@@ -51,12 +51,11 @@ export class RuleForm extends ModelForm<NotificationRule, string> {
                 pbmUuid: this.instance.pk || "",
                 notificationRuleRequest: data,
             });
-        } else {
+        }
         return new EventsApi(DEFAULT_CONFIG).eventsRulesCreate({
             notificationRuleRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <ak-form-element-horizontal label=${msg("Name")} ?required=${true} name="name">

web/src/admin/events/TransportForm.ts

@@ -46,12 +46,11 @@ export class TransportForm extends ModelForm<NotificationTransport, string> {
                 uuid: this.instance.pk || "",
                 notificationTransportRequest: data,
             });
-        } else {
+        }
         return new EventsApi(DEFAULT_CONFIG).eventsTransportsCreate({
             notificationTransportRequest: data,
         });
     }
-    }
 
     onModeChange(mode: string | undefined): void {
         if (

web/src/admin/flows/StageBindingForm.ts

@@ -39,9 +39,8 @@ export class StageBindingForm extends ModelForm<FlowStageBinding, string> {
     getSuccessMessage(): string {
         if (this.instance?.pk) {
             return msg("Successfully updated binding.");
-        } else {
-            return msg("Successfully created binding.");
         }
+        return msg("Successfully created binding.");
     }
 
     send(data: FlowStageBinding): Promise<unknown> {
@@ -50,7 +49,7 @@ export class StageBindingForm extends ModelForm<FlowStageBinding, string> {
                 fsbUuid: this.instance.pk,
                 patchedFlowStageBindingRequest: data,
             });
-        } else {
+        }
         if (this.targetPk) {
             data.target = this.targetPk;
         }
@@ -58,7 +57,6 @@ export class StageBindingForm extends ModelForm<FlowStageBinding, string> {
             flowStageBindingRequest: data,
         });
     }
-    }
 
     async getOrder(): Promise<number> {
         if (this.instance?.pk) {

web/src/admin/groups/GroupForm.ts

@@ -54,13 +54,12 @@ export class GroupForm extends ModelForm<Group, string> {
                 groupUuid: this.instance.pk,
                 patchedGroupRequest: data,
             });
-        } else {
+        }
         data.users = [];
         return new CoreApi(DEFAULT_CONFIG).coreGroupsCreate({
             groupRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <ak-form-element-horizontal label=${msg("Name")} ?required=${true} name="name">

web/src/admin/outposts/OutpostForm.ts

@@ -129,12 +129,11 @@ export class OutpostForm extends ModelForm<Outpost, string> {
                 uuid: this.instance.pk || "",
                 outpostRequest: data,
             });
-        } else {
+        }
         return new OutpostsApi(DEFAULT_CONFIG).outpostsInstancesCreate({
             outpostRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         const typeOptions = [

web/src/admin/outposts/ServiceConnectionDockerForm.ts

@@ -31,12 +31,11 @@ export class ServiceConnectionDockerForm extends ModelForm<DockerServiceConnecti
                 uuid: this.instance.pk || "",
                 dockerServiceConnectionRequest: data,
             });
-        } else {
+        }
         return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsDockerCreate({
             dockerServiceConnectionRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <ak-form-element-horizontal label=${msg("Name")} ?required=${true} name="name">

web/src/admin/outposts/ServiceConnectionKubernetesForm.ts

@@ -35,12 +35,11 @@ export class ServiceConnectionKubernetesForm extends ModelForm<
                 uuid: this.instance.pk || "",
                 kubernetesServiceConnectionRequest: data,
             });
-        } else {
+        }
         return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsKubernetesCreate({
             kubernetesServiceConnectionRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <ak-form-element-horizontal label=${msg("Name")} ?required=${true} name="name">

web/src/admin/policies/BoundPoliciesList.ts

@@ -72,9 +72,8 @@ export class BoundPoliciesList extends Table<PolicyBinding> {
             return msg(str`Group ${item.groupObj?.name}`);
         } else if (item.user) {
             return msg(str`User ${item.userObj?.name}`);
-        } else {
-            return msg("-");
         }
+        return msg("-");
     }
 
     getPolicyUserGroupRow(item: PolicyBinding): TemplateResult {
@@ -123,9 +122,8 @@ export class BoundPoliciesList extends Table<PolicyBinding> {
                     ${msg("Edit User")}
                 </button>
             </ak-forms-modal>`;
-        } else {
-            return html``;
         }
+        return html``;
     }
 
     renderToolbarSelected(): TemplateResult {

web/src/admin/policies/PolicyBindingForm.ts

@@ -72,9 +72,8 @@ export class PolicyBindingForm extends ModelForm<PolicyBinding, string> {
     getSuccessMessage(): string {
         if (this.instance?.pk) {
             return msg("Successfully updated binding.");
-        } else {
-            return msg("Successfully created binding.");
         }
+        return msg("Successfully created binding.");
     }
 
     static get styles(): CSSResult[] {
@@ -111,12 +110,11 @@ export class PolicyBindingForm extends ModelForm<PolicyBinding, string> {
                 policyBindingUuid: this.instance.pk,
                 policyBindingRequest: data,
             });
-        } else {
+        }
         return new PoliciesApi(DEFAULT_CONFIG).policiesBindingsCreate({
             policyBindingRequest: data,
         });
     }
-    }
 
     async getOrder(): Promise<number> {
         if (this.instance?.pk) {

web/src/admin/policies/dummy/DummyPolicyForm.ts

@@ -24,12 +24,11 @@ export class DummyPolicyForm extends BasePolicyForm<DummyPolicy> {
                 policyUuid: this.instance.pk || "",
                 dummyPolicyRequest: data,
             });
-        } else {
+        }
         return new PoliciesApi(DEFAULT_CONFIG).policiesDummyCreate({
             dummyPolicyRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts

@@ -36,12 +36,11 @@ export class EventMatcherPolicyForm extends BasePolicyForm<EventMatcherPolicy> {
                 policyUuid: this.instance.pk || "",
                 eventMatcherPolicyRequest: data,
             });
-        } else {
+        }
         return new PoliciesApi(DEFAULT_CONFIG).policiesEventMatcherCreate({
             eventMatcherPolicyRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/policies/expiry/ExpiryPolicyForm.ts

@@ -24,12 +24,11 @@ export class PasswordExpiryPolicyForm extends BasePolicyForm<PasswordExpiryPolic
                 policyUuid: this.instance.pk || "",
                 passwordExpiryPolicyRequest: data,
             });
-        } else {
+        }
         return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordExpiryCreate({
             passwordExpiryPolicyRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/policies/expression/ExpressionPolicyForm.ts

@@ -27,12 +27,11 @@ export class ExpressionPolicyForm extends BasePolicyForm<ExpressionPolicy> {
                 policyUuid: this.instance.pk || "",
                 expressionPolicyRequest: data,
             });
-        } else {
+        }
         return new PoliciesApi(DEFAULT_CONFIG).policiesExpressionCreate({
             expressionPolicyRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/policies/geoip/GeoIPPolicyForm.ts

@@ -38,12 +38,11 @@ export class GeoIPPolicyForm extends BasePolicyForm<GeoIPPolicy> {
                 policyUuid: this.instance.pk || "",
                 geoIPPolicyRequest: data,
             });
-        } else {
+        }
         return new PoliciesApi(DEFAULT_CONFIG).policiesGeoipCreate({
             geoIPPolicyRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html`<span>

web/src/admin/policies/password/PasswordPolicyForm.ts

@@ -37,12 +37,11 @@ export class PasswordPolicyForm extends BasePolicyForm<PasswordPolicy> {
                 policyUuid: this.instance.pk || "",
                 passwordPolicyRequest: data,
             });
-        } else {
+        }
         return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordCreate({
             passwordPolicyRequest: data,
         });
     }
-    }
 
     renderStaticRules(): TemplateResult {
         return html` <ak-form-group>

web/src/admin/policies/reputation/ReputationPolicyForm.ts

@@ -24,12 +24,11 @@ export class ReputationPolicyForm extends BasePolicyForm<ReputationPolicy> {
                 policyUuid: this.instance.pk || "",
                 reputationPolicyRequest: data,
             });
-        } else {
+        }
         return new PoliciesApi(DEFAULT_CONFIG).policiesReputationCreate({
             reputationPolicyRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/policies/unique_password/UniquePasswordPolicyForm.ts

@@ -24,12 +24,11 @@ export class UniquePasswordPolicyForm extends BasePolicyForm<UniquePasswordPolic
                 policyUuid: this.instance.pk || "",
                 uniquePasswordPolicyRequest: data,
             });
-        } else {
+        }
         return new PoliciesApi(DEFAULT_CONFIG).policiesUniquePasswordCreate({
             uniquePasswordPolicyRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/property-mappings/PropertyMappingNotification.ts

@@ -21,13 +21,12 @@ export class PropertyMappingNotification extends BasePropertyMappingForm<Notific
                 pmUuid: this.instance.pk,
                 notificationWebhookMappingRequest: data,
             });
-        } else {
+        }
         return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsNotificationCreate({
             notificationWebhookMappingRequest: data,
         });
     }
 }
-}
 
 declare global {
     interface HTMLElementTagNameMap {

web/src/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm.ts

@@ -25,7 +25,7 @@ export class PropertyMappingProviderGoogleWorkspaceForm extends BasePropertyMapp
                 pmUuid: this.instance.pk,
                 googleWorkspaceProviderMappingRequest: data,
             });
-        } else {
+        }
         return new PropertymappingsApi(
             DEFAULT_CONFIG,
         ).propertymappingsProviderGoogleWorkspaceCreate({
@@ -33,7 +33,6 @@ export class PropertyMappingProviderGoogleWorkspaceForm extends BasePropertyMapp
         });
     }
 }
-}
 
 declare global {
     interface HTMLElementTagNameMap {

web/src/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm.ts

@@ -25,13 +25,12 @@ export class PropertyMappingProviderMicrosoftEntraForm extends BasePropertyMappi
                 pmUuid: this.instance.pk,
                 microsoftEntraProviderMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(
-                DEFAULT_CONFIG,
-            ).propertymappingsProviderMicrosoftEntraCreate({
-                microsoftEntraProviderMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderMicrosoftEntraCreate(
+            {
+                microsoftEntraProviderMappingRequest: data,
+            },
+        );
     }
 }
 

web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts

@@ -46,12 +46,11 @@ export class PropertyMappingProviderRACForm extends BasePropertyMappingForm<RACP
                 pmUuid: this.instance.pk,
                 rACPropertyMappingRequest: data,
             });
-        } else {
+        }
         return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRacCreate({
             rACPropertyMappingRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html`

web/src/admin/property-mappings/PropertyMappingProviderRadiusForm.ts

@@ -21,13 +21,12 @@ export class PropertyMappingProviderRadiusForm extends BasePropertyMappingForm<R
                 pmUuid: this.instance.pk,
                 radiusProviderPropertyMappingRequest: data,
             });
-        } else {
+        }
         return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRadiusCreate({
             radiusProviderPropertyMappingRequest: data,
         });
     }
 }
-}
 
 declare global {
     interface HTMLElementTagNameMap {

web/src/admin/property-mappings/PropertyMappingProviderSAMLForm.ts

@@ -24,12 +24,11 @@ export class PropertyMappingProviderSAMLForm extends BasePropertyMappingForm<SAM
                 pmUuid: this.instance.pk,
                 sAMLPropertyMappingRequest: data,
             });
-        } else {
+        }
         return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderSamlCreate({
             sAMLPropertyMappingRequest: data,
         });
     }
-    }
 
     renderExtraFields(): TemplateResult {
         return html` <ak-form-element-horizontal

web/src/admin/property-mappings/PropertyMappingProviderSCIMForm.ts

@@ -21,13 +21,12 @@ export class PropertyMappingProviderSCIMForm extends BasePropertyMappingForm<SCI
                 pmUuid: this.instance.pk,
                 sCIMMappingRequest: data,
             });
-        } else {
+        }
         return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScimCreate({
             sCIMMappingRequest: data,
         });
     }
 }
-}
 
 declare global {
     interface HTMLElementTagNameMap {

web/src/admin/property-mappings/PropertyMappingProviderScopeForm.ts

@@ -24,12 +24,11 @@ export class PropertyMappingProviderScopeForm extends BasePropertyMappingForm<Sc
                 pmUuid: this.instance.pk,
                 scopeMappingRequest: data,
             });
-        } else {
+        }
         return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScopeCreate({
             scopeMappingRequest: data,
         });
     }
-    }
 
     renderExtraFields(): TemplateResult {
         return html` <ak-form-element-horizontal

web/src/admin/property-mappings/PropertyMappingSourceKerberosForm.ts

@@ -25,13 +25,12 @@ export class PropertyMappingSourceKerberosForm extends BasePropertyMappingForm<K
                 pmUuid: this.instance.pk,
                 kerberosSourcePropertyMappingRequest: data,
             });
-        } else {
+        }
         return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceKerberosCreate({
             kerberosSourcePropertyMappingRequest: data,
         });
     }
 }
-}
 
 declare global {
     interface HTMLElementTagNameMap {

web/src/admin/property-mappings/PropertyMappingSourceLDAPForm.ts

@@ -25,13 +25,12 @@ export class PropertyMappingSourceLDAPForm extends BasePropertyMappingForm<LDAPS
                 pmUuid: this.instance.pk,
                 lDAPSourcePropertyMappingRequest: data,
             });
-        } else {
+        }
         return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceLdapCreate({
             lDAPSourcePropertyMappingRequest: data,
         });
     }
 }
-}
 
 declare global {
     interface HTMLElementTagNameMap {

web/src/admin/property-mappings/PropertyMappingSourceOAuthForm.ts

@@ -25,13 +25,12 @@ export class PropertyMappingSourceOAuthForm extends BasePropertyMappingForm<OAut
                 pmUuid: this.instance.pk,
                 oAuthSourcePropertyMappingRequest: data,
             });
-        } else {
+        }
         return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceOauthCreate({
             oAuthSourcePropertyMappingRequest: data,
         });
     }
 }
-}
 
 declare global {
     interface HTMLElementTagNameMap {

web/src/admin/property-mappings/PropertyMappingSourcePlexForm.ts

@@ -25,13 +25,12 @@ export class PropertyMappingSourcePlexForm extends BasePropertyMappingForm<PlexS
                 pmUuid: this.instance.pk,
                 plexSourcePropertyMappingRequest: data,
             });
-        } else {
+        }
         return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourcePlexCreate({
             plexSourcePropertyMappingRequest: data,
         });
     }
 }
-}
 
 declare global {
     interface HTMLElementTagNameMap {

web/src/admin/property-mappings/PropertyMappingSourceSAMLForm.ts

@@ -25,13 +25,12 @@ export class PropertyMappingSourceSAMLForm extends BasePropertyMappingForm<SAMLS
                 pmUuid: this.instance.pk,
                 sAMLSourcePropertyMappingRequest: data,
             });
-        } else {
+        }
         return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceSamlCreate({
             sAMLSourcePropertyMappingRequest: data,
         });
     }
 }
-}
 
 declare global {
     interface HTMLElementTagNameMap {

web/src/admin/property-mappings/PropertyMappingSourceSCIMForm.ts

@@ -25,13 +25,12 @@ export class PropertyMappingSourceSCIMForm extends BasePropertyMappingForm<SCIMS
                 pmUuid: this.instance.pk,
                 sCIMSourcePropertyMappingRequest: data,
             });
-        } else {
+        }
         return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceScimCreate({
             sCIMSourcePropertyMappingRequest: data,
         });
     }
 }
-}
 
 declare global {
     interface HTMLElementTagNameMap {

web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts

@@ -41,12 +41,11 @@ export class GoogleWorkspaceProviderFormPage extends BaseProviderForm<GoogleWork
                 id: this.instance.pk,
                 googleWorkspaceProviderRequest: data,
             });
-        } else {
+        }
         return new ProvidersApi(DEFAULT_CONFIG).providersGoogleWorkspaceCreate({
             googleWorkspaceProviderRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <ak-form-element-horizontal label=${msg("Name")} ?required=${true} name="name">

web/src/admin/providers/ldap/LDAPProviderForm.ts

@@ -24,12 +24,11 @@ export class LDAPProviderFormPage extends WithBrandConfig(BaseProviderForm<LDAPP
                 id: this.instance.pk,
                 lDAPProviderRequest: data,
             });
-        } else {
+        }
         return new ProvidersApi(DEFAULT_CONFIG).providersLdapCreate({
             lDAPProviderRequest: data,
         });
     }
-    }
 
     renderForm() {
         return renderForm(this.instance ?? {}, [], this.brand);

web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderForm.ts

@@ -39,12 +39,11 @@ export class MicrosoftEntraProviderFormPage extends BaseProviderForm<MicrosoftEn
                 id: this.instance.pk,
                 microsoftEntraProviderRequest: data,
             });
-        } else {
+        }
         return new ProvidersApi(DEFAULT_CONFIG).providersMicrosoftEntraCreate({
             microsoftEntraProviderRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <ak-form-element-horizontal label=${msg("Name")} ?required=${true} name="name">

web/src/admin/providers/oauth2/OAuth2ProviderForm.ts

@@ -82,12 +82,11 @@ export class OAuth2ProviderFormPage extends BaseProviderForm<OAuth2Provider> {
                 id: this.instance.pk,
                 oAuth2ProviderRequest: data,
             });
-        } else {
+        }
         return new ProvidersApi(DEFAULT_CONFIG).providersOauth2Create({
             oAuth2ProviderRequest: data,
         });
     }
-    }
 
     renderForm() {
         const showClientSecretCallback = (show: boolean) => {

web/src/admin/providers/proxy/ProxyProviderForm.ts

@@ -45,12 +45,11 @@ export class ProxyProviderFormPage extends BaseProviderForm<ProxyProvider> {
                 id: this.instance.pk,
                 proxyProviderRequest: data,
             });
-        } else {
+        }
         return new ProvidersApi(DEFAULT_CONFIG).providersProxyCreate({
             proxyProviderRequest: data,
         });
     }
-    }
 
     renderForm() {
         const onSetMode: SetMode = (ev) => {

web/src/admin/providers/rac/EndpointForm.ts

@@ -45,12 +45,11 @@ export class EndpointForm extends ModelForm<Endpoint, string> {
                 pbmUuid: this.instance.pk || "",
                 patchedEndpointRequest: data,
             });
-        } else {
+        }
         return new RacApi(DEFAULT_CONFIG).racEndpointsCreate({
             endpointRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html`

web/src/admin/providers/rac/RACProviderForm.ts

@@ -31,9 +31,8 @@ export class RACProviderFormPage extends ModelForm<RACProvider, number> {
     getSuccessMessage(): string {
         if (this.instance) {
             return msg("Successfully updated provider.");
-        } else {
-            return msg("Successfully created provider.");
         }
+        return msg("Successfully created provider.");
     }
 
     async send(data: RACProvider): Promise<RACProvider> {
@@ -42,12 +41,11 @@ export class RACProviderFormPage extends ModelForm<RACProvider, number> {
                 id: this.instance.pk,
                 rACProviderRequest: data,
             });
-        } else {
+        }
         return new ProvidersApi(DEFAULT_CONFIG).providersRacCreate({
             rACProviderRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html`

web/src/admin/providers/radius/RadiusProviderForm.ts

@@ -22,12 +22,11 @@ export class RadiusProviderFormPage extends WithBrandConfig(BaseProviderForm<Rad
                 id: this.instance.pk,
                 radiusProviderRequest: data,
             });
-        } else {
+        }
         return new ProvidersApi(DEFAULT_CONFIG).providersRadiusCreate({
             radiusProviderRequest: data,
         });
     }
-    }
 
     renderForm() {
         return renderForm(this.instance ?? {}, [], this.brand);

web/src/admin/providers/saml/SAMLProviderForm.ts

@@ -27,12 +27,11 @@ export class SAMLProviderFormPage extends BaseProviderForm<SAMLProvider> {
                 id: this.instance.pk,
                 sAMLProviderRequest: data,
             });
-        } else {
+        }
         return new ProvidersApi(DEFAULT_CONFIG).providersSamlCreate({
             sAMLProviderRequest: data,
         });
     }
-    }
 
     renderForm() {
         const setHasSigningKp = (ev: InputEvent) => {

web/src/admin/providers/scim/SCIMProviderForm.ts

@@ -21,12 +21,11 @@ export class SCIMProviderFormPage extends BaseProviderForm<SCIMProvider> {
                 id: this.instance.pk,
                 sCIMProviderRequest: data,
             });
-        } else {
+        }
         return new ProvidersApi(DEFAULT_CONFIG).providersScimCreate({
             sCIMProviderRequest: data,
         });
     }
-    }
 
     renderForm() {
         return renderForm(this.instance ?? {}, []);

web/src/admin/providers/ssf/SSFProviderFormPage.ts

@@ -42,12 +42,11 @@ export class SSFProviderFormPage extends BaseProviderForm<SSFProvider> {
                 id: this.instance.pk,
                 sSFProviderRequest: data,
             });
-        } else {
+        }
         return new ProvidersApi(DEFAULT_CONFIG).providersSsfCreate({
             sSFProviderRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         const provider = this.instance;

web/src/admin/rbac/InitialPermissionsForm.ts

@@ -46,12 +46,11 @@ export class InitialPermissionsForm extends ModelForm<InitialPermissions, string
                 id: this.instance.pk,
                 patchedInitialPermissionsRequest: data,
             });
-        } else {
+        }
         return new RbacApi(DEFAULT_CONFIG).rbacInitialPermissionsCreate({
             initialPermissionsRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">

web/src/admin/roles/RoleForm.ts

@@ -32,12 +32,11 @@ export class RoleForm extends ModelForm<Role, string> {
                 uuid: this.instance.pk,
                 patchedRoleRequest: data,
             });
-        } else {
+        }
         return new RbacApi(DEFAULT_CONFIG).rbacRolesCreate({
             roleRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html`<ak-form-element-horizontal label=${msg("Name")} ?required=${true} name="name">

web/src/admin/sources/scim/SCIMSourceForm.ts

@@ -32,12 +32,11 @@ export class SCIMSourceForm extends BaseSourceForm<SCIMSource> {
                 slug: this.instance.slug,
                 patchedSCIMSourceRequest: data,
             });
-        } else {
+        }
         return new SourcesApi(DEFAULT_CONFIG).sourcesScimCreate({
             sCIMSourceRequest: data as unknown as SCIMSourceRequest,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">

web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts

@@ -33,12 +33,11 @@ export class AuthenticatorDuoStageForm extends BaseStageForm<AuthenticatorDuoSta
                 stageUuid: this.instance.pk || "",
                 patchedAuthenticatorDuoStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorDuoCreate({
             authenticatorDuoStageRequest: data as unknown as AuthenticatorDuoStageRequest,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/stages/authenticator_email/AuthenticatorEmailStageForm.ts

@@ -39,12 +39,11 @@ export class AuthenticatorEmailStageForm extends BaseStageForm<AuthenticatorEmai
                 stageUuid: this.instance.pk || "",
                 authenticatorEmailStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorEmailCreate({
             authenticatorEmailStageRequest: data,
         });
     }
-    }
 
     renderConnectionSettings(): TemplateResult {
         if (!this.showConnectionSettings) {

web/src/admin/stages/authenticator_endpoint_gdtc/AuthenticatorEndpointGDTCStageForm.ts

@@ -27,12 +27,11 @@ export class AuthenticatorEndpointGDTCStageForm extends BaseStageForm<Authentica
                 stageUuid: this.instance.pk || "",
                 patchedAuthenticatorEndpointGDTCStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorEndpointGdtcCreate({
             authenticatorEndpointGDTCStageRequest: data,
         });
     }
-    }
 
     static get styles() {
         return super.styles.concat(PFBanner);

web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts

@@ -50,12 +50,11 @@ export class AuthenticatorSMSStageForm extends BaseStageForm<AuthenticatorSMSSta
                 stageUuid: this.instance.pk || "",
                 authenticatorSMSStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorSmsCreate({
             authenticatorSMSStageRequest: data,
         });
     }
-    }
 
     renderProviderTwillio(): TemplateResult {
         return html` <ak-form-element-horizontal

web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts

@@ -31,12 +31,11 @@ export class AuthenticatorStaticStageForm extends BaseStageForm<AuthenticatorSta
                 stageUuid: this.instance.pk || "",
                 authenticatorStaticStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorStaticCreate({
             authenticatorStaticStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts

@@ -33,12 +33,11 @@ export class AuthenticatorTOTPStageForm extends BaseStageForm<AuthenticatorTOTPS
                 stageUuid: this.instance.pk || "",
                 authenticatorTOTPStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorTotpCreate({
             authenticatorTOTPStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts

@@ -57,12 +57,11 @@ export class AuthenticatorValidateStageForm extends BaseStageForm<AuthenticatorV
                 stageUuid: this.instance.pk || "",
                 authenticatorValidateStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorValidateCreate({
             authenticatorValidateStageRequest: data,
         });
     }
-    }
 
     isDeviceClassSelected(field: DeviceClassesEnum): boolean {
         return (

web/src/admin/stages/authenticator_webauthn/AuthenticatorWebAuthnStageForm.ts

@@ -41,12 +41,11 @@ export class AuthenticatorWebAuthnStageForm extends BaseStageForm<AuthenticatorW
                 stageUuid: this.instance.pk || "",
                 authenticatorWebAuthnStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorWebauthnCreate({
             authenticatorWebAuthnStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/stages/captcha/CaptchaStageForm.ts

@@ -26,12 +26,11 @@ export class CaptchaStageForm extends BaseStageForm<CaptchaStage> {
                 stageUuid: this.instance.pk || "",
                 patchedCaptchaStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesCaptchaCreate({
             captchaStageRequest: data as unknown as CaptchaStageRequest,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/stages/consent/ConsentStageForm.ts

@@ -33,12 +33,11 @@ export class ConsentStageForm extends BaseStageForm<ConsentStage> {
                 stageUuid: this.instance.pk || "",
                 consentStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesConsentCreate({
             consentStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/stages/deny/DenyStageForm.ts

@@ -23,12 +23,11 @@ export class DenyStageForm extends BaseStageForm<DenyStage> {
                 stageUuid: this.instance.pk || "",
                 denyStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesDenyCreate({
             denyStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html`

web/src/admin/stages/dummy/DummyStageForm.ts

@@ -23,12 +23,11 @@ export class DummyStageForm extends BaseStageForm<DummyStage> {
                 stageUuid: this.instance.pk || "",
                 dummyStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesDummyCreate({
             dummyStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/stages/email/EmailStageForm.ts

@@ -36,12 +36,11 @@ export class EmailStageForm extends BaseStageForm<EmailStage> {
                 stageUuid: this.instance.pk || "",
                 patchedEmailStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesEmailCreate({
             emailStageRequest: data,
         });
     }
-    }
 
     renderConnectionSettings(): TemplateResult {
         if (!this.showConnectionSettings) {

web/src/admin/stages/invitation/InvitationForm.ts

@@ -34,12 +34,11 @@ export class InvitationForm extends ModelForm<Invitation, string> {
                 inviteUuid: this.instance.pk || "",
                 invitationRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesInvitationInvitationsCreate({
             invitationRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <ak-form-element-horizontal

web/src/admin/stages/invitation/InvitationStageForm.ts

@@ -23,12 +23,11 @@ export class InvitationStageForm extends BaseStageForm<InvitationStage> {
                 stageUuid: this.instance.pk || "",
                 invitationStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesInvitationStagesCreate({
             invitationStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/stages/password/PasswordStageForm.ts

@@ -34,12 +34,11 @@ export class PasswordStageForm extends BaseStageForm<PasswordStage> {
                 stageUuid: this.instance.pk || "",
                 passwordStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesPasswordCreate({
             passwordStageRequest: data,
         });
     }
-    }
 
     isBackendSelected(field: BackendsEnum): boolean {
         if (!this.instance) {

web/src/admin/stages/prompt/PromptForm.ts

@@ -54,12 +54,11 @@ export class PromptForm extends ModelForm<Prompt, string> {
                 promptUuid: this.instance.pk || "",
                 promptRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesPromptPromptsCreate({
             promptRequest: data,
         });
     }
-    }
 
     async loadInstance(pk: string): Promise<Prompt> {
         const prompt = await new StagesApi(DEFAULT_CONFIG).stagesPromptPromptsRetrieve({

web/src/admin/stages/prompt/PromptStageForm.ts

@@ -35,12 +35,11 @@ export class PromptStageForm extends BaseStageForm<PromptStage> {
                 stageUuid: this.instance.pk || "",
                 promptStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesPromptStagesCreate({
             promptStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/stages/redirect/RedirectStageForm.ts

@@ -38,12 +38,11 @@ export class RedirectStageForm extends BaseStageForm<RedirectStage> {
                 stageUuid: this.instance.pk || "",
                 redirectStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesRedirectCreate({
             redirectStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html`<span>

web/src/admin/stages/source/SourceStageForm.ts

@@ -31,12 +31,11 @@ export class SourceStageForm extends BaseStageForm<SourceStage> {
                 stageUuid: this.instance.pk || "",
                 sourceStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesSourceCreate({
             sourceStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html`

web/src/admin/stages/user_delete/UserDeleteStageForm.ts

@@ -23,12 +23,11 @@ export class UserDeleteStageForm extends BaseStageForm<UserDeleteStage> {
                 stageUuid: this.instance.pk || "",
                 userDeleteStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesUserDeleteCreate({
             userDeleteStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/stages/user_login/UserLoginStageForm.ts

@@ -25,12 +25,11 @@ export class UserLoginStageForm extends BaseStageForm<UserLoginStage> {
                 stageUuid: this.instance.pk || "",
                 userLoginStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesUserLoginCreate({
             userLoginStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>${msg("Log the currently pending user in.")}</span>

web/src/admin/stages/user_logout/UserLogoutStageForm.ts

@@ -23,12 +23,11 @@ export class UserLogoutStageForm extends BaseStageForm<UserLogoutStage> {
                 stageUuid: this.instance.pk || "",
                 userLogoutStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesUserLogoutCreate({
             userLogoutStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>${msg("Remove the user from the current session.")}</span>

web/src/admin/stages/user_write/UserWriteStageForm.ts

@@ -34,12 +34,11 @@ export class UserWriteStageForm extends BaseStageForm<UserWriteStage> {
                 stageUuid: this.instance.pk || "",
                 userWriteStageRequest: data,
             });
-        } else {
+        }
         return new StagesApi(DEFAULT_CONFIG).stagesUserWriteCreate({
             userWriteStageRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         return html` <span>

web/src/admin/tokens/TokenForm.ts

@@ -37,12 +37,11 @@ export class TokenForm extends ModelForm<Token, string> {
                 identifier: this.instance.identifier,
                 tokenRequest: data,
             });
-        } else {
+        }
         return new CoreApi(DEFAULT_CONFIG).coreTokensCreate({
             tokenRequest: data,
         });
     }
-    }
 
     renderExpiry(): TemplateResult {
         return html`<ak-form-element-horizontal label=${msg("Expires on")} name="expires">

web/src/admin/users/UserForm.ts

@@ -46,13 +46,12 @@ export class UserForm extends ModelForm<User, number> {
     getSuccessMessage(): string {
         if (this.instance) {
             return msg("Successfully updated user.");
-        } else {
+        }
         if (this.group) {
             return msg(str`Successfully created user and added to group ${this.group.name}`);
         }
         return msg("Successfully created user.");
     }
-    }
 
     async send(data: User): Promise<User> {
         if (data.attributes === null) {

web/src/elements/TreeView.ts

@@ -173,9 +173,8 @@ export class TreeView extends AKElement {
                 child.parent = item;
             }
             return item;
-        } else {
-            return this.createNode(path, parentItem.childItems[idx], level + 1);
         }
+        return this.createNode(path, parentItem.childItems[idx], level + 1);
     }
 
     parse(data: string[]): TreeViewItem {

web/src/user/user-settings/tokens/UserTokenForm.ts

@@ -34,13 +34,12 @@ export class UserTokenForm extends ModelForm<Token, string> {
                 identifier: this.instance.identifier,
                 tokenRequest: data,
             });
-        } else {
+        }
         data.intent = this.intent;
         return new CoreApi(DEFAULT_CONFIG).coreTokensCreate({
             tokenRequest: data,
         });
     }
-    }
 
     renderForm(): TemplateResult {
         const now = new Date();