From fef841a458b3847464584aaaac090d5b6a03af82 Mon Sep 17 00:00:00 2001
From: Jens L <jens@goauthentik.io>
Date: Sun, 30 Apr 2023 19:55:29 +0300
Subject: [PATCH] web/admin: always override send method instead of assigning
 (#5426)

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
---
 .../applications/ApplicationCheckAccessForm.ts    |  4 ++--
 web/src/admin/applications/ApplicationForm.ts     |  4 ++--
 web/src/admin/blueprints/BlueprintForm.ts         |  4 ++--
 web/src/admin/crypto/CertificateGenerateForm.ts   |  4 ++--
 web/src/admin/crypto/CertificateKeyPairForm.ts    |  4 ++--
 web/src/admin/events/RuleForm.ts                  |  4 ++--
 web/src/admin/events/TransportForm.ts             |  4 ++--
 web/src/admin/flows/FlowForm.ts                   |  4 ++--
 web/src/admin/flows/FlowImportForm.ts             |  4 ++--
 web/src/admin/groups/GroupForm.ts                 |  4 ++--
 web/src/admin/outposts/OutpostForm.ts             |  4 ++--
 .../admin/outposts/ServiceConnectionDockerForm.ts |  4 ++--
 .../outposts/ServiceConnectionKubernetesForm.ts   |  4 ++--
 web/src/admin/policies/PolicyTestForm.ts          |  4 ++--
 web/src/admin/policies/dummy/DummyPolicyForm.ts   |  4 ++--
 .../event_matcher/EventMatcherPolicyForm.ts       |  4 ++--
 web/src/admin/policies/expiry/ExpiryPolicyForm.ts |  4 ++--
 .../policies/expression/ExpressionPolicyForm.ts   |  4 ++--
 .../admin/policies/password/PasswordPolicyForm.ts |  4 ++--
 .../policies/reputation/ReputationPolicyForm.ts   |  4 ++--
 .../property-mappings/PropertyMappingLDAPForm.ts  |  4 ++--
 .../PropertyMappingNotification.ts                |  4 ++--
 .../property-mappings/PropertyMappingSAMLForm.ts  |  4 ++--
 .../property-mappings/PropertyMappingSCIMForm.ts  |  4 ++--
 .../property-mappings/PropertyMappingScopeForm.ts |  4 ++--
 .../property-mappings/PropertyMappingTestForm.ts  |  4 ++--
 web/src/admin/providers/ldap/LDAPProviderForm.ts  |  4 ++--
 .../admin/providers/oauth2/OAuth2ProviderForm.ts  |  4 ++--
 .../admin/providers/proxy/ProxyProviderForm.ts    |  4 ++--
 .../admin/providers/radius/RadiusProviderForm.ts  |  4 ++--
 web/src/admin/providers/saml/SAMLProviderForm.ts  |  4 ++--
 .../providers/saml/SAMLProviderImportForm.ts      |  4 ++--
 web/src/admin/providers/scim/SCIMProviderForm.ts  |  4 ++--
 web/src/admin/sources/ldap/LDAPSourceForm.ts      |  4 ++--
 web/src/admin/sources/oauth/OAuthSourceForm.ts    |  4 ++--
 web/src/admin/sources/plex/PlexSourceForm.ts      |  4 ++--
 web/src/admin/sources/saml/SAMLSourceForm.ts      |  4 ++--
 .../AuthenticatorDuoStageForm.ts                  |  4 ++--
 .../authenticator_duo/DuoDeviceImportForm.ts      |  4 ++--
 .../AuthenticatorSMSStageForm.ts                  |  4 ++--
 .../AuthenticatorStaticStageForm.ts               |  4 ++--
 .../AuthenticatorTOTPStageForm.ts                 |  4 ++--
 .../AuthenticatorValidateStageForm.ts             |  4 ++--
 .../AuthenticateWebAuthnStageForm.ts              |  4 ++--
 web/src/admin/stages/captcha/CaptchaStageForm.ts  |  4 ++--
 web/src/admin/stages/consent/ConsentStageForm.ts  |  4 ++--
 web/src/admin/stages/deny/DenyStageForm.ts        |  4 ++--
 web/src/admin/stages/dummy/DummyStageForm.ts      |  4 ++--
 web/src/admin/stages/email/EmailStageForm.ts      |  4 ++--
 .../identification/IdentificationStageForm.ts     |  4 ++--
 web/src/admin/stages/invitation/InvitationForm.ts |  4 ++--
 .../stages/invitation/InvitationStageForm.ts      |  4 ++--
 .../admin/stages/password/PasswordStageForm.ts    |  4 ++--
 web/src/admin/stages/prompt/PromptStageForm.ts    |  4 ++--
 .../stages/user_delete/UserDeleteStageForm.ts     |  4 ++--
 .../admin/stages/user_login/UserLoginStageForm.ts |  4 ++--
 .../stages/user_logout/UserLogoutStageForm.ts     |  4 ++--
 .../admin/stages/user_write/UserWriteStageForm.ts |  4 ++--
 web/src/admin/tenants/TenantForm.ts               |  4 ++--
 web/src/admin/tokens/TokenForm.ts                 |  4 ++--
 web/src/admin/users/ServiceAccountForm.ts         |  4 ++--
 web/src/admin/users/UserForm.ts                   |  4 ++--
 web/src/admin/users/UserPasswordForm.ts           |  4 ++--
 web/src/admin/users/UserResetEmailForm.ts         |  4 ++--
 web/src/user/user-settings/mfa/MFADeviceForm.ts   | 15 +++++++--------
 .../user/user-settings/tokens/UserTokenForm.ts    |  4 ++--
 66 files changed, 137 insertions(+), 138 deletions(-)

diff --git a/web/src/admin/applications/ApplicationCheckAccessForm.ts b/web/src/admin/applications/ApplicationCheckAccessForm.ts
index ea5f6937c..7d74e8e8f 100644
--- a/web/src/admin/applications/ApplicationCheckAccessForm.ts
+++ b/web/src/admin/applications/ApplicationCheckAccessForm.ts
@@ -34,14 +34,14 @@ export class ApplicationCheckAccessForm extends Form<{ forUser: number }> {
         return t`Successfully sent test-request.`;
     }
 
-    send = async (data: { forUser: number }): Promise<PolicyTestResult> => {
+    async send(data: { forUser: number }): Promise<PolicyTestResult> {
         this.request = data.forUser;
         const result = await new CoreApi(DEFAULT_CONFIG).coreApplicationsCheckAccessRetrieve({
             slug: this.application?.slug,
             forUser: data.forUser,
         });
         return (this.result = result);
-    };
+    }
 
     resetForm(): void {
         super.resetForm();
diff --git a/web/src/admin/applications/ApplicationForm.ts b/web/src/admin/applications/ApplicationForm.ts
index e10d7d75c..268cc504b 100644
--- a/web/src/admin/applications/ApplicationForm.ts
+++ b/web/src/admin/applications/ApplicationForm.ts
@@ -49,7 +49,7 @@ export class ApplicationForm extends ModelForm<Application, string> {
         }
     }
 
-    send = async (data: Application): Promise<Application | void> => {
+    async send(data: Application): Promise<Application | void> {
         let app: Application;
         if (this.instance) {
             app = await new CoreApi(DEFAULT_CONFIG).coreApplicationsUpdate({
@@ -80,7 +80,7 @@ export class ApplicationForm extends ModelForm<Application, string> {
             });
         }
         return app;
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/blueprints/BlueprintForm.ts b/web/src/admin/blueprints/BlueprintForm.ts
index 21508d623..a9f16eea4 100644
--- a/web/src/admin/blueprints/BlueprintForm.ts
+++ b/web/src/admin/blueprints/BlueprintForm.ts
@@ -63,7 +63,7 @@ export class BlueprintForm extends ModelForm<BlueprintInstance, string> {
         );
     }
 
-    send = (data: BlueprintInstance): Promise<BlueprintInstance> => {
+    async send(data: BlueprintInstance): Promise<BlueprintInstance> {
         if (this.instance?.pk) {
             return new ManagedApi(DEFAULT_CONFIG).managedBlueprintsUpdate({
                 instanceUuid: this.instance.pk,
@@ -74,7 +74,7 @@ export class BlueprintForm extends ModelForm<BlueprintInstance, string> {
                 blueprintInstanceRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/crypto/CertificateGenerateForm.ts b/web/src/admin/crypto/CertificateGenerateForm.ts
index 7ccf46f29..2a7bd69aa 100644
--- a/web/src/admin/crypto/CertificateGenerateForm.ts
+++ b/web/src/admin/crypto/CertificateGenerateForm.ts
@@ -15,11 +15,11 @@ export class CertificateKeyPairForm extends Form<CertificateGenerationRequest> {
         return t`Successfully generated certificate-key pair.`;
     }
 
-    send = (data: CertificateGenerationRequest): Promise<CertificateKeyPair> => {
+    async send(data: CertificateGenerationRequest): Promise<CertificateKeyPair> {
         return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsGenerateCreate({
             certificateGenerationRequest: data,
         });
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/crypto/CertificateKeyPairForm.ts b/web/src/admin/crypto/CertificateKeyPairForm.ts
index b598562e5..26a7928c3 100644
--- a/web/src/admin/crypto/CertificateKeyPairForm.ts
+++ b/web/src/admin/crypto/CertificateKeyPairForm.ts
@@ -27,7 +27,7 @@ export class CertificateKeyPairForm extends ModelForm<CertificateKeyPair, string
         }
     }
 
-    send = (data: CertificateKeyPair): Promise<CertificateKeyPair> => {
+    async send(data: CertificateKeyPair): Promise<CertificateKeyPair> {
         if (this.instance) {
             return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsPartialUpdate({
                 kpUuid: this.instance.pk || "",
@@ -38,7 +38,7 @@ export class CertificateKeyPairForm extends ModelForm<CertificateKeyPair, string
                 certificateKeyPairRequest: data as unknown as CertificateKeyPairRequest,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/events/RuleForm.ts b/web/src/admin/events/RuleForm.ts
index 50bd501b3..4f0c35888 100644
--- a/web/src/admin/events/RuleForm.ts
+++ b/web/src/admin/events/RuleForm.ts
@@ -44,7 +44,7 @@ export class RuleForm extends ModelForm<NotificationRule, string> {
         }
     }
 
-    send = (data: NotificationRule): Promise<NotificationRule> => {
+    async send(data: NotificationRule): Promise<NotificationRule> {
         if (this.instance) {
             return new EventsApi(DEFAULT_CONFIG).eventsRulesUpdate({
                 pbmUuid: this.instance.pk || "",
@@ -55,7 +55,7 @@ export class RuleForm extends ModelForm<NotificationRule, string> {
                 notificationRuleRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/events/TransportForm.ts b/web/src/admin/events/TransportForm.ts
index 2080b127c..614f5dcdd 100644
--- a/web/src/admin/events/TransportForm.ts
+++ b/web/src/admin/events/TransportForm.ts
@@ -44,7 +44,7 @@ export class TransportForm extends ModelForm<NotificationTransport, string> {
         }
     }
 
-    send = (data: NotificationTransport): Promise<NotificationTransport> => {
+    async send(data: NotificationTransport): Promise<NotificationTransport> {
         if (this.instance) {
             return new EventsApi(DEFAULT_CONFIG).eventsTransportsUpdate({
                 uuid: this.instance.pk || "",
@@ -55,7 +55,7 @@ export class TransportForm extends ModelForm<NotificationTransport, string> {
                 notificationTransportRequest: data,
             });
         }
-    };
+    }
 
     onModeChange(mode: string | undefined): void {
         if (
diff --git a/web/src/admin/flows/FlowForm.ts b/web/src/admin/flows/FlowForm.ts
index 4d626b2b6..56e417c84 100644
--- a/web/src/admin/flows/FlowForm.ts
+++ b/web/src/admin/flows/FlowForm.ts
@@ -45,7 +45,7 @@ export class FlowForm extends ModelForm<Flow, string> {
     @property({ type: Boolean })
     clearBackground = false;
 
-    send = async (data: Flow): Promise<void | Flow> => {
+    async send(data: Flow): Promise<void | Flow> {
         let flow: Flow;
         if (this.instance) {
             flow = await new FlowsApi(DEFAULT_CONFIG).flowsInstancesUpdate({
@@ -76,7 +76,7 @@ export class FlowForm extends ModelForm<Flow, string> {
             });
         }
         return flow;
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/flows/FlowImportForm.ts b/web/src/admin/flows/FlowImportForm.ts
index 8f576abbf..099ac8632 100644
--- a/web/src/admin/flows/FlowImportForm.ts
+++ b/web/src/admin/flows/FlowImportForm.ts
@@ -26,7 +26,7 @@ export class FlowImportForm extends Form<Flow> {
         return super.styles.concat(PFDescriptionList);
     }
 
-    send = async (): Promise<FlowImportResult> => {
+    async send(): Promise<FlowImportResult> {
         const file = this.getFormFiles()["flow"];
         if (!file) {
             throw new SentryIgnoredError("No form data");
@@ -39,7 +39,7 @@ export class FlowImportForm extends Form<Flow> {
             throw new SentryIgnoredError("Failed to import flow");
         }
         return result;
-    };
+    }
 
     renderResult(): TemplateResult {
         return html`
diff --git a/web/src/admin/groups/GroupForm.ts b/web/src/admin/groups/GroupForm.ts
index 9ceb6c6cc..c7ea57816 100644
--- a/web/src/admin/groups/GroupForm.ts
+++ b/web/src/admin/groups/GroupForm.ts
@@ -44,7 +44,7 @@ export class GroupForm extends ModelForm<Group, string> {
         }
     }
 
-    send = (data: Group): Promise<Group> => {
+    async send(data: Group): Promise<Group> {
         if (this.instance?.pk) {
             return new CoreApi(DEFAULT_CONFIG).coreGroupsPartialUpdate({
                 groupUuid: this.instance.pk,
@@ -56,7 +56,7 @@ export class GroupForm extends ModelForm<Group, string> {
                 groupRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/outposts/OutpostForm.ts b/web/src/admin/outposts/OutpostForm.ts
index f93627df6..9a845a49f 100644
--- a/web/src/admin/outposts/OutpostForm.ts
+++ b/web/src/admin/outposts/OutpostForm.ts
@@ -86,7 +86,7 @@ export class OutpostForm extends ModelForm<Outpost, string> {
         }
     }
 
-    send = (data: Outpost): Promise<Outpost> => {
+    async send(data: Outpost): Promise<Outpost> {
         if (this.instance) {
             return new OutpostsApi(DEFAULT_CONFIG).outpostsInstancesUpdate({
                 uuid: this.instance.pk || "",
@@ -97,7 +97,7 @@ export class OutpostForm extends ModelForm<Outpost, string> {
                 outpostRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/outposts/ServiceConnectionDockerForm.ts b/web/src/admin/outposts/ServiceConnectionDockerForm.ts
index 0a023c58c..93a1ba481 100644
--- a/web/src/admin/outposts/ServiceConnectionDockerForm.ts
+++ b/web/src/admin/outposts/ServiceConnectionDockerForm.ts
@@ -34,7 +34,7 @@ export class ServiceConnectionDockerForm extends ModelForm<DockerServiceConnecti
         }
     }
 
-    send = (data: DockerServiceConnection): Promise<DockerServiceConnection> => {
+    async send(data: DockerServiceConnection): Promise<DockerServiceConnection> {
         if (this.instance) {
             return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsDockerUpdate({
                 uuid: this.instance.pk || "",
@@ -45,7 +45,7 @@ export class ServiceConnectionDockerForm extends ModelForm<DockerServiceConnecti
                 dockerServiceConnectionRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts b/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts
index 60063f546..21e8a5551 100644
--- a/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts
+++ b/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts
@@ -32,7 +32,7 @@ export class ServiceConnectionKubernetesForm extends ModelForm<
         }
     }
 
-    send = (data: KubernetesServiceConnection): Promise<KubernetesServiceConnection> => {
+    async send(data: KubernetesServiceConnection): Promise<KubernetesServiceConnection> {
         if (this.instance) {
             return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsKubernetesUpdate({
                 uuid: this.instance.pk || "",
@@ -43,7 +43,7 @@ export class ServiceConnectionKubernetesForm extends ModelForm<
                 kubernetesServiceConnectionRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/policies/PolicyTestForm.ts b/web/src/admin/policies/PolicyTestForm.ts
index 9549a6389..75e47e1e5 100644
--- a/web/src/admin/policies/PolicyTestForm.ts
+++ b/web/src/admin/policies/PolicyTestForm.ts
@@ -39,14 +39,14 @@ export class PolicyTestForm extends Form<PolicyTestRequest> {
         return t`Successfully sent test-request.`;
     }
 
-    send = async (data: PolicyTestRequest): Promise<PolicyTestResult> => {
+    async send(data: PolicyTestRequest): Promise<PolicyTestResult> {
         this.request = data;
         const result = await new PoliciesApi(DEFAULT_CONFIG).policiesAllTestCreate({
             policyUuid: this.policy?.pk || "",
             policyTestRequest: data,
         });
         return (this.result = result);
-    };
+    }
 
     static get styles(): CSSResult[] {
         return super.styles.concat(PFDescriptionList);
diff --git a/web/src/admin/policies/dummy/DummyPolicyForm.ts b/web/src/admin/policies/dummy/DummyPolicyForm.ts
index ef81d8e55..6f42a25a3 100644
--- a/web/src/admin/policies/dummy/DummyPolicyForm.ts
+++ b/web/src/admin/policies/dummy/DummyPolicyForm.ts
@@ -28,7 +28,7 @@ export class DummyPolicyForm extends ModelForm<DummyPolicy, string> {
         }
     }
 
-    send = (data: DummyPolicy): Promise<DummyPolicy> => {
+    async send(data: DummyPolicy): Promise<DummyPolicy> {
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesDummyUpdate({
                 policyUuid: this.instance.pk || "",
@@ -39,7 +39,7 @@ export class DummyPolicyForm extends ModelForm<DummyPolicy, string> {
                 dummyPolicyRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts b/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts
index cb42a789b..16da71901 100644
--- a/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts
+++ b/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts
@@ -42,7 +42,7 @@ export class EventMatcherPolicyForm extends ModelForm<EventMatcherPolicy, string
         }
     }
 
-    send = (data: EventMatcherPolicy): Promise<EventMatcherPolicy> => {
+    async send(data: EventMatcherPolicy): Promise<EventMatcherPolicy> {
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesEventMatcherUpdate({
                 policyUuid: this.instance.pk || "",
@@ -53,7 +53,7 @@ export class EventMatcherPolicyForm extends ModelForm<EventMatcherPolicy, string
                 eventMatcherPolicyRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/policies/expiry/ExpiryPolicyForm.ts b/web/src/admin/policies/expiry/ExpiryPolicyForm.ts
index 3238fb1ec..7ea3fff4b 100644
--- a/web/src/admin/policies/expiry/ExpiryPolicyForm.ts
+++ b/web/src/admin/policies/expiry/ExpiryPolicyForm.ts
@@ -28,7 +28,7 @@ export class PasswordExpiryPolicyForm extends ModelForm<PasswordExpiryPolicy, st
         }
     }
 
-    send = (data: PasswordExpiryPolicy): Promise<PasswordExpiryPolicy> => {
+    async send(data: PasswordExpiryPolicy): Promise<PasswordExpiryPolicy> {
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordExpiryUpdate({
                 policyUuid: this.instance.pk || "",
@@ -39,7 +39,7 @@ export class PasswordExpiryPolicyForm extends ModelForm<PasswordExpiryPolicy, st
                 passwordExpiryPolicyRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/policies/expression/ExpressionPolicyForm.ts b/web/src/admin/policies/expression/ExpressionPolicyForm.ts
index 45cdd0b94..80f20dc72 100644
--- a/web/src/admin/policies/expression/ExpressionPolicyForm.ts
+++ b/web/src/admin/policies/expression/ExpressionPolicyForm.ts
@@ -30,7 +30,7 @@ export class ExpressionPolicyForm extends ModelForm<ExpressionPolicy, string> {
         }
     }
 
-    send = (data: ExpressionPolicy): Promise<ExpressionPolicy> => {
+    async send(data: ExpressionPolicy): Promise<ExpressionPolicy> {
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesExpressionUpdate({
                 policyUuid: this.instance.pk || "",
@@ -41,7 +41,7 @@ export class ExpressionPolicyForm extends ModelForm<ExpressionPolicy, string> {
                 expressionPolicyRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/policies/password/PasswordPolicyForm.ts b/web/src/admin/policies/password/PasswordPolicyForm.ts
index cb37d706e..0f87d1005 100644
--- a/web/src/admin/policies/password/PasswordPolicyForm.ts
+++ b/web/src/admin/policies/password/PasswordPolicyForm.ts
@@ -44,7 +44,7 @@ export class PasswordPolicyForm extends ModelForm<PasswordPolicy, string> {
         }
     }
 
-    send = (data: PasswordPolicy): Promise<PasswordPolicy> => {
+    async send(data: PasswordPolicy): Promise<PasswordPolicy> {
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordUpdate({
                 policyUuid: this.instance.pk || "",
@@ -55,7 +55,7 @@ export class PasswordPolicyForm extends ModelForm<PasswordPolicy, string> {
                 passwordPolicyRequest: data,
             });
         }
-    };
+    }
 
     renderStaticRules(): TemplateResult {
         return html` <ak-form-group>
diff --git a/web/src/admin/policies/reputation/ReputationPolicyForm.ts b/web/src/admin/policies/reputation/ReputationPolicyForm.ts
index deaba070a..d12aa24e6 100644
--- a/web/src/admin/policies/reputation/ReputationPolicyForm.ts
+++ b/web/src/admin/policies/reputation/ReputationPolicyForm.ts
@@ -28,7 +28,7 @@ export class ReputationPolicyForm extends ModelForm<ReputationPolicy, string> {
         }
     }
 
-    send = (data: ReputationPolicy): Promise<ReputationPolicy> => {
+    async send(data: ReputationPolicy): Promise<ReputationPolicy> {
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesReputationUpdate({
                 policyUuid: this.instance.pk || "",
@@ -39,7 +39,7 @@ export class ReputationPolicyForm extends ModelForm<ReputationPolicy, string> {
                 reputationPolicyRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts b/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts
index 947a4b6e1..cd2ca42eb 100644
--- a/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts
@@ -28,7 +28,7 @@ export class PropertyMappingLDAPForm extends ModelForm<LDAPPropertyMapping, stri
         }
     }
 
-    send = (data: LDAPPropertyMapping): Promise<LDAPPropertyMapping> => {
+    async send(data: LDAPPropertyMapping): Promise<LDAPPropertyMapping> {
         if (this.instance) {
             return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsLdapUpdate({
                 pmUuid: this.instance.pk || "",
@@ -39,7 +39,7 @@ export class PropertyMappingLDAPForm extends ModelForm<LDAPPropertyMapping, stri
                 lDAPPropertyMappingRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/property-mappings/PropertyMappingNotification.ts b/web/src/admin/property-mappings/PropertyMappingNotification.ts
index d6426e18a..ba1c971d5 100644
--- a/web/src/admin/property-mappings/PropertyMappingNotification.ts
+++ b/web/src/admin/property-mappings/PropertyMappingNotification.ts
@@ -28,7 +28,7 @@ export class PropertyMappingNotification extends ModelForm<NotificationWebhookMa
         }
     }
 
-    send = (data: NotificationWebhookMapping): Promise<NotificationWebhookMapping> => {
+    async send(data: NotificationWebhookMapping): Promise<NotificationWebhookMapping> {
         if (this.instance) {
             return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsNotificationUpdate({
                 pmUuid: this.instance.pk || "",
@@ -39,7 +39,7 @@ export class PropertyMappingNotification extends ModelForm<NotificationWebhookMa
                 notificationWebhookMappingRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts b/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts
index 44367a8c6..ec0d5eea1 100644
--- a/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts
@@ -28,7 +28,7 @@ export class PropertyMappingSAMLForm extends ModelForm<SAMLPropertyMapping, stri
         }
     }
 
-    send = (data: SAMLPropertyMapping): Promise<SAMLPropertyMapping> => {
+    async send(data: SAMLPropertyMapping): Promise<SAMLPropertyMapping> {
         if (this.instance) {
             return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSamlUpdate({
                 pmUuid: this.instance.pk || "",
@@ -39,7 +39,7 @@ export class PropertyMappingSAMLForm extends ModelForm<SAMLPropertyMapping, stri
                 sAMLPropertyMappingRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/property-mappings/PropertyMappingSCIMForm.ts b/web/src/admin/property-mappings/PropertyMappingSCIMForm.ts
index 63d86d746..01b357507 100644
--- a/web/src/admin/property-mappings/PropertyMappingSCIMForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingSCIMForm.ts
@@ -28,7 +28,7 @@ export class PropertyMappingSCIMForm extends ModelForm<SCIMMapping, string> {
         }
     }
 
-    send = (data: SCIMMapping): Promise<SCIMMapping> => {
+    async send(data: SCIMMapping): Promise<SCIMMapping> {
         if (this.instance) {
             return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScimUpdate({
                 pmUuid: this.instance.pk || "",
@@ -39,7 +39,7 @@ export class PropertyMappingSCIMForm extends ModelForm<SCIMMapping, string> {
                 sCIMMappingRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/property-mappings/PropertyMappingScopeForm.ts b/web/src/admin/property-mappings/PropertyMappingScopeForm.ts
index 0e045abeb..69da06478 100644
--- a/web/src/admin/property-mappings/PropertyMappingScopeForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingScopeForm.ts
@@ -28,7 +28,7 @@ export class PropertyMappingScopeForm extends ModelForm<ScopeMapping, string> {
         }
     }
 
-    send = (data: ScopeMapping): Promise<ScopeMapping> => {
+    async send(data: ScopeMapping): Promise<ScopeMapping> {
         if (this.instance) {
             return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScopeUpdate({
                 pmUuid: this.instance.pk || "",
@@ -39,7 +39,7 @@ export class PropertyMappingScopeForm extends ModelForm<ScopeMapping, string> {
                 scopeMappingRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/property-mappings/PropertyMappingTestForm.ts b/web/src/admin/property-mappings/PropertyMappingTestForm.ts
index d0108e993..e76e93861 100644
--- a/web/src/admin/property-mappings/PropertyMappingTestForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingTestForm.ts
@@ -37,7 +37,7 @@ export class PolicyTestForm extends Form<PolicyTestRequest> {
         return t`Successfully sent test-request.`;
     }
 
-    send = async (data: PolicyTestRequest): Promise<PropertyMappingTestResult> => {
+    async send(data: PolicyTestRequest): Promise<PropertyMappingTestResult> {
         this.request = data;
         const result = await new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsAllTestCreate({
             pmUuid: this.mapping?.pk || "",
@@ -45,7 +45,7 @@ export class PolicyTestForm extends Form<PolicyTestRequest> {
             formatResult: true,
         });
         return (this.result = result);
-    };
+    }
 
     renderResult(): TemplateResult {
         return html`<ak-form-element-horizontal label=${t`Result`}>
diff --git a/web/src/admin/providers/ldap/LDAPProviderForm.ts b/web/src/admin/providers/ldap/LDAPProviderForm.ts
index 4806481d3..c07097f83 100644
--- a/web/src/admin/providers/ldap/LDAPProviderForm.ts
+++ b/web/src/admin/providers/ldap/LDAPProviderForm.ts
@@ -46,7 +46,7 @@ export class LDAPProviderFormPage extends ModelForm<LDAPProvider, number> {
         }
     }
 
-    send = (data: LDAPProvider): Promise<LDAPProvider> => {
+    async send(data: LDAPProvider): Promise<LDAPProvider> {
         if (this.instance) {
             return new ProvidersApi(DEFAULT_CONFIG).providersLdapUpdate({
                 id: this.instance.pk || 0,
@@ -58,7 +58,7 @@ export class LDAPProviderFormPage extends ModelForm<LDAPProvider, number> {
                 lDAPProviderRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts b/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts
index b925aa0ec..5a7cdd2a7 100644
--- a/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts
+++ b/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts
@@ -69,7 +69,7 @@ export class OAuth2ProviderFormPage extends ModelForm<OAuth2Provider, number> {
         }
     }
 
-    send = (data: OAuth2Provider): Promise<OAuth2Provider> => {
+    async send(data: OAuth2Provider): Promise<OAuth2Provider> {
         if (this.instance) {
             return new ProvidersApi(DEFAULT_CONFIG).providersOauth2Update({
                 id: this.instance.pk || 0,
@@ -80,7 +80,7 @@ export class OAuth2ProviderFormPage extends ModelForm<OAuth2Provider, number> {
                 oAuth2ProviderRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/providers/proxy/ProxyProviderForm.ts b/web/src/admin/providers/proxy/ProxyProviderForm.ts
index 58b4700fa..8ea42b93e 100644
--- a/web/src/admin/providers/proxy/ProxyProviderForm.ts
+++ b/web/src/admin/providers/proxy/ProxyProviderForm.ts
@@ -90,7 +90,7 @@ export class ProxyProviderFormPage extends ModelForm<ProxyProvider, number> {
         }
     }
 
-    send = (data: ProxyProvider): Promise<ProxyProvider> => {
+    async send(data: ProxyProvider): Promise<ProxyProvider> {
         data.mode = this.mode;
         if (this.mode !== ProxyMode.ForwardDomain) {
             data.cookieDomain = "";
@@ -105,7 +105,7 @@ export class ProxyProviderFormPage extends ModelForm<ProxyProvider, number> {
                 proxyProviderRequest: data,
             });
         }
-    };
+    }
 
     renderHttpBasic(): TemplateResult {
         return html`<ak-form-element-horizontal
diff --git a/web/src/admin/providers/radius/RadiusProviderForm.ts b/web/src/admin/providers/radius/RadiusProviderForm.ts
index 892f03ba5..6248722a6 100644
--- a/web/src/admin/providers/radius/RadiusProviderForm.ts
+++ b/web/src/admin/providers/radius/RadiusProviderForm.ts
@@ -38,7 +38,7 @@ export class RadiusProviderFormPage extends ModelForm<RadiusProvider, number> {
         }
     }
 
-    send = (data: RadiusProvider): Promise<RadiusProvider> => {
+    async send(data: RadiusProvider): Promise<RadiusProvider> {
         if (this.instance) {
             return new ProvidersApi(DEFAULT_CONFIG).providersRadiusUpdate({
                 id: this.instance.pk || 0,
@@ -49,7 +49,7 @@ export class RadiusProviderFormPage extends ModelForm<RadiusProvider, number> {
                 radiusProviderRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/providers/saml/SAMLProviderForm.ts b/web/src/admin/providers/saml/SAMLProviderForm.ts
index e0d7055ad..117fe653d 100644
--- a/web/src/admin/providers/saml/SAMLProviderForm.ts
+++ b/web/src/admin/providers/saml/SAMLProviderForm.ts
@@ -58,7 +58,7 @@ export class SAMLProviderFormPage extends ModelForm<SAMLProvider, number> {
         }
     }
 
-    send = (data: SAMLProvider): Promise<SAMLProvider> => {
+    async send(data: SAMLProvider): Promise<SAMLProvider> {
         if (this.instance) {
             return new ProvidersApi(DEFAULT_CONFIG).providersSamlUpdate({
                 id: this.instance.pk || 0,
@@ -69,7 +69,7 @@ export class SAMLProviderFormPage extends ModelForm<SAMLProvider, number> {
                 sAMLProviderRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/providers/saml/SAMLProviderImportForm.ts b/web/src/admin/providers/saml/SAMLProviderImportForm.ts
index 4b7c47791..5aa8b4dbd 100644
--- a/web/src/admin/providers/saml/SAMLProviderImportForm.ts
+++ b/web/src/admin/providers/saml/SAMLProviderImportForm.ts
@@ -25,7 +25,7 @@ export class SAMLProviderImportForm extends Form<SAMLProvider> {
         return t`Successfully imported provider.`;
     }
 
-    send = (data: SAMLProvider): Promise<void> => {
+    async send(data: SAMLProvider): Promise<void> {
         const file = this.getFormFiles()["metadata"];
         if (!file) {
             throw new SentryIgnoredError("No form data");
@@ -35,7 +35,7 @@ export class SAMLProviderImportForm extends Form<SAMLProvider> {
             name: data.name,
             authorizationFlow: data.authorizationFlow || "",
         });
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/providers/scim/SCIMProviderForm.ts b/web/src/admin/providers/scim/SCIMProviderForm.ts
index 3f7e4b66c..a9c45ee35 100644
--- a/web/src/admin/providers/scim/SCIMProviderForm.ts
+++ b/web/src/admin/providers/scim/SCIMProviderForm.ts
@@ -48,7 +48,7 @@ export class SCIMProviderFormPage extends ModelForm<SCIMProvider, number> {
         }
     }
 
-    send = (data: SCIMProvider): Promise<SCIMProvider> => {
+    async send(data: SCIMProvider): Promise<SCIMProvider> {
         if (this.instance) {
             return new ProvidersApi(DEFAULT_CONFIG).providersScimUpdate({
                 id: this.instance.pk || 0,
@@ -59,7 +59,7 @@ export class SCIMProviderFormPage extends ModelForm<SCIMProvider, number> {
                 sCIMProviderRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/sources/ldap/LDAPSourceForm.ts b/web/src/admin/sources/ldap/LDAPSourceForm.ts
index f8df6fde3..bf6e9b979 100644
--- a/web/src/admin/sources/ldap/LDAPSourceForm.ts
+++ b/web/src/admin/sources/ldap/LDAPSourceForm.ts
@@ -51,7 +51,7 @@ export class LDAPSourceForm extends ModelForm<LDAPSource, string> {
         }
     }
 
-    send = (data: LDAPSource): Promise<LDAPSource> => {
+    async send(data: LDAPSource): Promise<LDAPSource> {
         if (this.instance) {
             return new SourcesApi(DEFAULT_CONFIG).sourcesLdapPartialUpdate({
                 slug: this.instance.slug,
@@ -62,7 +62,7 @@ export class LDAPSourceForm extends ModelForm<LDAPSource, string> {
                 lDAPSourceRequest: data as unknown as LDAPSourceRequest,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/sources/oauth/OAuthSourceForm.ts b/web/src/admin/sources/oauth/OAuthSourceForm.ts
index a7f9c5e02..f2ed0aab7 100644
--- a/web/src/admin/sources/oauth/OAuthSourceForm.ts
+++ b/web/src/admin/sources/oauth/OAuthSourceForm.ts
@@ -71,7 +71,7 @@ export class OAuthSourceForm extends ModelForm<OAuthSource, string> {
         }
     }
 
-    send = async (data: OAuthSource): Promise<OAuthSource> => {
+    async send(data: OAuthSource): Promise<OAuthSource> {
         data.providerType = (this.providerType?.slug || "") as ProviderTypeEnum;
         let source: OAuthSource;
         if (this.instance) {
@@ -103,7 +103,7 @@ export class OAuthSourceForm extends ModelForm<OAuthSource, string> {
             });
         }
         return source;
-    };
+    }
 
     renderUrlOptions(): TemplateResult {
         if (!this.providerType?.urlsCustomizable) {
diff --git a/web/src/admin/sources/plex/PlexSourceForm.ts b/web/src/admin/sources/plex/PlexSourceForm.ts
index 51c78fb0e..d779857dd 100644
--- a/web/src/admin/sources/plex/PlexSourceForm.ts
+++ b/web/src/admin/sources/plex/PlexSourceForm.ts
@@ -61,7 +61,7 @@ export class PlexSourceForm extends ModelForm<PlexSource, string> {
         }
     }
 
-    send = async (data: PlexSource): Promise<PlexSource> => {
+    async send(data: PlexSource): Promise<PlexSource> {
         data.plexToken = this.plexToken || "";
         let source: PlexSource;
         if (this.instance?.pk) {
@@ -93,7 +93,7 @@ export class PlexSourceForm extends ModelForm<PlexSource, string> {
             });
         }
         return source;
-    };
+    }
 
     async doAuth(): Promise<void> {
         const authInfo = await PlexAPIClient.getPin(this.instance?.clientId || "");
diff --git a/web/src/admin/sources/saml/SAMLSourceForm.ts b/web/src/admin/sources/saml/SAMLSourceForm.ts
index 87a4e20b2..1f132060b 100644
--- a/web/src/admin/sources/saml/SAMLSourceForm.ts
+++ b/web/src/admin/sources/saml/SAMLSourceForm.ts
@@ -54,7 +54,7 @@ export class SAMLSourceForm extends ModelForm<SAMLSource, string> {
         }
     }
 
-    send = async (data: SAMLSource): Promise<SAMLSource> => {
+    async send(data: SAMLSource): Promise<SAMLSource> {
         let source: SAMLSource;
         if (this.instance) {
             source = await new SourcesApi(DEFAULT_CONFIG).sourcesSamlUpdate({
@@ -85,7 +85,7 @@ export class SAMLSourceForm extends ModelForm<SAMLSource, string> {
             });
         }
         return source;
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts b/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
index 01cf8fbad..9cb486606 100644
--- a/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
+++ b/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
@@ -37,7 +37,7 @@ export class AuthenticatorDuoStageForm extends ModelForm<AuthenticatorDuoStage,
         }
     }
 
-    send = (data: AuthenticatorDuoStage): Promise<AuthenticatorDuoStage> => {
+    async send(data: AuthenticatorDuoStage): Promise<AuthenticatorDuoStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorDuoPartialUpdate({
                 stageUuid: this.instance.pk || "",
@@ -48,7 +48,7 @@ export class AuthenticatorDuoStageForm extends ModelForm<AuthenticatorDuoStage,
                 authenticatorDuoStageRequest: data as unknown as AuthenticatorDuoStageRequest,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts b/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts
index 906ca1623..b8ab67b75 100644
--- a/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts
+++ b/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts
@@ -34,13 +34,13 @@ export class DuoDeviceImportForm extends ModelForm<AuthenticatorDuoStage, string
         return t`Successfully imported device.`;
     }
 
-    send = (data: AuthenticatorDuoStage): Promise<void> => {
+    async send(data: AuthenticatorDuoStage): Promise<void> {
         const importData = data as unknown as AuthenticatorDuoStageManualDeviceImportRequest;
         return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorDuoImportDeviceManualCreate({
             stageUuid: this.instance?.pk || "",
             authenticatorDuoStageManualDeviceImportRequest: importData,
         });
-    };
+    }
 
     renderForm(): TemplateResult {
         return html` <form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
index d50986c8c..aa8627dfc 100644
--- a/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
+++ b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
@@ -54,7 +54,7 @@ export class AuthenticatorSMSStageForm extends ModelForm<AuthenticatorSMSStage,
         }
     }
 
-    send = (data: AuthenticatorSMSStage): Promise<AuthenticatorSMSStage> => {
+    async send(data: AuthenticatorSMSStage): Promise<AuthenticatorSMSStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorSmsUpdate({
                 stageUuid: this.instance.pk || "",
@@ -65,7 +65,7 @@ export class AuthenticatorSMSStageForm extends ModelForm<AuthenticatorSMSStage,
                 authenticatorSMSStageRequest: data,
             });
         }
-    };
+    }
 
     renderProviderTwillio(): TemplateResult {
         return html` <ak-form-element-horizontal
diff --git a/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts b/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts
index 35fbef7e0..82dee52a9 100644
--- a/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts
+++ b/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts
@@ -35,7 +35,7 @@ export class AuthenticatorStaticStageForm extends ModelForm<AuthenticatorStaticS
         }
     }
 
-    send = (data: AuthenticatorStaticStage): Promise<AuthenticatorStaticStage> => {
+    async send(data: AuthenticatorStaticStage): Promise<AuthenticatorStaticStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorStaticUpdate({
                 stageUuid: this.instance.pk || "",
@@ -46,7 +46,7 @@ export class AuthenticatorStaticStageForm extends ModelForm<AuthenticatorStaticS
                 authenticatorStaticStageRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts b/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
index bf6347b73..49550399f 100644
--- a/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
+++ b/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
@@ -37,7 +37,7 @@ export class AuthenticatorTOTPStageForm extends ModelForm<AuthenticatorTOTPStage
         }
     }
 
-    send = (data: AuthenticatorTOTPStage): Promise<AuthenticatorTOTPStage> => {
+    async send(data: AuthenticatorTOTPStage): Promise<AuthenticatorTOTPStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorTotpUpdate({
                 stageUuid: this.instance.pk || "",
@@ -48,7 +48,7 @@ export class AuthenticatorTOTPStageForm extends ModelForm<AuthenticatorTOTPStage
                 authenticatorTOTPStageRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
index 776873079..478373b25 100644
--- a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
+++ b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
@@ -50,7 +50,7 @@ export class AuthenticatorValidateStageForm extends ModelForm<AuthenticatorValid
         }
     }
 
-    send = (data: AuthenticatorValidateStage): Promise<AuthenticatorValidateStage> => {
+    async send(data: AuthenticatorValidateStage): Promise<AuthenticatorValidateStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorValidateUpdate({
                 stageUuid: this.instance.pk || "",
@@ -61,7 +61,7 @@ export class AuthenticatorValidateStageForm extends ModelForm<AuthenticatorValid
                 authenticatorValidateStageRequest: data,
             });
         }
-    };
+    }
 
     isDeviceClassSelected(field: DeviceClassesEnum): boolean {
         return (
diff --git a/web/src/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts b/web/src/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
index e8b31b2f6..2d200b822 100644
--- a/web/src/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
+++ b/web/src/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
@@ -39,7 +39,7 @@ export class AuthenticateWebAuthnStageForm extends ModelForm<AuthenticateWebAuth
         }
     }
 
-    send = (data: AuthenticateWebAuthnStage): Promise<AuthenticateWebAuthnStage> => {
+    async send(data: AuthenticateWebAuthnStage): Promise<AuthenticateWebAuthnStage> {
         if (data.authenticatorAttachment?.toString() === "") {
             data.authenticatorAttachment = null;
         }
@@ -53,7 +53,7 @@ export class AuthenticateWebAuthnStageForm extends ModelForm<AuthenticateWebAuth
                 authenticateWebAuthnStageRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/captcha/CaptchaStageForm.ts b/web/src/admin/stages/captcha/CaptchaStageForm.ts
index d9625aa21..4e49557d7 100644
--- a/web/src/admin/stages/captcha/CaptchaStageForm.ts
+++ b/web/src/admin/stages/captcha/CaptchaStageForm.ts
@@ -27,7 +27,7 @@ export class CaptchaStageForm extends ModelForm<CaptchaStage, string> {
         }
     }
 
-    send = (data: CaptchaStage): Promise<CaptchaStage> => {
+    async send(data: CaptchaStage): Promise<CaptchaStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesCaptchaPartialUpdate({
                 stageUuid: this.instance.pk || "",
@@ -38,7 +38,7 @@ export class CaptchaStageForm extends ModelForm<CaptchaStage, string> {
                 captchaStageRequest: data as unknown as CaptchaStageRequest,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/consent/ConsentStageForm.ts b/web/src/admin/stages/consent/ConsentStageForm.ts
index 5cb8843da..d02d2b7d5 100644
--- a/web/src/admin/stages/consent/ConsentStageForm.ts
+++ b/web/src/admin/stages/consent/ConsentStageForm.ts
@@ -36,7 +36,7 @@ export class ConsentStageForm extends ModelForm<ConsentStage, string> {
         }
     }
 
-    send = (data: ConsentStage): Promise<ConsentStage> => {
+    async send(data: ConsentStage): Promise<ConsentStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesConsentUpdate({
                 stageUuid: this.instance.pk || "",
@@ -47,7 +47,7 @@ export class ConsentStageForm extends ModelForm<ConsentStage, string> {
                 consentStageRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/deny/DenyStageForm.ts b/web/src/admin/stages/deny/DenyStageForm.ts
index 74f64b9c2..bb294679a 100644
--- a/web/src/admin/stages/deny/DenyStageForm.ts
+++ b/web/src/admin/stages/deny/DenyStageForm.ts
@@ -26,7 +26,7 @@ export class DenyStageForm extends ModelForm<DenyStage, string> {
         }
     }
 
-    send = (data: DenyStage): Promise<DenyStage> => {
+    async send(data: DenyStage): Promise<DenyStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesDenyUpdate({
                 stageUuid: this.instance.pk || "",
@@ -37,7 +37,7 @@ export class DenyStageForm extends ModelForm<DenyStage, string> {
                 denyStageRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/dummy/DummyStageForm.ts b/web/src/admin/stages/dummy/DummyStageForm.ts
index 329efbf28..a5dfb4efb 100644
--- a/web/src/admin/stages/dummy/DummyStageForm.ts
+++ b/web/src/admin/stages/dummy/DummyStageForm.ts
@@ -27,7 +27,7 @@ export class DummyStageForm extends ModelForm<DummyStage, string> {
         }
     }
 
-    send = (data: DummyStage): Promise<DummyStage> => {
+    async send(data: DummyStage): Promise<DummyStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesDummyUpdate({
                 stageUuid: this.instance.pk || "",
@@ -38,7 +38,7 @@ export class DummyStageForm extends ModelForm<DummyStage, string> {
                 dummyStageRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/email/EmailStageForm.ts b/web/src/admin/stages/email/EmailStageForm.ts
index 8e30f9bb1..e874fd827 100644
--- a/web/src/admin/stages/email/EmailStageForm.ts
+++ b/web/src/admin/stages/email/EmailStageForm.ts
@@ -39,7 +39,7 @@ export class EmailStageForm extends ModelForm<EmailStage, string> {
         }
     }
 
-    send = (data: EmailStage): Promise<EmailStage> => {
+    async send(data: EmailStage): Promise<EmailStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesEmailPartialUpdate({
                 stageUuid: this.instance.pk || "",
@@ -50,7 +50,7 @@ export class EmailStageForm extends ModelForm<EmailStage, string> {
                 emailStageRequest: data,
             });
         }
-    };
+    }
 
     renderConnectionSettings(): TemplateResult {
         if (!this.showConnectionSettings) {
diff --git a/web/src/admin/stages/identification/IdentificationStageForm.ts b/web/src/admin/stages/identification/IdentificationStageForm.ts
index 9ab098c4f..ae4c76042 100644
--- a/web/src/admin/stages/identification/IdentificationStageForm.ts
+++ b/web/src/admin/stages/identification/IdentificationStageForm.ts
@@ -50,7 +50,7 @@ export class IdentificationStageForm extends ModelForm<IdentificationStage, stri
         }
     }
 
-    send = (data: IdentificationStage): Promise<IdentificationStage> => {
+    async send(data: IdentificationStage): Promise<IdentificationStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesIdentificationUpdate({
                 stageUuid: this.instance.pk || "",
@@ -61,7 +61,7 @@ export class IdentificationStageForm extends ModelForm<IdentificationStage, stri
                 identificationStageRequest: data,
             });
         }
-    };
+    }
 
     isUserFieldSelected(field: UserFieldsEnum): boolean {
         return (
diff --git a/web/src/admin/stages/invitation/InvitationForm.ts b/web/src/admin/stages/invitation/InvitationForm.ts
index cd24ec9fa..1539cdec2 100644
--- a/web/src/admin/stages/invitation/InvitationForm.ts
+++ b/web/src/admin/stages/invitation/InvitationForm.ts
@@ -37,7 +37,7 @@ export class InvitationForm extends ModelForm<Invitation, string> {
         }
     }
 
-    send = (data: Invitation): Promise<Invitation> => {
+    async send(data: Invitation): Promise<Invitation> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesInvitationInvitationsUpdate({
                 inviteUuid: this.instance.pk || "",
@@ -48,7 +48,7 @@ export class InvitationForm extends ModelForm<Invitation, string> {
                 invitationRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/invitation/InvitationStageForm.ts b/web/src/admin/stages/invitation/InvitationStageForm.ts
index a2267fdec..1ce1c85bd 100644
--- a/web/src/admin/stages/invitation/InvitationStageForm.ts
+++ b/web/src/admin/stages/invitation/InvitationStageForm.ts
@@ -27,7 +27,7 @@ export class InvitationStageForm extends ModelForm<InvitationStage, string> {
         }
     }
 
-    send = (data: InvitationStage): Promise<InvitationStage> => {
+    async send(data: InvitationStage): Promise<InvitationStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesInvitationStagesUpdate({
                 stageUuid: this.instance.pk || "",
@@ -38,7 +38,7 @@ export class InvitationStageForm extends ModelForm<InvitationStage, string> {
                 invitationStageRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/password/PasswordStageForm.ts b/web/src/admin/stages/password/PasswordStageForm.ts
index 8f548c5db..a9943ab0f 100644
--- a/web/src/admin/stages/password/PasswordStageForm.ts
+++ b/web/src/admin/stages/password/PasswordStageForm.ts
@@ -38,7 +38,7 @@ export class PasswordStageForm extends ModelForm<PasswordStage, string> {
         }
     }
 
-    send = (data: PasswordStage): Promise<PasswordStage> => {
+    async send(data: PasswordStage): Promise<PasswordStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesPasswordUpdate({
                 stageUuid: this.instance.pk || "",
@@ -49,7 +49,7 @@ export class PasswordStageForm extends ModelForm<PasswordStage, string> {
                 passwordStageRequest: data,
             });
         }
-    };
+    }
 
     isBackendSelected(field: BackendsEnum): boolean {
         if (!this.instance) {
diff --git a/web/src/admin/stages/prompt/PromptStageForm.ts b/web/src/admin/stages/prompt/PromptStageForm.ts
index dbf6d8ace..e8124a941 100644
--- a/web/src/admin/stages/prompt/PromptStageForm.ts
+++ b/web/src/admin/stages/prompt/PromptStageForm.ts
@@ -47,7 +47,7 @@ export class PromptStageForm extends ModelForm<PromptStage, string> {
         }
     }
 
-    send = (data: PromptStage): Promise<PromptStage> => {
+    async send(data: PromptStage): Promise<PromptStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesPromptStagesUpdate({
                 stageUuid: this.instance.pk || "",
@@ -58,7 +58,7 @@ export class PromptStageForm extends ModelForm<PromptStage, string> {
                 promptStageRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/user_delete/UserDeleteStageForm.ts b/web/src/admin/stages/user_delete/UserDeleteStageForm.ts
index ea4fe296f..078ff7eb8 100644
--- a/web/src/admin/stages/user_delete/UserDeleteStageForm.ts
+++ b/web/src/admin/stages/user_delete/UserDeleteStageForm.ts
@@ -26,7 +26,7 @@ export class UserDeleteStageForm extends ModelForm<UserDeleteStage, string> {
         }
     }
 
-    send = (data: UserDeleteStage): Promise<UserDeleteStage> => {
+    async send(data: UserDeleteStage): Promise<UserDeleteStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesUserDeleteUpdate({
                 stageUuid: this.instance.pk || "",
@@ -37,7 +37,7 @@ export class UserDeleteStageForm extends ModelForm<UserDeleteStage, string> {
                 userDeleteStageRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/user_login/UserLoginStageForm.ts b/web/src/admin/stages/user_login/UserLoginStageForm.ts
index e2837ce2f..5c4bc6ec3 100644
--- a/web/src/admin/stages/user_login/UserLoginStageForm.ts
+++ b/web/src/admin/stages/user_login/UserLoginStageForm.ts
@@ -29,7 +29,7 @@ export class UserLoginStageForm extends ModelForm<UserLoginStage, string> {
         }
     }
 
-    send = (data: UserLoginStage): Promise<UserLoginStage> => {
+    async send(data: UserLoginStage): Promise<UserLoginStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesUserLoginUpdate({
                 stageUuid: this.instance.pk || "",
@@ -40,7 +40,7 @@ export class UserLoginStageForm extends ModelForm<UserLoginStage, string> {
                 userLoginStageRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/user_logout/UserLogoutStageForm.ts b/web/src/admin/stages/user_logout/UserLogoutStageForm.ts
index 5403a0533..4ddb4f851 100644
--- a/web/src/admin/stages/user_logout/UserLogoutStageForm.ts
+++ b/web/src/admin/stages/user_logout/UserLogoutStageForm.ts
@@ -26,7 +26,7 @@ export class UserLogoutStageForm extends ModelForm<UserLogoutStage, string> {
         }
     }
 
-    send = (data: UserLogoutStage): Promise<UserLogoutStage> => {
+    async send(data: UserLogoutStage): Promise<UserLogoutStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesUserLogoutUpdate({
                 stageUuid: this.instance.pk || "",
@@ -37,7 +37,7 @@ export class UserLogoutStageForm extends ModelForm<UserLogoutStage, string> {
                 userLogoutStageRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/stages/user_write/UserWriteStageForm.ts b/web/src/admin/stages/user_write/UserWriteStageForm.ts
index 3ecc2d4d6..93f019496 100644
--- a/web/src/admin/stages/user_write/UserWriteStageForm.ts
+++ b/web/src/admin/stages/user_write/UserWriteStageForm.ts
@@ -31,7 +31,7 @@ export class UserWriteStageForm extends ModelForm<UserWriteStage, string> {
         }
     }
 
-    send = (data: UserWriteStage): Promise<UserWriteStage> => {
+    async send(data: UserWriteStage): Promise<UserWriteStage> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesUserWriteUpdate({
                 stageUuid: this.instance.pk || "",
@@ -42,7 +42,7 @@ export class UserWriteStageForm extends ModelForm<UserWriteStage, string> {
                 userWriteStageRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/tenants/TenantForm.ts b/web/src/admin/tenants/TenantForm.ts
index 34b58c685..22288fabd 100644
--- a/web/src/admin/tenants/TenantForm.ts
+++ b/web/src/admin/tenants/TenantForm.ts
@@ -42,7 +42,7 @@ export class TenantForm extends ModelForm<Tenant, string> {
         }
     }
 
-    send = (data: Tenant): Promise<Tenant> => {
+    async send(data: Tenant): Promise<Tenant> {
         if (this.instance?.tenantUuid) {
             return new CoreApi(DEFAULT_CONFIG).coreTenantsUpdate({
                 tenantUuid: this.instance.tenantUuid,
@@ -53,7 +53,7 @@ export class TenantForm extends ModelForm<Tenant, string> {
                 tenantRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/tokens/TokenForm.ts b/web/src/admin/tokens/TokenForm.ts
index 89ff304b8..d59c3cc61 100644
--- a/web/src/admin/tokens/TokenForm.ts
+++ b/web/src/admin/tokens/TokenForm.ts
@@ -29,7 +29,7 @@ export class TokenForm extends ModelForm<Token, string> {
         }
     }
 
-    send = (data: Token): Promise<Token> => {
+    async send(data: Token): Promise<Token> {
         if (this.instance?.identifier) {
             return new CoreApi(DEFAULT_CONFIG).coreTokensUpdate({
                 identifier: this.instance.identifier,
@@ -40,7 +40,7 @@ export class TokenForm extends ModelForm<Token, string> {
                 tokenRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/users/ServiceAccountForm.ts b/web/src/admin/users/ServiceAccountForm.ts
index 66af4be9b..4707af7f3 100644
--- a/web/src/admin/users/ServiceAccountForm.ts
+++ b/web/src/admin/users/ServiceAccountForm.ts
@@ -21,14 +21,14 @@ export class ServiceAccountForm extends Form<UserServiceAccountRequest> {
         return t`Successfully created user.`;
     }
 
-    send = async (data: UserServiceAccountRequest): Promise<UserServiceAccountResponse> => {
+    async send(data: UserServiceAccountRequest): Promise<UserServiceAccountResponse> {
         const result = await new CoreApi(DEFAULT_CONFIG).coreUsersServiceAccountCreate({
             userServiceAccountRequest: data,
         });
         this.result = result;
         (this.parentElement as ModalForm).showSubmitButton = false;
         return result;
-    };
+    }
 
     resetForm(): void {
         super.resetForm();
diff --git a/web/src/admin/users/UserForm.ts b/web/src/admin/users/UserForm.ts
index 46188dff9..b32b49c84 100644
--- a/web/src/admin/users/UserForm.ts
+++ b/web/src/admin/users/UserForm.ts
@@ -41,7 +41,7 @@ export class UserForm extends ModelForm<User, number> {
         }
     }
 
-    send = (data: User): Promise<User> => {
+    async send(data: User): Promise<User> {
         if (this.instance?.pk) {
             return new CoreApi(DEFAULT_CONFIG).coreUsersPartialUpdate({
                 id: this.instance.pk,
@@ -53,7 +53,7 @@ export class UserForm extends ModelForm<User, number> {
                 userRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/users/UserPasswordForm.ts b/web/src/admin/users/UserPasswordForm.ts
index b6de9eca0..b2429a6fd 100644
--- a/web/src/admin/users/UserPasswordForm.ts
+++ b/web/src/admin/users/UserPasswordForm.ts
@@ -19,12 +19,12 @@ export class UserPasswordForm extends Form<UserPasswordSetRequest> {
         return t`Successfully updated password.`;
     }
 
-    send = (data: UserPasswordSetRequest): Promise<void> => {
+    async send(data: UserPasswordSetRequest): Promise<void> {
         return new CoreApi(DEFAULT_CONFIG).coreUsersSetPasswordCreate({
             id: this.instancePk || 0,
             userPasswordSetRequest: data,
         });
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/admin/users/UserResetEmailForm.ts b/web/src/admin/users/UserResetEmailForm.ts
index e26d42738..123c440c8 100644
--- a/web/src/admin/users/UserResetEmailForm.ts
+++ b/web/src/admin/users/UserResetEmailForm.ts
@@ -27,10 +27,10 @@ export class UserResetEmailForm extends Form<CoreUsersRecoveryEmailRetrieveReque
         return t`Successfully sent email.`;
     }
 
-    send = (data: CoreUsersRecoveryEmailRetrieveRequest): Promise<void> => {
+    async send(data: CoreUsersRecoveryEmailRetrieveRequest): Promise<void> {
         data.id = this.user.pk;
         return new CoreApi(DEFAULT_CONFIG).coreUsersRecoveryEmailRetrieve(data);
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/user/user-settings/mfa/MFADeviceForm.ts b/web/src/user/user-settings/mfa/MFADeviceForm.ts
index c3dfdc6bc..71ba52592 100644
--- a/web/src/user/user-settings/mfa/MFADeviceForm.ts
+++ b/web/src/user/user-settings/mfa/MFADeviceForm.ts
@@ -15,19 +15,18 @@ export class MFADeviceForm extends ModelForm<Device, number> {
     @property()
     deviceType!: string;
 
-    loadInstance(pk: number): Promise<Device> {
-        return new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsAllList().then((devices) => {
-            return devices.filter((device) => {
-                return device.pk === pk && device.type === this.deviceType;
-            })[0];
-        });
+    async loadInstance(pk: number): Promise<Device> {
+        const devices = await new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsAllList();
+        return devices.filter((device) => {
+            return device.pk === pk && device.type === this.deviceType;
+        })[0];
     }
 
     getSuccessMessage(): string {
         return t`Successfully updated device.`;
     }
 
-    send = async (device: Device): Promise<Device> => {
+    async send(device: Device): Promise<Device> {
         switch (this.instance?.type) {
             case "authentik_stages_authenticator_duo.DuoDevice":
                 await new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsDuoUpdate({
@@ -63,7 +62,7 @@ export class MFADeviceForm extends ModelForm<Device, number> {
                 break;
         }
         return device;
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/user/user-settings/tokens/UserTokenForm.ts b/web/src/user/user-settings/tokens/UserTokenForm.ts
index 57fadf349..a8614b7d2 100644
--- a/web/src/user/user-settings/tokens/UserTokenForm.ts
+++ b/web/src/user/user-settings/tokens/UserTokenForm.ts
@@ -29,7 +29,7 @@ export class UserTokenForm extends ModelForm<Token, string> {
         }
     }
 
-    send = (data: Token): Promise<Token> => {
+    async send(data: Token): Promise<Token> {
         if (this.instance) {
             return new CoreApi(DEFAULT_CONFIG).coreTokensUpdate({
                 identifier: this.instance.identifier,
@@ -41,7 +41,7 @@ export class UserTokenForm extends ModelForm<Token, string> {
                 tokenRequest: data,
             });
         }
-    };
+    }
 
     renderForm(): TemplateResult {
         return html`<form class="pf-c-form pf-m-horizontal">