code review fixes: 1st level nishant

Author: prakash100198

api/restHandler/BulkUpdateRestHandler.go

@@ -25,6 +25,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/bulkAction/bean"
 	"github.com/devtron-labs/devtron/pkg/bulkAction/service"
 	"github.com/devtron-labs/devtron/pkg/cluster/environment"
+	"github.com/devtron-labs/devtron/util"
 	"net/http"
 	"strconv"
 	"strings"
@@ -257,11 +258,7 @@ func (handler BulkUpdateRestHandlerImpl) BulkUpdate(w http.ResponseWriter, r *ht
 		}
 	}
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-	if err != nil {
-		common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-		return
-	}
+	userEmail := util.GetEmailFromContext(r.Context())
 	userMetadata := &bean4.UserMetadata{
 		UserEmailId:      userEmail,
 		IsUserSuperAdmin: isSuperAdmin,
@@ -278,11 +275,7 @@ func (handler BulkUpdateRestHandlerImpl) BulkHibernate(w http.ResponseWriter, r
 	}
 	token := r.Header.Get("token")
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	userEmail, err := handler.userAuthService.GetActiveEmailById(request.UserId)
-	if err != nil {
-		common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-		return
-	}
+	userEmail := util.GetEmailFromContext(r.Context())
 	userMetadata := &bean4.UserMetadata{
 		UserEmailId:      userEmail,
 		IsUserSuperAdmin: isSuperAdmin,
@@ -327,11 +320,7 @@ func (handler BulkUpdateRestHandlerImpl) BulkUnHibernate(w http.ResponseWriter,
 	}
 	token := r.Header.Get("token")
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	userEmail, err := handler.userAuthService.GetActiveEmailById(request.UserId)
-	if err != nil {
-		common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-		return
-	}
+	userEmail := util.GetEmailFromContext(r.Context())
 	userMetadata := &bean4.UserMetadata{
 		UserEmailId:      userEmail,
 		IsUserSuperAdmin: isSuperAdmin,
@@ -366,11 +355,7 @@ func (handler BulkUpdateRestHandlerImpl) BulkDeploy(w http.ResponseWriter, r *ht
 		return
 	}
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-	if err != nil {
-		common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-		return
-	}
+	userEmail := util.GetEmailFromContext(r.Context())
 	userMetadata := &bean4.UserMetadata{
 		UserEmailId:      userEmail,
 		IsUserSuperAdmin: isSuperAdmin,

api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go

@@ -414,11 +414,7 @@ func (handler *PipelineConfigRestHandlerImpl) HandleChangeDeploymentRequest(w ht
 
 	ctx := r.Context()
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-	if err != nil {
-		common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-		return
-	}
+	userEmail := util2.GetEmailFromContext(ctx)
 	userMetadata := &bean4.UserMetadata{
 		UserEmailId:      userEmail,
 		IsUserSuperAdmin: isSuperAdmin,
@@ -476,11 +472,7 @@ func (handler *PipelineConfigRestHandlerImpl) HandleChangeDeploymentTypeRequest(
 
 	ctx := r.Context()
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-	if err != nil {
-		common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-		return
-	}
+	userEmail := util2.GetEmailFromContext(ctx)
 	userMetadata := &bean4.UserMetadata{
 		UserEmailId:      userEmail,
 		IsUserSuperAdmin: isSuperAdmin,
@@ -536,11 +528,7 @@ func (handler *PipelineConfigRestHandlerImpl) HandleTriggerDeploymentAfterTypeCh
 
 	ctx := r.Context()
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-	if err != nil {
-		common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-		return
-	}
+	userEmail := util2.GetEmailFromContext(ctx)
 	userMetadata := &bean4.UserMetadata{
 		UserEmailId:      userEmail,
 		IsUserSuperAdmin: isSuperAdmin,

api/restHandler/app/pipeline/trigger/PipelineTriggerRestHandler.go

@@ -142,11 +142,7 @@ func (handler PipelineTriggerRestHandlerImpl) OverrideConfig(w http.ResponseWrit
 		Context: ctx,
 	}
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-	if err != nil {
-		common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-		return
-	}
+	userEmail := util.GetEmailFromContext(ctx)
 	userMetadata := &bean5.UserMetadata{
 		UserEmailId:      userEmail,
 		IsUserSuperAdmin: isSuperAdmin,
@@ -197,11 +193,7 @@ func (handler PipelineTriggerRestHandlerImpl) RotatePods(w http.ResponseWriter,
 		return
 	}
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-	if err != nil {
-		common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-		return
-	}
+	userEmail := util.GetEmailFromContext(r.Context())
 	userMetadata := &bean5.UserMetadata{
 		UserEmailId:      userEmail,
 		IsUserSuperAdmin: isSuperAdmin,
@@ -253,11 +245,7 @@ func (handler PipelineTriggerRestHandlerImpl) StartStopApp(w http.ResponseWriter
 	//rback block ends here
 	ctx := r.Context()
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-	if err != nil {
-		common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-		return
-	}
+	userEmail := util.GetEmailFromContext(ctx)
 	userMetadata := &bean5.UserMetadata{
 		UserEmailId:      userEmail,
 		IsUserSuperAdmin: isSuperAdmin,
@@ -318,11 +306,7 @@ func (handler PipelineTriggerRestHandlerImpl) StartStopDeploymentGroup(w http.Re
 	}
 	//rback block ends here
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-	if err != nil {
-		common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-		return
-	}
+	userEmail := util.GetEmailFromContext(r.Context())
 	userMetadata := &bean5.UserMetadata{
 		UserEmailId:      userEmail,
 		IsUserSuperAdmin: isSuperAdmin,

util/HttpUtil.go

@@ -31,7 +31,10 @@ import (
 	"time"
 )
 
-const TokenKey = "token"
+const (
+	EmailId  = "emailId"
+	TokenKey = "token"
+)
 
 func ReadFromUrlWithRetry(url string) ([]byte, error) {
 	var (
@@ -160,3 +163,8 @@ func GetTokenFromContext(ctx context.Context) string {
 	token, _ := ctx.Value(TokenKey).(string)
 	return token
 }
+
+func GetEmailFromContext(ctx context.Context) string {
+	email, _ := ctx.Value(EmailId).(string)
+	return email
+}