Merge branch 'master' into fix/gitops

litmuschaos · Jul 31, 2023 · 63dfeb3 · 63dfeb3
2 parents 2d4a452 + 28f9079
commit 63dfeb3
Show file tree

Hide file tree

Showing 7 changed files with 1,306 additions and 12 deletions.
diff --git a/chaoscenter/authentication/api/handlers/rest/user_handlers.go b/chaoscenter/authentication/api/handlers/rest/user_handlers.go
@@ -251,11 +251,11 @@ func LoginUser(service services.ApplicationService) gin.HandlerFunc {
 		}
 
 		c.JSON(200, gin.H{
-			"access_token": token,
-			"project_id":   defaultProject,
-			"project_role": entities.RoleOwner,
-			"expires_in":   expiryTime,
-			"type":         "Bearer",
+			"accessToken": token,
+			"projectID":   defaultProject,
+			"projectRole": entities.RoleOwner,
+			"expiresIn":   expiryTime,
+			"type":        "Bearer",
 		})
 	}
 }

diff --git a/chaoscenter/authentication/api/presenter/rest.go b/chaoscenter/authentication/api/presenter/rest.go
@@ -5,7 +5,7 @@ import "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils"
 // ErrorResponseStruct defines the structure for error responses
 type ErrorResponseStruct struct {
 	Error            string `json:"error"`
-	ErrorDescription string `json:"error_description"`
+	ErrorDescription string `json:"errorDescription"`
 }
 
 // CreateErrorResponse is a helper function that creates a ErrorResponseStruct

diff --git a/chaoscenter/authentication/api/routes/user_router.go b/chaoscenter/authentication/api/routes/user_router.go
@@ -14,9 +14,9 @@ func UserRouter(router *gin.Engine, service services.ApplicationService) {
 	router.Use(middleware.JwtMiddleware())
 	router.POST("/update/password", rest.UpdatePassword(service))
 	router.POST("/reset/password", rest.ResetPassword(service))
-	router.POST("/create", rest.CreateUser(service))
+	router.POST("/create_user", rest.CreateUser(service))
 	router.POST("/update/details", rest.UpdateUser(service))
-	router.GET("/getUser/:uid", rest.GetUser(service))
+	router.GET("/get_user/:uid", rest.GetUser(service))
 	router.GET("/users", rest.FetchUsers(service))
 	router.GET("/invite_users/:project_id", rest.InviteUsers(service))
 	router.POST("/update/state", rest.UpdateUserState(service))

diff --git a/chaoscenter/authentication/pkg/project/repository.go b/chaoscenter/authentication/pkg/project/repository.go
@@ -458,6 +458,9 @@ func (r repository) GetProjectMembers(projectID string, state string) ([]*entiti
 		return nil, err
 	}
 
+	if len(res) <= 0 {
+		return nil, nil
+	}
 	return res[0].Members, nil
 }
 

diff --git a/chaoscenter/graphql/server/pkg/gitops/gitops.go b/chaoscenter/graphql/server/pkg/gitops/gitops.go
@@ -378,13 +378,11 @@ func (c GitConfig) GetChanges() (string, map[string]int, error) {
 		}
 	}
 	visited := map[string]int{}
-	lastFile := ""
 
 	commitIter, err := r.Log(&git.LogOptions{
 		PathFilter: func(file string) bool {
 			if (strings.HasSuffix(path, "/") && strings.HasPrefix(file, path)) || (path == file) {
 				visited[file] += 1
-				lastFile = file
 				return true
 			}
 			return false

diff --git a/litmus-portal/graphql-server/pkg/gitops/gitops.go b/litmus-portal/graphql-server/pkg/gitops/gitops.go
@@ -378,13 +378,11 @@ func (c GitConfig) GetChanges() (string, map[string]int, error) {
 		}
 	}
 	visited := map[string]int{}
-	lastFile := ""
 
 	commitIter, err := r.Log(&git.LogOptions{
 		PathFilter: func(file string) bool {
 			if (strings.HasSuffix(path, "/") && strings.HasPrefix(file, path)) || (path == file) {
 				visited[file] += 1
-				lastFile = file
 				return true
 			}
 			return false