optimize permission check

rokwire · Jan 25, 2024 · 96195be · 96195be
1 parent 95430df
commit 96195be
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/core/services.go b/core/services.go
@@ -455,12 +455,7 @@ func (s *servicesImpl) CreateDataContentItem(claims *tokenauth.Claims, item *mod
 func (s *servicesImpl) UpdateDataContentItem(claims *tokenauth.Claims, item *model.DataContentItem) (*model.DataContentItem, error) {
 	var dataItem *model.DataContentItem
 
-	oldItem, err := s.app.storage.FindDataContentItem(&claims.AppID, claims.OrgID, item.Key)
-	if err != nil {
-		return nil, err
-	}
-
-	category, err := s.app.storage.FindCategory(&claims.AppID, claims.OrgID, oldItem.Category)
+	category, err := s.app.storage.FindCategory(&claims.AppID, claims.OrgID, item.Category)
 	if err != nil {
 		return nil, err
 	}
@@ -469,13 +464,20 @@ func (s *servicesImpl) UpdateDataContentItem(claims *tokenauth.Claims, item *mod
 		return nil, fmt.Errorf("unauthorized to update data content item: [%s]", strings.Join(category.Permissions, ", "))
 	}
 
-	category, err = s.app.storage.FindCategory(&claims.AppID, claims.OrgID, item.Category)
+	oldItem, err := s.app.storage.FindDataContentItem(&claims.AppID, claims.OrgID, item.Key)
 	if err != nil {
 		return nil, err
 	}
 
-	if !checkPermissions(category.Permissions, claims.Permissions) {
-		return nil, fmt.Errorf("unauthorized to update data content item: [%s]", strings.Join(category.Permissions, ", "))
+	if item.Category != oldItem.Category {
+		category, err = s.app.storage.FindCategory(&claims.AppID, claims.OrgID, oldItem.Category)
+		if err != nil {
+			return nil, err
+		}
+
+		if !checkPermissions(category.Permissions, claims.Permissions) {
+			return nil, fmt.Errorf("unauthorized to update data content item: [%s]", strings.Join(category.Permissions, ", "))
+		}
 	}
 
 	dataItem, err = s.app.storage.UpdateDataContentItem(&claims.AppID, claims.OrgID, item)