apps dropdown apis auth free for super admin now (devtron-labs#2145)

hariprasadiit · Aug 8, 2022 · 03d1b14 · 03d1b14
1 parent ccf1119
commit 03d1b14
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/api/restHandler/app/AutoCompleteRestHandler.go b/api/restHandler/app/AutoCompleteRestHandler.go
@@ -23,6 +23,12 @@ func (handler PipelineConfigRestHandlerImpl) GetAppListForAutocomplete(w http.Re
 		common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
 		return
 	}
+	isActionUserSuperAdmin, err := handler.userAuthService.IsSuperAdmin(int(userId))
+	if err != nil {
+		common.WriteJsonResp(w, err, "Failed to check admin check", http.StatusInternalServerError)
+		return
+	}
+
 	v := r.URL.Query()
 	teamId := v.Get("teamId")
 	appName := v.Get("appName")
@@ -55,6 +61,10 @@ func (handler PipelineConfigRestHandlerImpl) GetAppListForAutocomplete(w http.Re
 	// RBAC
 	objects := handler.enforcerUtil.GetRbacObjectsForAllApps()
 	for _, app := range apps {
+		if isActionUserSuperAdmin {
+			accessedApps = append(accessedApps, app)
+			continue
+		}
 		object := objects[app.Id]
 		if ok := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionGet, object); ok {
 			accessedApps = append(accessedApps, app)

diff --git a/api/restHandler/app/PipelineConfigRestHandler.go b/api/restHandler/app/PipelineConfigRestHandler.go
@@ -486,6 +486,12 @@ func (handler PipelineConfigRestHandlerImpl) GetAppListByTeamIds(w http.Response
 		return
 	}
 
+	isActionUserSuperAdmin, err := handler.userAuthService.IsSuperAdmin(int(userId))
+	if err != nil {
+		common.WriteJsonResp(w, err, "Failed to check admin check", http.StatusInternalServerError)
+		return
+	}
+
 	appType := v.Get("appType")
 	handler.Logger.Infow("request payload, GetAppListByTeamIds", "payload", params)
 	var teamIds []int
@@ -510,6 +516,10 @@ func (handler PipelineConfigRestHandlerImpl) GetAppListByTeamIds(w http.Response
 	for _, project := range projectWiseApps {
 		var accessedApps []*pipeline.AppBean
 		for _, app := range project.AppList {
+			if isActionUserSuperAdmin {
+				accessedApps = append(accessedApps, app)
+				continue
+			}
 			object := fmt.Sprintf("%s/%s", project.ProjectName, app.Name)
 			if ok := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionGet, object); ok {
 				accessedApps = append(accessedApps, app)