From 03fde513138e254d6ef671174421f0cce8522864 Mon Sep 17 00:00:00 2001 From: Ken Sternberg Date: Mon, 4 Dec 2023 10:26:28 -0800 Subject: [PATCH] web: Jens requested that the default subscription state for contexts be , and it's the right call. --- .../ldap/ak-application-wizard-authentication-by-ldap.ts | 2 +- .../ak-application-wizard-authentication-by-radius.ts | 5 +---- web/src/admin/groups/RelatedUserList.ts | 4 +--- web/src/admin/providers/ldap/LDAPProviderForm.ts | 2 +- web/src/admin/providers/radius/RadiusProviderForm.ts | 9 +++------ web/src/admin/users/UserListPage.ts | 5 +---- web/src/elements/Interface/tenantProvider.ts | 2 +- web/src/elements/PageHeader.ts | 2 +- web/src/elements/sidebar/SidebarBrand.ts | 2 +- 9 files changed, 11 insertions(+), 22 deletions(-) diff --git a/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts b/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts index 8858f5bf4..5b23e06b7 100644 --- a/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts +++ b/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts @@ -31,7 +31,7 @@ import { } from "./LDAPOptionsAndHelp"; @customElement("ak-application-wizard-authentication-by-ldap") -export class ApplicationWizardApplicationDetails extends WithTenantConfig(BaseProviderPanel, true) { +export class ApplicationWizardApplicationDetails extends WithTenantConfig(BaseProviderPanel) { render() { const provider = this.wizard.provider as LDAPProvider | undefined; diff --git a/web/src/admin/applications/wizard/methods/radius/ak-application-wizard-authentication-by-radius.ts b/web/src/admin/applications/wizard/methods/radius/ak-application-wizard-authentication-by-radius.ts index ab4260df0..9de4b0c0d 100644 --- a/web/src/admin/applications/wizard/methods/radius/ak-application-wizard-authentication-by-radius.ts +++ b/web/src/admin/applications/wizard/methods/radius/ak-application-wizard-authentication-by-radius.ts @@ -16,10 +16,7 @@ import { FlowsInstancesListDesignationEnum, RadiusProvider } from "@goauthentik/ import BaseProviderPanel from "../BaseProviderPanel"; @customElement("ak-application-wizard-authentication-by-radius") -export class ApplicationWizardAuthenticationByRadius extends WithTenantConfig( - BaseProviderPanel, - true, -) { +export class ApplicationWizardAuthenticationByRadius extends WithTenantConfig(BaseProviderPanel) { render() { const provider = this.wizard.provider as RadiusProvider | undefined; diff --git a/web/src/admin/groups/RelatedUserList.ts b/web/src/admin/groups/RelatedUserList.ts index 5a1f0ebd8..7e2c7209c 100644 --- a/web/src/admin/groups/RelatedUserList.ts +++ b/web/src/admin/groups/RelatedUserList.ts @@ -111,9 +111,7 @@ export class RelatedUserAdd extends Form<{ users: number[] }> { @customElement("ak-user-related-list") export class RelatedUserList extends WithTenantConfig( - WithCapabilitiesConfig(Table, true), - true, -) { + WithCapabilitiesConfig(Table)) { expandable = true; checkbox = true; diff --git a/web/src/admin/providers/ldap/LDAPProviderForm.ts b/web/src/admin/providers/ldap/LDAPProviderForm.ts index 34c5005ea..c720bc8dc 100644 --- a/web/src/admin/providers/ldap/LDAPProviderForm.ts +++ b/web/src/admin/providers/ldap/LDAPProviderForm.ts @@ -25,7 +25,7 @@ import { } from "@goauthentik/api"; @customElement("ak-provider-ldap-form") -export class LDAPProviderFormPage extends WithTenantConfig(ModelForm, true) { +export class LDAPProviderFormPage extends WithTenantConfig(ModelForm) { async loadInstance(pk: number): Promise { return new ProvidersApi(DEFAULT_CONFIG).providersLdapRetrieve({ id: pk, diff --git a/web/src/admin/providers/radius/RadiusProviderForm.ts b/web/src/admin/providers/radius/RadiusProviderForm.ts index fda74ef46..c7a843cca 100644 --- a/web/src/admin/providers/radius/RadiusProviderForm.ts +++ b/web/src/admin/providers/radius/RadiusProviderForm.ts @@ -14,10 +14,7 @@ import { customElement } from "lit/decorators.js"; import { FlowsInstancesListDesignationEnum, ProvidersApi, RadiusProvider } from "@goauthentik/api"; @customElement("ak-provider-radius-form") -export class RadiusProviderFormPage extends WithTenantConfig( - ModelForm, - true, -) { +export class RadiusProviderFormPage extends WithTenantConfig(ModelForm) { loadInstance(pk: number): Promise { return new ProvidersApi(DEFAULT_CONFIG).providersRadiusRetrieve({ id: pk, @@ -89,7 +86,7 @@ export class RadiusProviderFormPage extends WithTenantConfig(

${msg( - "When enabled, code-based multi-factor authentication can be used by appending a semicolon and the TOTP code to the password. This should only be enabled if all users that will bind to this provider have a TOTP device configured, as otherwise a password may incorrectly be rejected if it contains a semicolon.", + "When enabled, code-based multi-factor authentication can be used by appending a semicolon and the TOTP code to the password. This should only be enabled if all users that will bind to this provider have a TOTP device configured, as otherwise a password may incorrectly be rejected if it contains a semicolon." )}

@@ -106,7 +103,7 @@ export class RadiusProviderFormPage extends WithTenantConfig( type="text" value="${first( this.instance?.sharedSecret, - randomString(128, ascii_letters + digits), + randomString(128, ascii_letters + digits) )}" class="pf-c-form-control" required diff --git a/web/src/admin/users/UserListPage.ts b/web/src/admin/users/UserListPage.ts index e90228722..afb88f3f6 100644 --- a/web/src/admin/users/UserListPage.ts +++ b/web/src/admin/users/UserListPage.ts @@ -91,10 +91,7 @@ const recoveryButtonStyles = css` `; @customElement("ak-user-list") -export class UserListPage extends WithTenantConfig( - WithCapabilitiesConfig(TablePage, true), - true, -) { +export class UserListPage extends WithTenantConfig(WithCapabilitiesConfig(TablePage)) { expandable = true; checkbox = true; diff --git a/web/src/elements/Interface/tenantProvider.ts b/web/src/elements/Interface/tenantProvider.ts index e1837935c..63d389048 100644 --- a/web/src/elements/Interface/tenantProvider.ts +++ b/web/src/elements/Interface/tenantProvider.ts @@ -10,7 +10,7 @@ type Constructor = abstract new (...args: any[]) => T; export function WithTenantConfig>( superclass: T, - subscribe = false, + subscribe = true, ) { abstract class WithTenantProvider extends superclass { @consume({ context: authentikTenantContext, subscribe }) diff --git a/web/src/elements/PageHeader.ts b/web/src/elements/PageHeader.ts index ed8219ef9..e1d4b57c9 100644 --- a/web/src/elements/PageHeader.ts +++ b/web/src/elements/PageHeader.ts @@ -24,7 +24,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css"; import { EventsApi } from "@goauthentik/api"; @customElement("ak-page-header") -export class PageHeader extends WithTenantConfig(AKElement, true) { +export class PageHeader extends WithTenantConfig(AKElement) { @property() icon?: string; diff --git a/web/src/elements/sidebar/SidebarBrand.ts b/web/src/elements/sidebar/SidebarBrand.ts index b603c3c75..b57d336f7 100644 --- a/web/src/elements/sidebar/SidebarBrand.ts +++ b/web/src/elements/sidebar/SidebarBrand.ts @@ -27,7 +27,7 @@ export const DefaultTenant: CurrentTenant = { }; @customElement("ak-sidebar-brand") -export class SidebarBrand extends WithTenantConfig(AKElement, true) { +export class SidebarBrand extends WithTenantConfig(AKElement) { static get styles(): CSSResult[] { return [ PFBase,