fix user flows

devtron-labs · Sep 26, 2024 · eb1ca68 · eb1ca68
1 parent a35790a
commit eb1ca68
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/api/auth/user/UserRestHandler.go b/api/auth/user/UserRestHandler.go
@@ -242,24 +242,20 @@ func (handler UserRestHandlerImpl) GetById(w http.ResponseWriter, r *http.Reques
 	// NOTE: if no role assigned, user will be visible to all manager.
 	// RBAC enforcer applying
 	filteredRoleFilter := make([]bean.RoleFilter, 0)
+	isManagerOfAnyApp := false
 	if res.RoleFilters != nil && len(res.RoleFilters) > 0 {
 		for _, filter := range res.RoleFilters {
-			authPass := true
 			if len(filter.Team) > 0 {
-				if ok := handler.enforcer.Enforce(token, casbin.ResourceUser, casbin.ActionGet, filter.Team); !ok {
-					authPass = false
-				}
-			}
-			if filter.Entity == bean2.CLUSTER_ENTITIY {
-				if ok := handler.userCommonService.CheckRbacForClusterEntity(filter.Cluster, filter.Namespace, filter.Group, filter.Kind, filter.Resource, token, handler.CheckManagerAuth); !ok {
-					authPass = false
+				if ok := handler.enforcer.Enforce(token, casbin.ResourceUser, casbin.ActionGet, filter.Team); ok {
+					isManagerOfAnyApp = true
+					break
 				}
 			}
-			if authPass {
-				filteredRoleFilter = append(filteredRoleFilter, filter)
-			}
 		}
 	}
+	if res.SuperAdmin || isManagerOfAnyApp {
+		filteredRoleFilter = res.RoleFilters
+	}
 	for index, roleFilter := range filteredRoleFilter {
 		if roleFilter.Entity == "" {
 			filteredRoleFilter[index].Entity = bean2.ENTITY_APPS