fix: GET rbac permission for settings (#3368)

openobserve · May 17, 2024 · 90cc1b2 · 90cc1b2
1 parent 9a6ab4d
commit 90cc1b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/common/utils/auth.rs b/src/common/utils/auth.rs
@@ -215,7 +215,11 @@ impl FromRequest for AuthExtractor {
  path_columns[0].to_string()
  }
  } else if url_len == 2 || (url_len > 2 && path_columns[1].starts_with("settings")) {
- if method.eq("GET") {
+ if path_columns[1].starts_with("settings") {
+ if method.eq("POST") || method.eq("DELETE") {
+ method = "PUT".to_string();
+ }
+ } else if method.eq("GET") {
  method = "LIST".to_string();
  }
  format!(

diff --git a/web/src/components/settings/General.vue b/web/src/components/settings/General.vue
@@ -293,7 +293,7 @@ export default defineComponent({
  }
  }
  settingsService
- .createLogo(orgIdentifier, formData)
+ .createLogo(store.state.selectedOrganization?.identifier || orgIdentifier, formData)
  .then(async (res) => {
  if (res.status == 200) {
  q.notify({
@@ -343,7 +343,7 @@ export default defineComponent({
  }
  }
  settingsService
- .deleteLogo(orgIdentifier)
+ .deleteLogo(store.state.selectedOrganization?.identifier || orgIdentifier)
  .then(async (res: any) => {
  if (res.status == 200) {
  q.notify({
@@ -385,7 +385,7 @@ export default defineComponent({
  }
 
  settingsService
- .updateCustomText(orgIdentifier, "custom_logo_text", customText.value)
+ .updateCustomText(store.state.selectedOrganization?.identifier || orgIdentifier, "custom_logo_text", customText.value)
  .then(async (res: any) => {
  if (res.status == 200) {
  q.notify({