diff --git a/src/main.ts b/src/main.ts index f8a0ae689..376f0cccc 100644 --- a/src/main.ts +++ b/src/main.ts @@ -142,7 +142,7 @@ async function loadCurrentUser() { app.provide("currentUser", user); const { data: permissions } = await apiClient.user.getPermissions( - "ac7cdce1-acf2-4e27-a422-c16d6f47cfa2" + user.metadata.name ); app.provide("permissions", permissions); } diff --git a/src/modules/system/roles/RoleDetail.vue b/src/modules/system/roles/RoleDetail.vue index 47f2c8849..0ee1a5f22 100644 --- a/src/modules/system/roles/RoleDetail.vue +++ b/src/modules/system/roles/RoleDetail.vue @@ -38,7 +38,7 @@ const formState = ref({ name: "", labels: {}, annotations: { - "plugin.halo.run/dependencies": "", + "rbac.authorization.halo.run/dependencies": "", "plugin.halo.run/display-name": "", }, }, @@ -80,7 +80,7 @@ const handleFetchRole = async () => { ); formState.value.role = response.data; formState.value.selectedRoleTemplates = JSON.parse( - response.data.metadata.annotations?.["plugin.halo.run/dependencies"] || + response.data.metadata.annotations?.["rbac.authorization.halo.run/dependencies"] || "[]" ); } catch (error) { @@ -111,7 +111,7 @@ const handleUpdateRole = async () => { formState.value.saving = true; if (formState.value.role.metadata.annotations) { formState.value.role.metadata.annotations[ - "plugin.halo.run/dependencies" + "rbac.authorization.halo.run/dependencies" ] = JSON.stringify(formState.value.selectedRoleTemplates); } await apiClient.extension.role.updatev1alpha1Role( @@ -319,7 +319,7 @@ onMounted(() => { { {{ JSON.parse( role.metadata.annotations?.[ - "plugin.halo.run/dependencies" + "rbac.authorization.halo.run/dependencies" ] ).join(", ") }} diff --git a/src/modules/system/roles/components/RoleCreationModal.vue b/src/modules/system/roles/components/RoleCreationModal.vue index f9012a49d..bd3fe26fb 100644 --- a/src/modules/system/roles/components/RoleCreationModal.vue +++ b/src/modules/system/roles/components/RoleCreationModal.vue @@ -34,7 +34,7 @@ const creationFormState = ref({ name: "", labels: {}, annotations: { - "plugin.halo.run/dependencies": "", + "rbac.authorization.halo.run/dependencies": "", "plugin.halo.run/display-name": "", }!, }, @@ -83,7 +83,7 @@ const handleCreateRole = async () => { creationFormState.value.saving = true; if (creationFormState.value.role.metadata.annotations) { creationFormState.value.role.metadata.annotations[ - "plugin.halo.run/dependencies" + "rbac.authorization.halo.run/dependencies" ] = JSON.stringify(creationFormState.value.selectedRoleTemplates); } await apiClient.extension.role.createv1alpha1Role( @@ -181,7 +181,7 @@ watch(