From 3e406795d9f9290a957c27288966539eab11d369 Mon Sep 17 00:00:00 2001 From: LIlGG <1103069291@qq.com> Date: Tue, 20 Feb 2024 16:49:38 +0800 Subject: [PATCH] fix: access the list interface without logging in --- console/src/components/MomentEdit.vue | 2 +- console/src/extensions/tags/TagsExtensionView.vue | 2 +- console/src/views/MomentsList.vue | 2 +- src/main/java/run/halo/moments/MomentEndpoint.java | 10 +++++----- src/main/resources/extensions/roleTemplate.yaml | 10 ++++------ 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/console/src/components/MomentEdit.vue b/console/src/components/MomentEdit.vue index 0115f06..445a9c2 100644 --- a/console/src/components/MomentEdit.vue +++ b/console/src/components/MomentEdit.vue @@ -98,7 +98,7 @@ const queryEditorTags = function () { const createMoment = async () => { formState.value.spec.releaseTime = new Date().toISOString(); const { data } = await apiClient.post( - `/apis/api.plugin.halo.run/v1alpha1/plugins/PluginMoments/moments`, + `/apis/console.api.moment.halo.run/v1alpha1/moments`, formState.value ); emit("save", data); diff --git a/console/src/extensions/tags/TagsExtensionView.vue b/console/src/extensions/tags/TagsExtensionView.vue index fe342d4..7289d52 100644 --- a/console/src/extensions/tags/TagsExtensionView.vue +++ b/console/src/extensions/tags/TagsExtensionView.vue @@ -27,7 +27,7 @@ const { data: tags } = useQuery({ queryKey: ["tags", page, size, keyword], queryFn: async () => { const { data } = await apiClient.get( - "/apis/api.plugin.halo.run/v1alpha1/plugins/PluginMoments/tags", + "/apis/console.api.moment.halo.run/v1alpha1/tags", { params: { name: keyword.value, diff --git a/console/src/views/MomentsList.vue b/console/src/views/MomentsList.vue index 760624b..ae1a3bc 100644 --- a/console/src/views/MomentsList.vue +++ b/console/src/views/MomentsList.vue @@ -88,7 +88,7 @@ const { } const { data } = await apiClient.get( - "/apis/api.plugin.halo.run/v1alpha1/plugins/PluginMoments/moments", + "/apis/api.moment.halo.run/v1alpha1/moments", { params: { page: page.value, diff --git a/src/main/java/run/halo/moments/MomentEndpoint.java b/src/main/java/run/halo/moments/MomentEndpoint.java index bd0fc80..b37f285 100644 --- a/src/main/java/run/halo/moments/MomentEndpoint.java +++ b/src/main/java/run/halo/moments/MomentEndpoint.java @@ -36,9 +36,9 @@ public class MomentEndpoint implements CustomEndpoint { @Override public RouterFunction endpoint() { - final var tag = "api.plugin.halo.run/v1alpha1/Moment"; + final var tag = "console.api.moment.halo.run/v1alpha1/Moment"; return SpringdocRouteBuilder.route() - .GET("plugins/PluginMoments/moments", this::listMoment, builder -> { + .GET("moments", this::listMoment, builder -> { builder.operationId("ListMoments") .description("List moments.") .tag(tag) @@ -47,7 +47,7 @@ public RouterFunction endpoint() { ); QueryParamBuildUtil.buildParametersFromType(builder, MomentQuery.class); }) - .GET("plugins/PluginMoments/tags", this::listTags, + .GET("tags", this::listTags, builder -> builder.operationId("ListTags") .description("List all moment tags.") .tag(tag) @@ -61,7 +61,7 @@ public RouterFunction endpoint() { .response(responseBuilder() .implementationArray(String.class) )) - .POST("plugins/PluginMoments/moments", this::createMoment, + .POST("moments", this::createMoment, builder -> builder.operationId("CreateMoment") .description("Create a Moment.") .tag(tag) @@ -80,7 +80,7 @@ public RouterFunction endpoint() { @Override public GroupVersion groupVersion() { - return GroupVersion.parseAPIVersion("api.plugin.halo.run/v1alpha1"); + return GroupVersion.parseAPIVersion("console.api.moment.halo.run/v1alpha1"); } private Mono createMoment(ServerRequest serverRequest) { diff --git a/src/main/resources/extensions/roleTemplate.yaml b/src/main/resources/extensions/roleTemplate.yaml index cb9a9e0..43f96da 100644 --- a/src/main/resources/extensions/roleTemplate.yaml +++ b/src/main/resources/extensions/roleTemplate.yaml @@ -13,9 +13,8 @@ rules: - apiGroups: [ "moment.halo.run"] resources: [ "moments" ] verbs: [ "get", "list" ] - - apiGroups: [ "api.plugin.halo.run"] - resources: [ "plugins/moments" ] - resourceNames: [ "PluginMoments" ] + - apiGroups: [ "console.api.moment.halo.run"] + resources: [ "moments", "tags" ] verbs: [ "get", "list" ] --- apiVersion: v1alpha1 @@ -35,7 +34,6 @@ rules: - apiGroups: [ "moment.halo.run"] resources: [ "moments" ] verbs: [ "create", "patch", "update", "delete", "deletecollection" ] - - apiGroups: [ "api.plugin.halo.run"] - resources: [ "plugins/moments" ] - resourceNames: [ "PluginMoments" ] + - apiGroups: [ "console.api.moment.halo.run"] + resources: [ "moments", "tags" ] verbs: [ "create", "patch", "update", "delete", "deletecollection" ]