develop merge

Author: iamayushm

Wire.go

@@ -73,6 +73,7 @@ import (
 	"github.com/devtron-labs/devtron/api/sse"
 	"github.com/devtron-labs/devtron/api/team"
 	"github.com/devtron-labs/devtron/api/terminal"
+	"github.com/devtron-labs/devtron/api/userResource"
 	util5 "github.com/devtron-labs/devtron/api/util"
 	webhookHelm "github.com/devtron-labs/devtron/api/webhook/helm"
 	"github.com/devtron-labs/devtron/cel"
@@ -170,6 +171,7 @@ import (
 	workflow3 "github.com/devtron-labs/devtron/pkg/workflow"
 	"github.com/devtron-labs/devtron/pkg/workflow/dag"
 	util2 "github.com/devtron-labs/devtron/util"
+	"github.com/devtron-labs/devtron/util/commonEnforcementFunctionsUtil"
 	cron2 "github.com/devtron-labs/devtron/util/cron"
 	"github.com/devtron-labs/devtron/util/rbac"
 	"github.com/google/wire"
@@ -213,6 +215,7 @@ func InitializeApp() (*App, error) {
 		workflow3.WorkflowWireSet,
 		imageTagging.WireSet,
 		devtronResource.DevtronResourceWireSet,
+		userResource.UserResourceWireSet,
 		policyGovernance.PolicyGovernanceWireSet,
 		resourceScan.ScanningResultWireSet,
 
@@ -502,6 +505,9 @@ func InitializeApp() (*App, error) {
 		rbac.NewEnforcerUtilImpl,
 		wire.Bind(new(rbac.EnforcerUtil), new(*rbac.EnforcerUtilImpl)),
 
+		commonEnforcementFunctionsUtil.NewCommonEnforcementUtilImpl,
+		wire.Bind(new(commonEnforcementFunctionsUtil.CommonEnforcementUtil), new(*commonEnforcementFunctionsUtil.CommonEnforcementUtilImpl)),
+
 		chartConfig.NewPipelineConfigRepository,
 		wire.Bind(new(chartConfig.PipelineConfigRepository), new(*chartConfig.PipelineConfigRepositoryImpl)),
 

api/appStore/chartGroup/ChartGroupRestHandler.go

@@ -274,7 +274,7 @@ func (impl *ChartGroupRestHandlerImpl) GetChartGroupList(w http.ResponseWriter,
 			return
 		}
 	}
-	res, err := impl.ChartGroupService.ChartGroupList(maxCount)
+	res, err := impl.ChartGroupService.GetChartGroupList(maxCount)
 	if err != nil {
 		impl.Logger.Errorw("service err, GetChartGroupList", "err", err, "max", max)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)

api/auth/sso/SsoLoginHandler.go

@@ -19,10 +19,10 @@ package sso
 import (
 	"encoding/json"
 	"errors"
+	"github.com/devtron-labs/devtron/pkg/auth/user/bean"
 	"net/http"
 	"strconv"
 
-	"github.com/devtron-labs/devtron/api/bean"
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 	"github.com/devtron-labs/devtron/pkg/auth/sso"

api/auth/user/UserAuthHandler.go

@@ -19,6 +19,8 @@ package user
 import (
 	"encoding/json"
 	"fmt"
+	bean2 "github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin/bean"
+	bean3 "github.com/devtron-labs/devtron/pkg/auth/user/bean"
 	"net/http"
 	"strings"
 
@@ -146,7 +148,7 @@ func (handler UserAuthHandlerImpl) AddDefaultPolicyAndRoles(w http.ResponseWrite
 	//for START in Casbin Object Ends Here
 	//loading policy for safety
 	casbin.LoadPolicy()
-	var policies []casbin.Policy
+	var policies []bean2.Policy
 	var policiesAdmin bean.PolicyRequest
 	err := json.Unmarshal([]byte(adminPolicies), &policiesAdmin)
 	if err != nil {
@@ -193,7 +195,7 @@ func (handler UserAuthHandlerImpl) AddDefaultPolicyAndRoles(w http.ResponseWrite
 	roleView = strings.ReplaceAll(roleView, "<ENV>", env)
 	roleView = strings.ReplaceAll(roleView, "<APP>", app)
 
-	var roleAdminData bean.RoleData
+	var roleAdminData bean3.RoleData
 	err = json.Unmarshal([]byte(roleAdmin), &roleAdminData)
 	if err != nil {
 		handler.logger.Errorw("request err, AddDefaultPolicyAndRoles", "err", err, "payload", roleAdminData)
@@ -207,7 +209,7 @@ func (handler UserAuthHandlerImpl) AddDefaultPolicyAndRoles(w http.ResponseWrite
 		return
 	}
 
-	var roleTriggerData bean.RoleData
+	var roleTriggerData bean3.RoleData
 	err = json.Unmarshal([]byte(roleTrigger), &roleTriggerData)
 	if err != nil {
 		handler.logger.Errorw("request err, AddDefaultPolicyAndRoles", "err", err, "payload", roleTriggerData)
@@ -221,7 +223,7 @@ func (handler UserAuthHandlerImpl) AddDefaultPolicyAndRoles(w http.ResponseWrite
 		return
 	}
 
-	var roleViewData bean.RoleData
+	var roleViewData bean3.RoleData
 	err = json.Unmarshal([]byte(roleView), &roleViewData)
 	if err != nil {
 		handler.logger.Errorw("request err, AddDefaultPolicyAndRoles", "err", err, "payload", roleViewData)