From 40f598f3f12dc163bc866c2b113935244eb869a3 Mon Sep 17 00:00:00 2001
From: Teffen Ellis <592134+GirlBossRush@users.noreply.github.com>
Date: Mon, 19 May 2025 19:34:51 +0200
Subject: [PATCH] web: (ESLint) No else return (#14558)

web: (ESLint) no-else-return.
---
 web/package.json                                 |  6 +++---
 .../admin-overview/cards/WorkerStatusCard.ts     |  7 +++----
 .../entitlements/ApplicationEntitlementForm.ts   | 10 ++++------
 web/src/admin/blueprints/BlueprintForm.ts        |  7 +++----
 web/src/admin/brands/BrandForm.ts                |  7 +++----
 web/src/admin/crypto/CertificateKeyPairForm.ts   |  7 +++----
 web/src/admin/events/RuleForm.ts                 |  7 +++----
 web/src/admin/events/TransportForm.ts            |  7 +++----
 web/src/admin/flows/StageBindingForm.ts          | 16 +++++++---------
 web/src/admin/groups/GroupForm.ts                |  9 ++++-----
 web/src/admin/outposts/OutpostForm.ts            |  7 +++----
 .../outposts/ServiceConnectionDockerForm.ts      |  7 +++----
 .../outposts/ServiceConnectionKubernetesForm.ts  |  7 +++----
 web/src/admin/policies/BoundPoliciesList.ts      |  6 ++----
 web/src/admin/policies/PolicyBindingForm.ts      | 10 ++++------
 web/src/admin/policies/dummy/DummyPolicyForm.ts  |  7 +++----
 .../event_matcher/EventMatcherPolicyForm.ts      |  7 +++----
 .../admin/policies/expiry/ExpiryPolicyForm.ts    |  7 +++----
 .../policies/expression/ExpressionPolicyForm.ts  |  7 +++----
 web/src/admin/policies/geoip/GeoIPPolicyForm.ts  |  7 +++----
 .../policies/password/PasswordPolicyForm.ts      |  7 +++----
 .../policies/reputation/ReputationPolicyForm.ts  |  7 +++----
 .../unique_password/UniquePasswordPolicyForm.ts  |  7 +++----
 .../PropertyMappingNotification.ts               |  7 +++----
 ...PropertyMappingProviderGoogleWorkspaceForm.ts | 11 +++++------
 .../PropertyMappingProviderMicrosoftEntraForm.ts | 11 +++++------
 .../PropertyMappingProviderRACForm.ts            |  7 +++----
 .../PropertyMappingProviderRadiusForm.ts         |  7 +++----
 .../PropertyMappingProviderSAMLForm.ts           |  7 +++----
 .../PropertyMappingProviderSCIMForm.ts           |  7 +++----
 .../PropertyMappingProviderScopeForm.ts          |  7 +++----
 .../PropertyMappingSourceKerberosForm.ts         |  7 +++----
 .../PropertyMappingSourceLDAPForm.ts             |  7 +++----
 .../PropertyMappingSourceOAuthForm.ts            |  7 +++----
 .../PropertyMappingSourcePlexForm.ts             |  7 +++----
 .../PropertyMappingSourceSAMLForm.ts             |  7 +++----
 .../PropertyMappingSourceSCIMForm.ts             |  7 +++----
 .../GoogleWorkspaceProviderForm.ts               |  7 +++----
 web/src/admin/providers/ldap/LDAPProviderForm.ts |  7 +++----
 .../MicrosoftEntraProviderForm.ts                |  7 +++----
 .../admin/providers/oauth2/OAuth2ProviderForm.ts |  7 +++----
 .../admin/providers/proxy/ProxyProviderForm.ts   |  7 +++----
 web/src/admin/providers/rac/EndpointForm.ts      |  7 +++----
 web/src/admin/providers/rac/RACProviderForm.ts   | 10 ++++------
 .../admin/providers/radius/RadiusProviderForm.ts |  7 +++----
 web/src/admin/providers/saml/SAMLProviderForm.ts |  7 +++----
 web/src/admin/providers/scim/SCIMProviderForm.ts |  7 +++----
 .../admin/providers/ssf/SSFProviderFormPage.ts   |  7 +++----
 web/src/admin/rbac/InitialPermissionsForm.ts     |  7 +++----
 web/src/admin/roles/RoleForm.ts                  |  7 +++----
 web/src/admin/sources/scim/SCIMSourceForm.ts     |  7 +++----
 .../AuthenticatorDuoStageForm.ts                 |  7 +++----
 .../AuthenticatorEmailStageForm.ts               |  7 +++----
 .../AuthenticatorEndpointGDTCStageForm.ts        |  7 +++----
 .../AuthenticatorSMSStageForm.ts                 |  7 +++----
 .../AuthenticatorStaticStageForm.ts              |  7 +++----
 .../AuthenticatorTOTPStageForm.ts                |  7 +++----
 .../AuthenticatorValidateStageForm.ts            |  7 +++----
 .../AuthenticatorWebAuthnStageForm.ts            |  7 +++----
 web/src/admin/stages/captcha/CaptchaStageForm.ts |  7 +++----
 web/src/admin/stages/consent/ConsentStageForm.ts |  7 +++----
 web/src/admin/stages/deny/DenyStageForm.ts       |  7 +++----
 web/src/admin/stages/dummy/DummyStageForm.ts     |  7 +++----
 web/src/admin/stages/email/EmailStageForm.ts     |  7 +++----
 .../admin/stages/invitation/InvitationForm.ts    |  7 +++----
 .../stages/invitation/InvitationStageForm.ts     |  7 +++----
 .../admin/stages/password/PasswordStageForm.ts   |  7 +++----
 web/src/admin/stages/prompt/PromptForm.ts        |  7 +++----
 web/src/admin/stages/prompt/PromptStageForm.ts   |  7 +++----
 .../admin/stages/redirect/RedirectStageForm.ts   |  7 +++----
 web/src/admin/stages/source/SourceStageForm.ts   |  7 +++----
 .../stages/user_delete/UserDeleteStageForm.ts    |  7 +++----
 .../stages/user_login/UserLoginStageForm.ts      |  7 +++----
 .../stages/user_logout/UserLogoutStageForm.ts    |  7 +++----
 .../stages/user_write/UserWriteStageForm.ts      |  7 +++----
 web/src/admin/tokens/TokenForm.ts                |  7 +++----
 web/src/admin/users/UserForm.ts                  |  9 ++++-----
 web/src/elements/TreeView.ts                     |  3 +--
 .../user/user-settings/tokens/UserTokenForm.ts   |  9 ++++-----
 79 files changed, 248 insertions(+), 331 deletions(-)

diff --git a/web/package.json b/web/package.json
index 37239efcb9..11869aacaf 100644
--- a/web/package.json
+++ b/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"
         }
     }
 }
diff --git a/web/src/admin/admin-overview/cards/WorkerStatusCard.ts b/web/src/admin/admin-overview/cards/WorkerStatusCard.ts
index f4f640382f..ad158bc07e 100644
--- a/web/src/admin/admin-overview/cards/WorkerStatusCard.ts
+++ b/web/src/admin/admin-overview/cards/WorkerStatusCard.ts
@@ -33,11 +33,10 @@ 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",
-            });
         }
+        return Promise.resolve<AdminStatus>({
+            icon: "fa fa-check-circle pf-m-success",
+        });
     }
 
     renderValue() {
diff --git a/web/src/admin/applications/entitlements/ApplicationEntitlementForm.ts b/web/src/admin/applications/entitlements/ApplicationEntitlementForm.ts
index 3ee3cad0ee..5db5ab956d 100644
--- a/web/src/admin/applications/entitlements/ApplicationEntitlementForm.ts
+++ b/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,11 +47,10 @@ export class ApplicationEntitlementForm extends ModelForm<ApplicationEntitlement
                 pbmUuid: this.instance.pbmUuid || "",
                 applicationEntitlementRequest: data,
             });
-        } else {
-            return new CoreApi(DEFAULT_CONFIG).coreApplicationEntitlementsCreate({
-                applicationEntitlementRequest: data,
-            });
         }
+        return new CoreApi(DEFAULT_CONFIG).coreApplicationEntitlementsCreate({
+            applicationEntitlementRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/blueprints/BlueprintForm.ts b/web/src/admin/blueprints/BlueprintForm.ts
index 4014ed1f88..5e9338b279 100644
--- a/web/src/admin/blueprints/BlueprintForm.ts
+++ b/web/src/admin/blueprints/BlueprintForm.ts
@@ -58,11 +58,10 @@ export class BlueprintForm extends ModelForm<BlueprintInstance, string> {
                 instanceUuid: this.instance.pk,
                 blueprintInstanceRequest: data,
             });
-        } else {
-            return new ManagedApi(DEFAULT_CONFIG).managedBlueprintsCreate({
-                blueprintInstanceRequest: data,
-            });
         }
+        return new ManagedApi(DEFAULT_CONFIG).managedBlueprintsCreate({
+            blueprintInstanceRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/brands/BrandForm.ts b/web/src/admin/brands/BrandForm.ts
index 1090e9fcbf..fa79fdb53c 100644
--- a/web/src/admin/brands/BrandForm.ts
+++ b/web/src/admin/brands/BrandForm.ts
@@ -42,11 +42,10 @@ export class BrandForm extends ModelForm<Brand, string> {
                 brandUuid: this.instance.brandUuid,
                 brandRequest: data,
             });
-        } else {
-            return new CoreApi(DEFAULT_CONFIG).coreBrandsCreate({
-                brandRequest: data,
-            });
         }
+        return new CoreApi(DEFAULT_CONFIG).coreBrandsCreate({
+            brandRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/crypto/CertificateKeyPairForm.ts b/web/src/admin/crypto/CertificateKeyPairForm.ts
index bfa2d4ca48..942c3b8e24 100644
--- a/web/src/admin/crypto/CertificateKeyPairForm.ts
+++ b/web/src/admin/crypto/CertificateKeyPairForm.ts
@@ -30,11 +30,10 @@ 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,
-            });
         }
+        return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsCreate({
+            certificateKeyPairRequest: data as unknown as CertificateKeyPairRequest,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/events/RuleForm.ts b/web/src/admin/events/RuleForm.ts
index 7d89033649..6e7bc477c1 100644
--- a/web/src/admin/events/RuleForm.ts
+++ b/web/src/admin/events/RuleForm.ts
@@ -51,11 +51,10 @@ export class RuleForm extends ModelForm<NotificationRule, string> {
                 pbmUuid: this.instance.pk || "",
                 notificationRuleRequest: data,
             });
-        } else {
-            return new EventsApi(DEFAULT_CONFIG).eventsRulesCreate({
-                notificationRuleRequest: data,
-            });
         }
+        return new EventsApi(DEFAULT_CONFIG).eventsRulesCreate({
+            notificationRuleRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/events/TransportForm.ts b/web/src/admin/events/TransportForm.ts
index 7775ed0642..907902497b 100644
--- a/web/src/admin/events/TransportForm.ts
+++ b/web/src/admin/events/TransportForm.ts
@@ -46,11 +46,10 @@ export class TransportForm extends ModelForm<NotificationTransport, string> {
                 uuid: this.instance.pk || "",
                 notificationTransportRequest: data,
             });
-        } else {
-            return new EventsApi(DEFAULT_CONFIG).eventsTransportsCreate({
-                notificationTransportRequest: data,
-            });
         }
+        return new EventsApi(DEFAULT_CONFIG).eventsTransportsCreate({
+            notificationTransportRequest: data,
+        });
     }
 
     onModeChange(mode: string | undefined): void {
diff --git a/web/src/admin/flows/StageBindingForm.ts b/web/src/admin/flows/StageBindingForm.ts
index 4d0709d5f5..956b9ef360 100644
--- a/web/src/admin/flows/StageBindingForm.ts
+++ b/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,14 +49,13 @@ export class StageBindingForm extends ModelForm<FlowStageBinding, string> {
                 fsbUuid: this.instance.pk,
                 patchedFlowStageBindingRequest: data,
             });
-        } else {
-            if (this.targetPk) {
-                data.target = this.targetPk;
-            }
-            return new FlowsApi(DEFAULT_CONFIG).flowsBindingsCreate({
-                flowStageBindingRequest: data,
-            });
         }
+        if (this.targetPk) {
+            data.target = this.targetPk;
+        }
+        return new FlowsApi(DEFAULT_CONFIG).flowsBindingsCreate({
+            flowStageBindingRequest: data,
+        });
     }
 
     async getOrder(): Promise<number> {
diff --git a/web/src/admin/groups/GroupForm.ts b/web/src/admin/groups/GroupForm.ts
index db8d9e3765..98b39ecb5a 100644
--- a/web/src/admin/groups/GroupForm.ts
+++ b/web/src/admin/groups/GroupForm.ts
@@ -54,12 +54,11 @@ export class GroupForm extends ModelForm<Group, string> {
                 groupUuid: this.instance.pk,
                 patchedGroupRequest: data,
             });
-        } else {
-            data.users = [];
-            return new CoreApi(DEFAULT_CONFIG).coreGroupsCreate({
-                groupRequest: data,
-            });
         }
+        data.users = [];
+        return new CoreApi(DEFAULT_CONFIG).coreGroupsCreate({
+            groupRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/outposts/OutpostForm.ts b/web/src/admin/outposts/OutpostForm.ts
index fb1ac2fdf4..be98215d13 100644
--- a/web/src/admin/outposts/OutpostForm.ts
+++ b/web/src/admin/outposts/OutpostForm.ts
@@ -129,11 +129,10 @@ export class OutpostForm extends ModelForm<Outpost, string> {
                 uuid: this.instance.pk || "",
                 outpostRequest: data,
             });
-        } else {
-            return new OutpostsApi(DEFAULT_CONFIG).outpostsInstancesCreate({
-                outpostRequest: data,
-            });
         }
+        return new OutpostsApi(DEFAULT_CONFIG).outpostsInstancesCreate({
+            outpostRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/outposts/ServiceConnectionDockerForm.ts b/web/src/admin/outposts/ServiceConnectionDockerForm.ts
index 7866696443..6482df7462 100644
--- a/web/src/admin/outposts/ServiceConnectionDockerForm.ts
+++ b/web/src/admin/outposts/ServiceConnectionDockerForm.ts
@@ -31,11 +31,10 @@ export class ServiceConnectionDockerForm extends ModelForm<DockerServiceConnecti
                 uuid: this.instance.pk || "",
                 dockerServiceConnectionRequest: data,
             });
-        } else {
-            return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsDockerCreate({
-                dockerServiceConnectionRequest: data,
-            });
         }
+        return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsDockerCreate({
+            dockerServiceConnectionRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts b/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts
index ed5e1d6768..274ada34e9 100644
--- a/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts
+++ b/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts
@@ -35,11 +35,10 @@ export class ServiceConnectionKubernetesForm extends ModelForm<
                 uuid: this.instance.pk || "",
                 kubernetesServiceConnectionRequest: data,
             });
-        } else {
-            return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsKubernetesCreate({
-                kubernetesServiceConnectionRequest: data,
-            });
         }
+        return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsKubernetesCreate({
+            kubernetesServiceConnectionRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/policies/BoundPoliciesList.ts b/web/src/admin/policies/BoundPoliciesList.ts
index d991737947..960bfffb61 100644
--- a/web/src/admin/policies/BoundPoliciesList.ts
+++ b/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 {
diff --git a/web/src/admin/policies/PolicyBindingForm.ts b/web/src/admin/policies/PolicyBindingForm.ts
index ea88ca1c9b..8007157dc3 100644
--- a/web/src/admin/policies/PolicyBindingForm.ts
+++ b/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,11 +110,10 @@ export class PolicyBindingForm extends ModelForm<PolicyBinding, string> {
                 policyBindingUuid: this.instance.pk,
                 policyBindingRequest: data,
             });
-        } else {
-            return new PoliciesApi(DEFAULT_CONFIG).policiesBindingsCreate({
-                policyBindingRequest: data,
-            });
         }
+        return new PoliciesApi(DEFAULT_CONFIG).policiesBindingsCreate({
+            policyBindingRequest: data,
+        });
     }
 
     async getOrder(): Promise<number> {
diff --git a/web/src/admin/policies/dummy/DummyPolicyForm.ts b/web/src/admin/policies/dummy/DummyPolicyForm.ts
index 4dcc523f39..4d15498598 100644
--- a/web/src/admin/policies/dummy/DummyPolicyForm.ts
+++ b/web/src/admin/policies/dummy/DummyPolicyForm.ts
@@ -24,11 +24,10 @@ export class DummyPolicyForm extends BasePolicyForm<DummyPolicy> {
                 policyUuid: this.instance.pk || "",
                 dummyPolicyRequest: data,
             });
-        } else {
-            return new PoliciesApi(DEFAULT_CONFIG).policiesDummyCreate({
-                dummyPolicyRequest: data,
-            });
         }
+        return new PoliciesApi(DEFAULT_CONFIG).policiesDummyCreate({
+            dummyPolicyRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts b/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts
index e079502d4d..2f4234ba26 100644
--- a/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts
+++ b/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts
@@ -36,11 +36,10 @@ export class EventMatcherPolicyForm extends BasePolicyForm<EventMatcherPolicy> {
                 policyUuid: this.instance.pk || "",
                 eventMatcherPolicyRequest: data,
             });
-        } else {
-            return new PoliciesApi(DEFAULT_CONFIG).policiesEventMatcherCreate({
-                eventMatcherPolicyRequest: data,
-            });
         }
+        return new PoliciesApi(DEFAULT_CONFIG).policiesEventMatcherCreate({
+            eventMatcherPolicyRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/policies/expiry/ExpiryPolicyForm.ts b/web/src/admin/policies/expiry/ExpiryPolicyForm.ts
index 9d92858b1c..62aa294b59 100644
--- a/web/src/admin/policies/expiry/ExpiryPolicyForm.ts
+++ b/web/src/admin/policies/expiry/ExpiryPolicyForm.ts
@@ -24,11 +24,10 @@ export class PasswordExpiryPolicyForm extends BasePolicyForm<PasswordExpiryPolic
                 policyUuid: this.instance.pk || "",
                 passwordExpiryPolicyRequest: data,
             });
-        } else {
-            return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordExpiryCreate({
-                passwordExpiryPolicyRequest: data,
-            });
         }
+        return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordExpiryCreate({
+            passwordExpiryPolicyRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/policies/expression/ExpressionPolicyForm.ts b/web/src/admin/policies/expression/ExpressionPolicyForm.ts
index aca74ec00a..3a76241e50 100644
--- a/web/src/admin/policies/expression/ExpressionPolicyForm.ts
+++ b/web/src/admin/policies/expression/ExpressionPolicyForm.ts
@@ -27,11 +27,10 @@ export class ExpressionPolicyForm extends BasePolicyForm<ExpressionPolicy> {
                 policyUuid: this.instance.pk || "",
                 expressionPolicyRequest: data,
             });
-        } else {
-            return new PoliciesApi(DEFAULT_CONFIG).policiesExpressionCreate({
-                expressionPolicyRequest: data,
-            });
         }
+        return new PoliciesApi(DEFAULT_CONFIG).policiesExpressionCreate({
+            expressionPolicyRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/policies/geoip/GeoIPPolicyForm.ts b/web/src/admin/policies/geoip/GeoIPPolicyForm.ts
index fa55a5ec32..d11f374d8f 100644
--- a/web/src/admin/policies/geoip/GeoIPPolicyForm.ts
+++ b/web/src/admin/policies/geoip/GeoIPPolicyForm.ts
@@ -38,11 +38,10 @@ export class GeoIPPolicyForm extends BasePolicyForm<GeoIPPolicy> {
                 policyUuid: this.instance.pk || "",
                 geoIPPolicyRequest: data,
             });
-        } else {
-            return new PoliciesApi(DEFAULT_CONFIG).policiesGeoipCreate({
-                geoIPPolicyRequest: data,
-            });
         }
+        return new PoliciesApi(DEFAULT_CONFIG).policiesGeoipCreate({
+            geoIPPolicyRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/policies/password/PasswordPolicyForm.ts b/web/src/admin/policies/password/PasswordPolicyForm.ts
index 9999577e7a..fe8f63ec7b 100644
--- a/web/src/admin/policies/password/PasswordPolicyForm.ts
+++ b/web/src/admin/policies/password/PasswordPolicyForm.ts
@@ -37,11 +37,10 @@ export class PasswordPolicyForm extends BasePolicyForm<PasswordPolicy> {
                 policyUuid: this.instance.pk || "",
                 passwordPolicyRequest: data,
             });
-        } else {
-            return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordCreate({
-                passwordPolicyRequest: data,
-            });
         }
+        return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordCreate({
+            passwordPolicyRequest: data,
+        });
     }
 
     renderStaticRules(): TemplateResult {
diff --git a/web/src/admin/policies/reputation/ReputationPolicyForm.ts b/web/src/admin/policies/reputation/ReputationPolicyForm.ts
index 1c6b45825e..7a6f3d8419 100644
--- a/web/src/admin/policies/reputation/ReputationPolicyForm.ts
+++ b/web/src/admin/policies/reputation/ReputationPolicyForm.ts
@@ -24,11 +24,10 @@ export class ReputationPolicyForm extends BasePolicyForm<ReputationPolicy> {
                 policyUuid: this.instance.pk || "",
                 reputationPolicyRequest: data,
             });
-        } else {
-            return new PoliciesApi(DEFAULT_CONFIG).policiesReputationCreate({
-                reputationPolicyRequest: data,
-            });
         }
+        return new PoliciesApi(DEFAULT_CONFIG).policiesReputationCreate({
+            reputationPolicyRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/policies/unique_password/UniquePasswordPolicyForm.ts b/web/src/admin/policies/unique_password/UniquePasswordPolicyForm.ts
index 1455080063..0d33c39941 100644
--- a/web/src/admin/policies/unique_password/UniquePasswordPolicyForm.ts
+++ b/web/src/admin/policies/unique_password/UniquePasswordPolicyForm.ts
@@ -24,11 +24,10 @@ export class UniquePasswordPolicyForm extends BasePolicyForm<UniquePasswordPolic
                 policyUuid: this.instance.pk || "",
                 uniquePasswordPolicyRequest: data,
             });
-        } else {
-            return new PoliciesApi(DEFAULT_CONFIG).policiesUniquePasswordCreate({
-                uniquePasswordPolicyRequest: data,
-            });
         }
+        return new PoliciesApi(DEFAULT_CONFIG).policiesUniquePasswordCreate({
+            uniquePasswordPolicyRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/property-mappings/PropertyMappingNotification.ts b/web/src/admin/property-mappings/PropertyMappingNotification.ts
index 891555d717..dff00b822d 100644
--- a/web/src/admin/property-mappings/PropertyMappingNotification.ts
+++ b/web/src/admin/property-mappings/PropertyMappingNotification.ts
@@ -21,11 +21,10 @@ export class PropertyMappingNotification extends BasePropertyMappingForm<Notific
                 pmUuid: this.instance.pk,
                 notificationWebhookMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsNotificationCreate({
-                notificationWebhookMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsNotificationCreate({
+            notificationWebhookMappingRequest: data,
+        });
     }
 }
 
diff --git a/web/src/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm.ts
index 1418788603..9e47b9d640 100644
--- a/web/src/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm.ts
@@ -25,13 +25,12 @@ export class PropertyMappingProviderGoogleWorkspaceForm extends BasePropertyMapp
                 pmUuid: this.instance.pk,
                 googleWorkspaceProviderMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(
-                DEFAULT_CONFIG,
-            ).propertymappingsProviderGoogleWorkspaceCreate({
-                googleWorkspaceProviderMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(
+            DEFAULT_CONFIG,
+        ).propertymappingsProviderGoogleWorkspaceCreate({
+            googleWorkspaceProviderMappingRequest: data,
+        });
     }
 }
 
diff --git a/web/src/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm.ts
index 6b9be5e5ce..4d56faeef9 100644
--- a/web/src/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm.ts
+++ b/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,
+            },
+        );
     }
 }
 
diff --git a/web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts
index b41b8d7e9a..e5195e9d18 100644
--- a/web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts
@@ -46,11 +46,10 @@ export class PropertyMappingProviderRACForm extends BasePropertyMappingForm<RACP
                 pmUuid: this.instance.pk,
                 rACPropertyMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRacCreate({
-                rACPropertyMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRacCreate({
+            rACPropertyMappingRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/property-mappings/PropertyMappingProviderRadiusForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderRadiusForm.ts
index 301c2982ec..2a3cc57bff 100644
--- a/web/src/admin/property-mappings/PropertyMappingProviderRadiusForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingProviderRadiusForm.ts
@@ -21,11 +21,10 @@ export class PropertyMappingProviderRadiusForm extends BasePropertyMappingForm<R
                 pmUuid: this.instance.pk,
                 radiusProviderPropertyMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRadiusCreate({
-                radiusProviderPropertyMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRadiusCreate({
+            radiusProviderPropertyMappingRequest: data,
+        });
     }
 }
 
diff --git a/web/src/admin/property-mappings/PropertyMappingProviderSAMLForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderSAMLForm.ts
index a0ebdd8a35..323a339faf 100644
--- a/web/src/admin/property-mappings/PropertyMappingProviderSAMLForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingProviderSAMLForm.ts
@@ -24,11 +24,10 @@ export class PropertyMappingProviderSAMLForm extends BasePropertyMappingForm<SAM
                 pmUuid: this.instance.pk,
                 sAMLPropertyMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderSamlCreate({
-                sAMLPropertyMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderSamlCreate({
+            sAMLPropertyMappingRequest: data,
+        });
     }
 
     renderExtraFields(): TemplateResult {
diff --git a/web/src/admin/property-mappings/PropertyMappingProviderSCIMForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderSCIMForm.ts
index e02bddff67..6969d548ca 100644
--- a/web/src/admin/property-mappings/PropertyMappingProviderSCIMForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingProviderSCIMForm.ts
@@ -21,11 +21,10 @@ export class PropertyMappingProviderSCIMForm extends BasePropertyMappingForm<SCI
                 pmUuid: this.instance.pk,
                 sCIMMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScimCreate({
-                sCIMMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScimCreate({
+            sCIMMappingRequest: data,
+        });
     }
 }
 
diff --git a/web/src/admin/property-mappings/PropertyMappingProviderScopeForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderScopeForm.ts
index a2160448cf..26635c05b4 100644
--- a/web/src/admin/property-mappings/PropertyMappingProviderScopeForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingProviderScopeForm.ts
@@ -24,11 +24,10 @@ export class PropertyMappingProviderScopeForm extends BasePropertyMappingForm<Sc
                 pmUuid: this.instance.pk,
                 scopeMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScopeCreate({
-                scopeMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScopeCreate({
+            scopeMappingRequest: data,
+        });
     }
 
     renderExtraFields(): TemplateResult {
diff --git a/web/src/admin/property-mappings/PropertyMappingSourceKerberosForm.ts b/web/src/admin/property-mappings/PropertyMappingSourceKerberosForm.ts
index 984818d687..ed07e67e7a 100644
--- a/web/src/admin/property-mappings/PropertyMappingSourceKerberosForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingSourceKerberosForm.ts
@@ -25,11 +25,10 @@ export class PropertyMappingSourceKerberosForm extends BasePropertyMappingForm<K
                 pmUuid: this.instance.pk,
                 kerberosSourcePropertyMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceKerberosCreate({
-                kerberosSourcePropertyMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceKerberosCreate({
+            kerberosSourcePropertyMappingRequest: data,
+        });
     }
 }
 
diff --git a/web/src/admin/property-mappings/PropertyMappingSourceLDAPForm.ts b/web/src/admin/property-mappings/PropertyMappingSourceLDAPForm.ts
index cefe34dc39..722dbbd12d 100644
--- a/web/src/admin/property-mappings/PropertyMappingSourceLDAPForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingSourceLDAPForm.ts
@@ -25,11 +25,10 @@ export class PropertyMappingSourceLDAPForm extends BasePropertyMappingForm<LDAPS
                 pmUuid: this.instance.pk,
                 lDAPSourcePropertyMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceLdapCreate({
-                lDAPSourcePropertyMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceLdapCreate({
+            lDAPSourcePropertyMappingRequest: data,
+        });
     }
 }
 
diff --git a/web/src/admin/property-mappings/PropertyMappingSourceOAuthForm.ts b/web/src/admin/property-mappings/PropertyMappingSourceOAuthForm.ts
index e8fdcc3d79..17936b650b 100644
--- a/web/src/admin/property-mappings/PropertyMappingSourceOAuthForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingSourceOAuthForm.ts
@@ -25,11 +25,10 @@ export class PropertyMappingSourceOAuthForm extends BasePropertyMappingForm<OAut
                 pmUuid: this.instance.pk,
                 oAuthSourcePropertyMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceOauthCreate({
-                oAuthSourcePropertyMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceOauthCreate({
+            oAuthSourcePropertyMappingRequest: data,
+        });
     }
 }
 
diff --git a/web/src/admin/property-mappings/PropertyMappingSourcePlexForm.ts b/web/src/admin/property-mappings/PropertyMappingSourcePlexForm.ts
index a42f7939ce..abd295a33b 100644
--- a/web/src/admin/property-mappings/PropertyMappingSourcePlexForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingSourcePlexForm.ts
@@ -25,11 +25,10 @@ export class PropertyMappingSourcePlexForm extends BasePropertyMappingForm<PlexS
                 pmUuid: this.instance.pk,
                 plexSourcePropertyMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourcePlexCreate({
-                plexSourcePropertyMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourcePlexCreate({
+            plexSourcePropertyMappingRequest: data,
+        });
     }
 }
 
diff --git a/web/src/admin/property-mappings/PropertyMappingSourceSAMLForm.ts b/web/src/admin/property-mappings/PropertyMappingSourceSAMLForm.ts
index 4f0beb23f2..c045f34ba8 100644
--- a/web/src/admin/property-mappings/PropertyMappingSourceSAMLForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingSourceSAMLForm.ts
@@ -25,11 +25,10 @@ export class PropertyMappingSourceSAMLForm extends BasePropertyMappingForm<SAMLS
                 pmUuid: this.instance.pk,
                 sAMLSourcePropertyMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceSamlCreate({
-                sAMLSourcePropertyMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceSamlCreate({
+            sAMLSourcePropertyMappingRequest: data,
+        });
     }
 }
 
diff --git a/web/src/admin/property-mappings/PropertyMappingSourceSCIMForm.ts b/web/src/admin/property-mappings/PropertyMappingSourceSCIMForm.ts
index 86bb6e2624..cbb5e93ff6 100644
--- a/web/src/admin/property-mappings/PropertyMappingSourceSCIMForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingSourceSCIMForm.ts
@@ -25,11 +25,10 @@ export class PropertyMappingSourceSCIMForm extends BasePropertyMappingForm<SCIMS
                 pmUuid: this.instance.pk,
                 sCIMSourcePropertyMappingRequest: data,
             });
-        } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceScimCreate({
-                sCIMSourcePropertyMappingRequest: data,
-            });
         }
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSourceScimCreate({
+            sCIMSourcePropertyMappingRequest: data,
+        });
     }
 }
 
diff --git a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts
index 0f8b3adbb6..105f64dd85 100644
--- a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts
+++ b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts
@@ -41,11 +41,10 @@ export class GoogleWorkspaceProviderFormPage extends BaseProviderForm<GoogleWork
                 id: this.instance.pk,
                 googleWorkspaceProviderRequest: data,
             });
-        } else {
-            return new ProvidersApi(DEFAULT_CONFIG).providersGoogleWorkspaceCreate({
-                googleWorkspaceProviderRequest: data,
-            });
         }
+        return new ProvidersApi(DEFAULT_CONFIG).providersGoogleWorkspaceCreate({
+            googleWorkspaceProviderRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/providers/ldap/LDAPProviderForm.ts b/web/src/admin/providers/ldap/LDAPProviderForm.ts
index e353230e91..e91d51ef9b 100644
--- a/web/src/admin/providers/ldap/LDAPProviderForm.ts
+++ b/web/src/admin/providers/ldap/LDAPProviderForm.ts
@@ -24,11 +24,10 @@ export class LDAPProviderFormPage extends WithBrandConfig(BaseProviderForm<LDAPP
                 id: this.instance.pk,
                 lDAPProviderRequest: data,
             });
-        } else {
-            return new ProvidersApi(DEFAULT_CONFIG).providersLdapCreate({
-                lDAPProviderRequest: data,
-            });
         }
+        return new ProvidersApi(DEFAULT_CONFIG).providersLdapCreate({
+            lDAPProviderRequest: data,
+        });
     }
 
     renderForm() {
diff --git a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderForm.ts b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderForm.ts
index 92bea09aa9..53fb17567e 100644
--- a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderForm.ts
+++ b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderForm.ts
@@ -39,11 +39,10 @@ export class MicrosoftEntraProviderFormPage extends BaseProviderForm<MicrosoftEn
                 id: this.instance.pk,
                 microsoftEntraProviderRequest: data,
             });
-        } else {
-            return new ProvidersApi(DEFAULT_CONFIG).providersMicrosoftEntraCreate({
-                microsoftEntraProviderRequest: data,
-            });
         }
+        return new ProvidersApi(DEFAULT_CONFIG).providersMicrosoftEntraCreate({
+            microsoftEntraProviderRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts b/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts
index 551051b1d0..7481d669ab 100644
--- a/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts
+++ b/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts
@@ -82,11 +82,10 @@ export class OAuth2ProviderFormPage extends BaseProviderForm<OAuth2Provider> {
                 id: this.instance.pk,
                 oAuth2ProviderRequest: data,
             });
-        } else {
-            return new ProvidersApi(DEFAULT_CONFIG).providersOauth2Create({
-                oAuth2ProviderRequest: data,
-            });
         }
+        return new ProvidersApi(DEFAULT_CONFIG).providersOauth2Create({
+            oAuth2ProviderRequest: data,
+        });
     }
 
     renderForm() {
diff --git a/web/src/admin/providers/proxy/ProxyProviderForm.ts b/web/src/admin/providers/proxy/ProxyProviderForm.ts
index 31a2c1105b..8e3c527719 100644
--- a/web/src/admin/providers/proxy/ProxyProviderForm.ts
+++ b/web/src/admin/providers/proxy/ProxyProviderForm.ts
@@ -45,11 +45,10 @@ export class ProxyProviderFormPage extends BaseProviderForm<ProxyProvider> {
                 id: this.instance.pk,
                 proxyProviderRequest: data,
             });
-        } else {
-            return new ProvidersApi(DEFAULT_CONFIG).providersProxyCreate({
-                proxyProviderRequest: data,
-            });
         }
+        return new ProvidersApi(DEFAULT_CONFIG).providersProxyCreate({
+            proxyProviderRequest: data,
+        });
     }
 
     renderForm() {
diff --git a/web/src/admin/providers/rac/EndpointForm.ts b/web/src/admin/providers/rac/EndpointForm.ts
index d303b2371e..d447373a9a 100644
--- a/web/src/admin/providers/rac/EndpointForm.ts
+++ b/web/src/admin/providers/rac/EndpointForm.ts
@@ -45,11 +45,10 @@ export class EndpointForm extends ModelForm<Endpoint, string> {
                 pbmUuid: this.instance.pk || "",
                 patchedEndpointRequest: data,
             });
-        } else {
-            return new RacApi(DEFAULT_CONFIG).racEndpointsCreate({
-                endpointRequest: data,
-            });
         }
+        return new RacApi(DEFAULT_CONFIG).racEndpointsCreate({
+            endpointRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/providers/rac/RACProviderForm.ts b/web/src/admin/providers/rac/RACProviderForm.ts
index c88fb2560f..3e451fcdcc 100644
--- a/web/src/admin/providers/rac/RACProviderForm.ts
+++ b/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,11 +41,10 @@ export class RACProviderFormPage extends ModelForm<RACProvider, number> {
                 id: this.instance.pk,
                 rACProviderRequest: data,
             });
-        } else {
-            return new ProvidersApi(DEFAULT_CONFIG).providersRacCreate({
-                rACProviderRequest: data,
-            });
         }
+        return new ProvidersApi(DEFAULT_CONFIG).providersRacCreate({
+            rACProviderRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/providers/radius/RadiusProviderForm.ts b/web/src/admin/providers/radius/RadiusProviderForm.ts
index e1832f7fc7..69fc12cdcc 100644
--- a/web/src/admin/providers/radius/RadiusProviderForm.ts
+++ b/web/src/admin/providers/radius/RadiusProviderForm.ts
@@ -22,11 +22,10 @@ export class RadiusProviderFormPage extends WithBrandConfig(BaseProviderForm<Rad
                 id: this.instance.pk,
                 radiusProviderRequest: data,
             });
-        } else {
-            return new ProvidersApi(DEFAULT_CONFIG).providersRadiusCreate({
-                radiusProviderRequest: data,
-            });
         }
+        return new ProvidersApi(DEFAULT_CONFIG).providersRadiusCreate({
+            radiusProviderRequest: data,
+        });
     }
 
     renderForm() {
diff --git a/web/src/admin/providers/saml/SAMLProviderForm.ts b/web/src/admin/providers/saml/SAMLProviderForm.ts
index 72525b2128..a55a3f3b06 100644
--- a/web/src/admin/providers/saml/SAMLProviderForm.ts
+++ b/web/src/admin/providers/saml/SAMLProviderForm.ts
@@ -27,11 +27,10 @@ export class SAMLProviderFormPage extends BaseProviderForm<SAMLProvider> {
                 id: this.instance.pk,
                 sAMLProviderRequest: data,
             });
-        } else {
-            return new ProvidersApi(DEFAULT_CONFIG).providersSamlCreate({
-                sAMLProviderRequest: data,
-            });
         }
+        return new ProvidersApi(DEFAULT_CONFIG).providersSamlCreate({
+            sAMLProviderRequest: data,
+        });
     }
 
     renderForm() {
diff --git a/web/src/admin/providers/scim/SCIMProviderForm.ts b/web/src/admin/providers/scim/SCIMProviderForm.ts
index bfdcd3736d..4f88bee8d5 100644
--- a/web/src/admin/providers/scim/SCIMProviderForm.ts
+++ b/web/src/admin/providers/scim/SCIMProviderForm.ts
@@ -21,11 +21,10 @@ export class SCIMProviderFormPage extends BaseProviderForm<SCIMProvider> {
                 id: this.instance.pk,
                 sCIMProviderRequest: data,
             });
-        } else {
-            return new ProvidersApi(DEFAULT_CONFIG).providersScimCreate({
-                sCIMProviderRequest: data,
-            });
         }
+        return new ProvidersApi(DEFAULT_CONFIG).providersScimCreate({
+            sCIMProviderRequest: data,
+        });
     }
 
     renderForm() {
diff --git a/web/src/admin/providers/ssf/SSFProviderFormPage.ts b/web/src/admin/providers/ssf/SSFProviderFormPage.ts
index 9454732e72..b5fc6c0e07 100644
--- a/web/src/admin/providers/ssf/SSFProviderFormPage.ts
+++ b/web/src/admin/providers/ssf/SSFProviderFormPage.ts
@@ -42,11 +42,10 @@ export class SSFProviderFormPage extends BaseProviderForm<SSFProvider> {
                 id: this.instance.pk,
                 sSFProviderRequest: data,
             });
-        } else {
-            return new ProvidersApi(DEFAULT_CONFIG).providersSsfCreate({
-                sSFProviderRequest: data,
-            });
         }
+        return new ProvidersApi(DEFAULT_CONFIG).providersSsfCreate({
+            sSFProviderRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/rbac/InitialPermissionsForm.ts b/web/src/admin/rbac/InitialPermissionsForm.ts
index 4cf02ce7de..6f8bdd096f 100644
--- a/web/src/admin/rbac/InitialPermissionsForm.ts
+++ b/web/src/admin/rbac/InitialPermissionsForm.ts
@@ -46,11 +46,10 @@ export class InitialPermissionsForm extends ModelForm<InitialPermissions, string
                 id: this.instance.pk,
                 patchedInitialPermissionsRequest: data,
             });
-        } else {
-            return new RbacApi(DEFAULT_CONFIG).rbacInitialPermissionsCreate({
-                initialPermissionsRequest: data,
-            });
         }
+        return new RbacApi(DEFAULT_CONFIG).rbacInitialPermissionsCreate({
+            initialPermissionsRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/roles/RoleForm.ts b/web/src/admin/roles/RoleForm.ts
index 80cb5355cf..5a4d2f537c 100644
--- a/web/src/admin/roles/RoleForm.ts
+++ b/web/src/admin/roles/RoleForm.ts
@@ -32,11 +32,10 @@ export class RoleForm extends ModelForm<Role, string> {
                 uuid: this.instance.pk,
                 patchedRoleRequest: data,
             });
-        } else {
-            return new RbacApi(DEFAULT_CONFIG).rbacRolesCreate({
-                roleRequest: data,
-            });
         }
+        return new RbacApi(DEFAULT_CONFIG).rbacRolesCreate({
+            roleRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/sources/scim/SCIMSourceForm.ts b/web/src/admin/sources/scim/SCIMSourceForm.ts
index 2f9daa836a..11cc3b0450 100644
--- a/web/src/admin/sources/scim/SCIMSourceForm.ts
+++ b/web/src/admin/sources/scim/SCIMSourceForm.ts
@@ -32,11 +32,10 @@ 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,
-            });
         }
+        return new SourcesApi(DEFAULT_CONFIG).sourcesScimCreate({
+            sCIMSourceRequest: data as unknown as SCIMSourceRequest,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts b/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
index 4417c1fbbe..2820b44831 100644
--- a/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
+++ b/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
@@ -33,11 +33,10 @@ 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,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorDuoCreate({
+            authenticatorDuoStageRequest: data as unknown as AuthenticatorDuoStageRequest,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/authenticator_email/AuthenticatorEmailStageForm.ts b/web/src/admin/stages/authenticator_email/AuthenticatorEmailStageForm.ts
index 66f894473d..de7b58357b 100644
--- a/web/src/admin/stages/authenticator_email/AuthenticatorEmailStageForm.ts
+++ b/web/src/admin/stages/authenticator_email/AuthenticatorEmailStageForm.ts
@@ -39,11 +39,10 @@ export class AuthenticatorEmailStageForm extends BaseStageForm<AuthenticatorEmai
                 stageUuid: this.instance.pk || "",
                 authenticatorEmailStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorEmailCreate({
-                authenticatorEmailStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorEmailCreate({
+            authenticatorEmailStageRequest: data,
+        });
     }
 
     renderConnectionSettings(): TemplateResult {
diff --git a/web/src/admin/stages/authenticator_endpoint_gdtc/AuthenticatorEndpointGDTCStageForm.ts b/web/src/admin/stages/authenticator_endpoint_gdtc/AuthenticatorEndpointGDTCStageForm.ts
index c1812d34b6..4704d4570d 100644
--- a/web/src/admin/stages/authenticator_endpoint_gdtc/AuthenticatorEndpointGDTCStageForm.ts
+++ b/web/src/admin/stages/authenticator_endpoint_gdtc/AuthenticatorEndpointGDTCStageForm.ts
@@ -27,11 +27,10 @@ export class AuthenticatorEndpointGDTCStageForm extends BaseStageForm<Authentica
                 stageUuid: this.instance.pk || "",
                 patchedAuthenticatorEndpointGDTCStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorEndpointGdtcCreate({
-                authenticatorEndpointGDTCStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorEndpointGdtcCreate({
+            authenticatorEndpointGDTCStageRequest: data,
+        });
     }
 
     static get styles() {
diff --git a/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
index 9012a543ba..9761db72ad 100644
--- a/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
+++ b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
@@ -50,11 +50,10 @@ export class AuthenticatorSMSStageForm extends BaseStageForm<AuthenticatorSMSSta
                 stageUuid: this.instance.pk || "",
                 authenticatorSMSStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorSmsCreate({
-                authenticatorSMSStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorSmsCreate({
+            authenticatorSMSStageRequest: data,
+        });
     }
 
     renderProviderTwillio(): TemplateResult {
diff --git a/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts b/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts
index 51971f939e..19410b40de 100644
--- a/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts
+++ b/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts
@@ -31,11 +31,10 @@ export class AuthenticatorStaticStageForm extends BaseStageForm<AuthenticatorSta
                 stageUuid: this.instance.pk || "",
                 authenticatorStaticStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorStaticCreate({
-                authenticatorStaticStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorStaticCreate({
+            authenticatorStaticStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts b/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
index e56999b233..47de33872f 100644
--- a/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
+++ b/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
@@ -33,11 +33,10 @@ export class AuthenticatorTOTPStageForm extends BaseStageForm<AuthenticatorTOTPS
                 stageUuid: this.instance.pk || "",
                 authenticatorTOTPStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorTotpCreate({
-                authenticatorTOTPStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorTotpCreate({
+            authenticatorTOTPStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
index f7d8df8ff2..4559912024 100644
--- a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
+++ b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
@@ -57,11 +57,10 @@ export class AuthenticatorValidateStageForm extends BaseStageForm<AuthenticatorV
                 stageUuid: this.instance.pk || "",
                 authenticatorValidateStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorValidateCreate({
-                authenticatorValidateStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorValidateCreate({
+            authenticatorValidateStageRequest: data,
+        });
     }
 
     isDeviceClassSelected(field: DeviceClassesEnum): boolean {
diff --git a/web/src/admin/stages/authenticator_webauthn/AuthenticatorWebAuthnStageForm.ts b/web/src/admin/stages/authenticator_webauthn/AuthenticatorWebAuthnStageForm.ts
index 0ab3df0252..55fac58e3d 100644
--- a/web/src/admin/stages/authenticator_webauthn/AuthenticatorWebAuthnStageForm.ts
+++ b/web/src/admin/stages/authenticator_webauthn/AuthenticatorWebAuthnStageForm.ts
@@ -41,11 +41,10 @@ export class AuthenticatorWebAuthnStageForm extends BaseStageForm<AuthenticatorW
                 stageUuid: this.instance.pk || "",
                 authenticatorWebAuthnStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorWebauthnCreate({
-                authenticatorWebAuthnStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorWebauthnCreate({
+            authenticatorWebAuthnStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/captcha/CaptchaStageForm.ts b/web/src/admin/stages/captcha/CaptchaStageForm.ts
index 32db6f62ba..ccd647d844 100644
--- a/web/src/admin/stages/captcha/CaptchaStageForm.ts
+++ b/web/src/admin/stages/captcha/CaptchaStageForm.ts
@@ -26,11 +26,10 @@ 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,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesCaptchaCreate({
+            captchaStageRequest: data as unknown as CaptchaStageRequest,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/consent/ConsentStageForm.ts b/web/src/admin/stages/consent/ConsentStageForm.ts
index 9c45582baa..6d985e0122 100644
--- a/web/src/admin/stages/consent/ConsentStageForm.ts
+++ b/web/src/admin/stages/consent/ConsentStageForm.ts
@@ -33,11 +33,10 @@ export class ConsentStageForm extends BaseStageForm<ConsentStage> {
                 stageUuid: this.instance.pk || "",
                 consentStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesConsentCreate({
-                consentStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesConsentCreate({
+            consentStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/deny/DenyStageForm.ts b/web/src/admin/stages/deny/DenyStageForm.ts
index 1858588df4..ed03e2c424 100644
--- a/web/src/admin/stages/deny/DenyStageForm.ts
+++ b/web/src/admin/stages/deny/DenyStageForm.ts
@@ -23,11 +23,10 @@ export class DenyStageForm extends BaseStageForm<DenyStage> {
                 stageUuid: this.instance.pk || "",
                 denyStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesDenyCreate({
-                denyStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesDenyCreate({
+            denyStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/dummy/DummyStageForm.ts b/web/src/admin/stages/dummy/DummyStageForm.ts
index 17d4125c1a..11a8a6cf7f 100644
--- a/web/src/admin/stages/dummy/DummyStageForm.ts
+++ b/web/src/admin/stages/dummy/DummyStageForm.ts
@@ -23,11 +23,10 @@ export class DummyStageForm extends BaseStageForm<DummyStage> {
                 stageUuid: this.instance.pk || "",
                 dummyStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesDummyCreate({
-                dummyStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesDummyCreate({
+            dummyStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/email/EmailStageForm.ts b/web/src/admin/stages/email/EmailStageForm.ts
index b26d25af2c..7292bd6d39 100644
--- a/web/src/admin/stages/email/EmailStageForm.ts
+++ b/web/src/admin/stages/email/EmailStageForm.ts
@@ -36,11 +36,10 @@ export class EmailStageForm extends BaseStageForm<EmailStage> {
                 stageUuid: this.instance.pk || "",
                 patchedEmailStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesEmailCreate({
-                emailStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesEmailCreate({
+            emailStageRequest: data,
+        });
     }
 
     renderConnectionSettings(): TemplateResult {
diff --git a/web/src/admin/stages/invitation/InvitationForm.ts b/web/src/admin/stages/invitation/InvitationForm.ts
index 300aebe1d7..28637cd153 100644
--- a/web/src/admin/stages/invitation/InvitationForm.ts
+++ b/web/src/admin/stages/invitation/InvitationForm.ts
@@ -34,11 +34,10 @@ export class InvitationForm extends ModelForm<Invitation, string> {
                 inviteUuid: this.instance.pk || "",
                 invitationRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesInvitationInvitationsCreate({
-                invitationRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesInvitationInvitationsCreate({
+            invitationRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/invitation/InvitationStageForm.ts b/web/src/admin/stages/invitation/InvitationStageForm.ts
index b1111bc6a0..546b31ee11 100644
--- a/web/src/admin/stages/invitation/InvitationStageForm.ts
+++ b/web/src/admin/stages/invitation/InvitationStageForm.ts
@@ -23,11 +23,10 @@ export class InvitationStageForm extends BaseStageForm<InvitationStage> {
                 stageUuid: this.instance.pk || "",
                 invitationStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesInvitationStagesCreate({
-                invitationStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesInvitationStagesCreate({
+            invitationStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/password/PasswordStageForm.ts b/web/src/admin/stages/password/PasswordStageForm.ts
index b23513811e..356fcf745a 100644
--- a/web/src/admin/stages/password/PasswordStageForm.ts
+++ b/web/src/admin/stages/password/PasswordStageForm.ts
@@ -34,11 +34,10 @@ export class PasswordStageForm extends BaseStageForm<PasswordStage> {
                 stageUuid: this.instance.pk || "",
                 passwordStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesPasswordCreate({
-                passwordStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesPasswordCreate({
+            passwordStageRequest: data,
+        });
     }
 
     isBackendSelected(field: BackendsEnum): boolean {
diff --git a/web/src/admin/stages/prompt/PromptForm.ts b/web/src/admin/stages/prompt/PromptForm.ts
index 762c3cf09a..dc72f16b8e 100644
--- a/web/src/admin/stages/prompt/PromptForm.ts
+++ b/web/src/admin/stages/prompt/PromptForm.ts
@@ -54,11 +54,10 @@ export class PromptForm extends ModelForm<Prompt, string> {
                 promptUuid: this.instance.pk || "",
                 promptRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesPromptPromptsCreate({
-                promptRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesPromptPromptsCreate({
+            promptRequest: data,
+        });
     }
 
     async loadInstance(pk: string): Promise<Prompt> {
diff --git a/web/src/admin/stages/prompt/PromptStageForm.ts b/web/src/admin/stages/prompt/PromptStageForm.ts
index 9dfc37b5f9..b3d63196ae 100644
--- a/web/src/admin/stages/prompt/PromptStageForm.ts
+++ b/web/src/admin/stages/prompt/PromptStageForm.ts
@@ -35,11 +35,10 @@ export class PromptStageForm extends BaseStageForm<PromptStage> {
                 stageUuid: this.instance.pk || "",
                 promptStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesPromptStagesCreate({
-                promptStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesPromptStagesCreate({
+            promptStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/redirect/RedirectStageForm.ts b/web/src/admin/stages/redirect/RedirectStageForm.ts
index 9659870e1e..e485585177 100644
--- a/web/src/admin/stages/redirect/RedirectStageForm.ts
+++ b/web/src/admin/stages/redirect/RedirectStageForm.ts
@@ -38,11 +38,10 @@ export class RedirectStageForm extends BaseStageForm<RedirectStage> {
                 stageUuid: this.instance.pk || "",
                 redirectStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesRedirectCreate({
-                redirectStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesRedirectCreate({
+            redirectStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/source/SourceStageForm.ts b/web/src/admin/stages/source/SourceStageForm.ts
index 9a99d11c0f..4d31087faa 100644
--- a/web/src/admin/stages/source/SourceStageForm.ts
+++ b/web/src/admin/stages/source/SourceStageForm.ts
@@ -31,11 +31,10 @@ export class SourceStageForm extends BaseStageForm<SourceStage> {
                 stageUuid: this.instance.pk || "",
                 sourceStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesSourceCreate({
-                sourceStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesSourceCreate({
+            sourceStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/user_delete/UserDeleteStageForm.ts b/web/src/admin/stages/user_delete/UserDeleteStageForm.ts
index ce6d940960..14e4532511 100644
--- a/web/src/admin/stages/user_delete/UserDeleteStageForm.ts
+++ b/web/src/admin/stages/user_delete/UserDeleteStageForm.ts
@@ -23,11 +23,10 @@ export class UserDeleteStageForm extends BaseStageForm<UserDeleteStage> {
                 stageUuid: this.instance.pk || "",
                 userDeleteStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesUserDeleteCreate({
-                userDeleteStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesUserDeleteCreate({
+            userDeleteStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/user_login/UserLoginStageForm.ts b/web/src/admin/stages/user_login/UserLoginStageForm.ts
index ec0ddd4028..f30122a2a5 100644
--- a/web/src/admin/stages/user_login/UserLoginStageForm.ts
+++ b/web/src/admin/stages/user_login/UserLoginStageForm.ts
@@ -25,11 +25,10 @@ export class UserLoginStageForm extends BaseStageForm<UserLoginStage> {
                 stageUuid: this.instance.pk || "",
                 userLoginStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesUserLoginCreate({
-                userLoginStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesUserLoginCreate({
+            userLoginStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/user_logout/UserLogoutStageForm.ts b/web/src/admin/stages/user_logout/UserLogoutStageForm.ts
index 139f2fffb7..cb3d349894 100644
--- a/web/src/admin/stages/user_logout/UserLogoutStageForm.ts
+++ b/web/src/admin/stages/user_logout/UserLogoutStageForm.ts
@@ -23,11 +23,10 @@ export class UserLogoutStageForm extends BaseStageForm<UserLogoutStage> {
                 stageUuid: this.instance.pk || "",
                 userLogoutStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesUserLogoutCreate({
-                userLogoutStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesUserLogoutCreate({
+            userLogoutStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/stages/user_write/UserWriteStageForm.ts b/web/src/admin/stages/user_write/UserWriteStageForm.ts
index 9d6c6346f4..00a2afe471 100644
--- a/web/src/admin/stages/user_write/UserWriteStageForm.ts
+++ b/web/src/admin/stages/user_write/UserWriteStageForm.ts
@@ -34,11 +34,10 @@ export class UserWriteStageForm extends BaseStageForm<UserWriteStage> {
                 stageUuid: this.instance.pk || "",
                 userWriteStageRequest: data,
             });
-        } else {
-            return new StagesApi(DEFAULT_CONFIG).stagesUserWriteCreate({
-                userWriteStageRequest: data,
-            });
         }
+        return new StagesApi(DEFAULT_CONFIG).stagesUserWriteCreate({
+            userWriteStageRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {
diff --git a/web/src/admin/tokens/TokenForm.ts b/web/src/admin/tokens/TokenForm.ts
index 2d2a08d7ec..696061e18f 100644
--- a/web/src/admin/tokens/TokenForm.ts
+++ b/web/src/admin/tokens/TokenForm.ts
@@ -37,11 +37,10 @@ export class TokenForm extends ModelForm<Token, string> {
                 identifier: this.instance.identifier,
                 tokenRequest: data,
             });
-        } else {
-            return new CoreApi(DEFAULT_CONFIG).coreTokensCreate({
-                tokenRequest: data,
-            });
         }
+        return new CoreApi(DEFAULT_CONFIG).coreTokensCreate({
+            tokenRequest: data,
+        });
     }
 
     renderExpiry(): TemplateResult {
diff --git a/web/src/admin/users/UserForm.ts b/web/src/admin/users/UserForm.ts
index cdc2cf3b4e..d47c313942 100644
--- a/web/src/admin/users/UserForm.ts
+++ b/web/src/admin/users/UserForm.ts
@@ -46,12 +46,11 @@ 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.");
         }
+        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> {
diff --git a/web/src/elements/TreeView.ts b/web/src/elements/TreeView.ts
index 60c0645e88..203a6abc33 100644
--- a/web/src/elements/TreeView.ts
+++ b/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 {
diff --git a/web/src/user/user-settings/tokens/UserTokenForm.ts b/web/src/user/user-settings/tokens/UserTokenForm.ts
index b200199c89..6fcb48d4aa 100644
--- a/web/src/user/user-settings/tokens/UserTokenForm.ts
+++ b/web/src/user/user-settings/tokens/UserTokenForm.ts
@@ -34,12 +34,11 @@ 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,
-            });
         }
+        data.intent = this.intent;
+        return new CoreApi(DEFAULT_CONFIG).coreTokensCreate({
+            tokenRequest: data,
+        });
     }
 
     renderForm(): TemplateResult {