diff --git a/web/src/pages/users/settings/BaseUserSettings.ts b/web/src/pages/users/settings/BaseUserSettings.ts
index a4c6d5b5f2..5fbd68a996 100644
--- a/web/src/pages/users/settings/BaseUserSettings.ts
+++ b/web/src/pages/users/settings/BaseUserSettings.ts
@@ -3,6 +3,8 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
import PFCard from "@patternfly/patternfly/components/Card/card.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css";
import AKGlobal from "../../../authentik.css";
+import PFForm from "@patternfly/patternfly/components/Form/form.css";
+import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
export abstract class BaseUserSettings extends LitElement {
@@ -10,7 +12,7 @@ export abstract class BaseUserSettings extends LitElement {
objectId!: string;
static get styles(): CSSResult[] {
- return [PFBase, PFCard, PFButton, AKGlobal];
+ return [PFBase, PFCard, PFButton, PFForm, PFFormControl, AKGlobal];
}
}
diff --git a/web/src/pages/users/settings/UserSettingsAuthenticatorWebAuthn.ts b/web/src/pages/users/settings/UserSettingsAuthenticatorWebAuthn.ts
new file mode 100644
index 0000000000..3cc5c5e04b
--- /dev/null
+++ b/web/src/pages/users/settings/UserSettingsAuthenticatorWebAuthn.ts
@@ -0,0 +1,111 @@
+import { CSSResult, customElement, html, TemplateResult } from "lit-element";
+import { gettext } from "django";
+import { AuthenticatorsApi, StagesApi, WebAuthnDevice } from "authentik-api";
+import { until } from "lit-html/directives/until";
+import { FlowURLManager } from "../../../api/legacy";
+import { DEFAULT_CONFIG } from "../../../api/Config";
+import { BaseUserSettings } from "./BaseUserSettings";
+import PFDataList from "@patternfly/patternfly/components/DataList/data-list.css";
+import "../../../elements/buttons/ModalButton";
+import "../../../elements/buttons/SpinnerButton";
+import "../../../elements/forms/DeleteForm";
+import "../../../elements/forms/Form";
+import "../../../elements/forms/ModalForm";
+import "../../../elements/forms/HorizontalFormElement";
+import { ifDefined } from "lit-html/directives/if-defined";
+
+@customElement("ak-user-settings-authenticator-webauthn")
+export class UserSettingsAuthenticatorWebAuthn extends BaseUserSettings {
+
+ static get styles(): CSSResult[] {
+ return super.styles.concat(PFDataList);
+ }
+
+ renderDelete(device: WebAuthnDevice): TemplateResult {
+ return html`
{
+ return new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsWebauthnDelete({
+ id: device.pk || 0
+ });
+ }}>
+
+ `;
+ }
+
+ renderUpdate(device: WebAuthnDevice): TemplateResult {
+ return html`
+
+ ${gettext("Update")}
+
+
+ ${gettext("Update")}
+
+ {
+ return new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsWebauthnUpdate({
+ id: device.pk || 0,
+ data: data as WebAuthnDevice
+ });
+ }}>
+
+
+
+ `;
+ }
+
+ render(): TemplateResult {
+ return html`
+
+ ${gettext("WebAuthn Devices")}
+
+
+
+ ${until(new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsWebauthnList({}).then((devices) => {
+ return devices.results.map((device) => {
+ return html`-
+
+
+
${device.name || "-"}
+
+ ${gettext(`Created ${device.createdOn?.toLocaleString()}`)}
+
+
+ ${this.renderUpdate(device)}
+ ${this.renderDelete(device)}
+
+
+
`;
+ });
+ }))}
+
+
+
+
`;
+ }
+
+}
diff --git a/web/src/pages/users/settings/UserSettingsAuthenticatorWebAuthnDevices.ts b/web/src/pages/users/settings/UserSettingsAuthenticatorWebAuthnDevices.ts
deleted file mode 100644
index e4a306103c..0000000000
--- a/web/src/pages/users/settings/UserSettingsAuthenticatorWebAuthnDevices.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { customElement, html, TemplateResult } from "lit-element";
-import { gettext } from "django";
-import { AuthenticatorsApi, StagesApi } from "authentik-api";
-import { until } from "lit-html/directives/until";
-import { FlowURLManager, UserURLManager } from "../../../api/legacy";
-import { DEFAULT_CONFIG } from "../../../api/Config";
-import { BaseUserSettings } from "./BaseUserSettings";
-import "../../../elements/buttons/ModalButton";
-import "../../../elements/buttons/SpinnerButton";
-import "../../../elements/forms/DeleteForm";
-
-@customElement("ak-user-settings-authenticator-webauthn")
-export class UserSettingsAuthenticatorWebAuthnDevices extends BaseUserSettings {
-
- render(): TemplateResult {
- return html`
-
- ${gettext("WebAuthn Devices")}
-
-
-
- ${until(new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsWebauthnList({}).then((devices) => {
- return devices.results.map((device) => {
- return html`-
-
-
-
${device.name || "-"}
-
- ${gettext(`Created ${device.createdOn?.toLocaleString()}`)}
-
-
-
-
- ${gettext("Update")}
-
-
-
-
{
- return new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsWebauthnDelete({
- id: device.pk || 0
- });
- }}>
-
-
-
-
-
`;
- });
- }))}
-
-
-
-
`;
- }
-
-}
diff --git a/web/src/routes.ts b/web/src/routes.ts
index ef93147b21..9e716cd90e 100644
--- a/web/src/routes.ts
+++ b/web/src/routes.ts
@@ -11,7 +11,6 @@ import "./pages/events/RuleListPage";
import "./pages/events/TransportListPage";
import "./pages/flows/FlowListPage";
import "./pages/flows/FlowViewPage";
-import "./pages/generic/SiteShell";
import "./pages/groups/GroupListPage";
import "./pages/LibraryPage";
import "./pages/outposts/OutpostListPage";
diff --git a/web/src/utils.ts b/web/src/utils.ts
index 3e92cba4bd..a9531be2b2 100644
--- a/web/src/utils.ts
+++ b/web/src/utils.ts
@@ -51,3 +51,8 @@ export function loading
(v: T, actual: TemplateResult): TemplateResult {
}
return actual;
}
+
+export function camelToSnake(key: string): string {
+ const result = key.replace(/([A-Z])/g, " $1");
+ return result.split(" ").join("_").toLowerCase();
+}