From 4f23662049636d42eaea17ee07a9509a02a90fe3 Mon Sep 17 00:00:00 2001
From: nghialv <nghialv2607@gmail.com>
Date: Mon, 27 Jul 2020 21:25:37 +0900
Subject: [PATCH] Set the commander by the logged in username

---
 pkg/app/api/api/web_api.go | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/pkg/app/api/api/web_api.go b/pkg/app/api/api/web_api.go
index 881883abeb..801999362e 100644
--- a/pkg/app/api/api/web_api.go
+++ b/pkg/app/api/api/web_api.go
@@ -72,6 +72,7 @@ func (a *WebAPI) AddEnvironment(ctx context.Context, req *webservice.AddEnvironm
 	if err != nil {
 		return nil, err
 	}
+
 	env := model.Environment{
 		Id:        uuid.New().String(),
 		Name:      req.Name,
@@ -98,6 +99,7 @@ func (a *WebAPI) ListEnvironments(ctx context.Context, req *webservice.ListEnvir
 	if err != nil {
 		return nil, err
 	}
+
 	opts := datastore.ListOptions{
 		Filters: []datastore.ListFilter{
 			{
@@ -328,6 +330,7 @@ func (a *WebAPI) updateApplicationEnable(ctx context.Context, appID string, enab
 	if err != nil {
 		return err
 	}
+
 	app, err := a.getApplication(ctx, appID)
 	if err != nil {
 		return err
@@ -427,15 +430,16 @@ func (a *WebAPI) ListApplications(ctx context.Context, req *webservice.ListAppli
 }
 
 func (a *WebAPI) SyncApplication(ctx context.Context, req *webservice.SyncApplicationRequest) (*webservice.SyncApplicationResponse, error) {
-	app, err := a.getApplication(ctx, req.ApplicationId)
+	claims, err := rpcauth.ExtractClaims(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	claims, err := rpcauth.ExtractClaims(ctx)
+	app, err := a.getApplication(ctx, req.ApplicationId)
 	if err != nil {
 		return nil, err
 	}
+
 	if app.ProjectId != claims.Role.ProjectId {
 		return nil, status.Error(codes.PermissionDenied, "The current project does not have requested application")
 	}
@@ -446,7 +450,7 @@ func (a *WebAPI) SyncApplication(ctx context.Context, req *webservice.SyncApplic
 		PipedId:       app.PipedId,
 		ApplicationId: app.Id,
 		Type:          model.Command_SYNC_APPLICATION,
-		Commander:     "anonymous", // TODO: Getting value from login user.
+		Commander:     claims.Subject,
 		SyncApplication: &model.Command_SyncApplication{
 			ApplicationId: req.ApplicationId,
 		},
@@ -494,6 +498,7 @@ func (a *WebAPI) ListDeployments(ctx context.Context, req *webservice.ListDeploy
 	if err != nil {
 		return nil, err
 	}
+
 	// TODO: Support pagination for Deployment list
 	orders := []datastore.Order{
 		{
@@ -593,6 +598,11 @@ func (a *WebAPI) GetStageLog(ctx context.Context, req *webservice.GetStageLogReq
 }
 
 func (a *WebAPI) CancelDeployment(ctx context.Context, req *webservice.CancelDeploymentRequest) (*webservice.CancelDeploymentResponse, error) {
+	claims, err := rpcauth.ExtractClaims(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	deployment, err := a.getDeployment(ctx, req.DeploymentId)
 	if err != nil {
 		return nil, err
@@ -608,7 +618,7 @@ func (a *WebAPI) CancelDeployment(ctx context.Context, req *webservice.CancelDep
 		ApplicationId: deployment.ApplicationId,
 		DeploymentId:  req.DeploymentId,
 		Type:          model.Command_CANCEL_DEPLOYMENT,
-		Commander:     "anonymous",
+		Commander:     claims.Subject,
 		CancelDeployment: &model.Command_CancelDeployment{
 			DeploymentId:    req.DeploymentId,
 			WithoutRollback: req.WithoutRollback,
@@ -623,6 +633,11 @@ func (a *WebAPI) CancelDeployment(ctx context.Context, req *webservice.CancelDep
 }
 
 func (a *WebAPI) ApproveStage(ctx context.Context, req *webservice.ApproveStageRequest) (*webservice.ApproveStageResponse, error) {
+	claims, err := rpcauth.ExtractClaims(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	deployment, err := a.getDeployment(ctx, req.DeploymentId)
 	if err != nil {
 		return nil, err
@@ -643,7 +658,7 @@ func (a *WebAPI) ApproveStage(ctx context.Context, req *webservice.ApproveStageR
 		DeploymentId:  req.DeploymentId,
 		StageId:       req.StageId,
 		Type:          model.Command_APPROVE_STAGE,
-		Commander:     "anonymous",
+		Commander:     claims.Subject,
 		ApproveStage: &model.Command_ApproveStage{
 			DeploymentId: req.DeploymentId,
 			StageId:      req.StageId,
@@ -676,8 +691,7 @@ func (a *WebAPI) GetProject(ctx context.Context, req *webservice.GetProjectReque
 func (a *WebAPI) GetMe(ctx context.Context, req *webservice.GetMeRequest) (*webservice.GetMeResponse, error) {
 	claims, err := rpcauth.ExtractClaims(ctx)
 	if err != nil {
-		a.logger.Error("detected a request that passed JWT interceptor but not including a claims", zap.Error(err))
-		return nil, status.Error(codes.Internal, "internal error")
+		return nil, err
 	}
 
 	return &webservice.GetMeResponse{