diff --git a/authentik/enterprise/providers/rac/api/connection_tokens.py b/authentik/enterprise/providers/rac/api/connection_tokens.py index 9b5ff10743..00fb8f546f 100644 --- a/authentik/enterprise/providers/rac/api/connection_tokens.py +++ b/authentik/enterprise/providers/rac/api/connection_tokens.py @@ -6,13 +6,13 @@ from rest_framework.filters import OrderingFilter, SearchFilter from rest_framework.serializers import ModelSerializer from rest_framework.viewsets import GenericViewSet -from authentik.api.authorization import OwnerFilter, OwnerPermissions +from authentik.api.authorization import OwnerFilter, OwnerSuperuserPermissions from authentik.core.api.groups import GroupMemberSerializer from authentik.core.api.used_by import UsedByMixin from authentik.enterprise.api import EnterpriseRequiredMixin from authentik.enterprise.providers.rac.api.endpoints import EndpointSerializer from authentik.enterprise.providers.rac.api.providers import RACProviderSerializer -from authentik.enterprise.providers.rac.models import ConnectionToken, Endpoint +from authentik.enterprise.providers.rac.models import ConnectionToken class ConnectionTokenSerializer(EnterpriseRequiredMixin, ModelSerializer): @@ -23,7 +23,7 @@ class ConnectionTokenSerializer(EnterpriseRequiredMixin, ModelSerializer): user = GroupMemberSerializer(source="session.user", read_only=True) class Meta: - model = Endpoint + model = ConnectionToken fields = [ "pk", "provider", @@ -49,5 +49,5 @@ class ConnectionTokenViewSet( filterset_fields = ["endpoint", "session__user", "provider"] search_fields = ["endpoint__name", "provider__name"] ordering = ["endpoint__name", "provider__name"] - permission_classes = [OwnerPermissions] + permission_classes = [OwnerSuperuserPermissions] filter_backends = [OwnerFilter, DjangoFilterBackend, OrderingFilter, SearchFilter] diff --git a/web/src/admin/providers/rac/ConnectionTokenList.ts b/web/src/admin/providers/rac/ConnectionTokenList.ts index 93ee5ddf15..4161cedaee 100644 --- a/web/src/admin/providers/rac/ConnectionTokenList.ts +++ b/web/src/admin/providers/rac/ConnectionTokenList.ts @@ -13,7 +13,7 @@ import { customElement, property } from "lit/decorators.js"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import { ConnectionToken, Endpoint, RACProvider, RacApi } from "@goauthentik/api"; +import { ConnectionToken, RACProvider, RacApi } from "@goauthentik/api"; @customElement("ak-rac-connection-token-list") export class ConnectionTokenListPage extends Table { @@ -53,18 +53,18 @@ export class ConnectionTokenListPage extends Table { return html` { + .metadata=${(item: ConnectionToken) => { return [ - { key: msg("Name"), value: item.name }, - { key: msg("Host"), value: item.host }, + { key: msg("Endpoint"), value: item.endpointObj.name }, + { key: msg("User"), value: item.user.username }, ]; }} - .usedBy=${(item: Endpoint) => { + .usedBy=${(item: ConnectionToken) => { return new RacApi(DEFAULT_CONFIG).racConnectionTokensUsedByList({ connectionTokenUuid: item.pk, }); }} - .delete=${(item: Endpoint) => { + .delete=${(item: ConnectionToken) => { return new RacApi(DEFAULT_CONFIG).racConnectionTokensDestroy({ connectionTokenUuid: item.pk, }); diff --git a/web/src/admin/providers/rac/RACProviderViewPage.ts b/web/src/admin/providers/rac/RACProviderViewPage.ts index d7d1e1ba38..58f23cffa3 100644 --- a/web/src/admin/providers/rac/RACProviderViewPage.ts +++ b/web/src/admin/providers/rac/RACProviderViewPage.ts @@ -88,7 +88,11 @@ export class RACProviderViewPage extends AKElement {
${this.renderTabOverview()}
-
+