[WIP] : Multiple project owner backend. #4536

aryan-bhokare · 2024-03-17T06:56:25Z

closes #3958 #4161

Proposed changes

Work done:

Modification of db schema.
Addition of new API GetProjectOwners.
Modifications of SendInvitation API.
Modifications of LeaveProject API.
Added new API UpdateMemberRole.
Added new API DeleteProject.

Types of changes

What types of changes does your code introduce to Litmus? Put an x in the boxes that apply

New feature (non-breaking change which adds functionality)
Bugfix (non-breaking change which fixes an issue)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Documentation Update (if none of the other choices applies)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

I have read the CONTRIBUTING doc
I have signed the commit for DCO to be passed.
Lint and unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works (if appropriate)
I have added necessary documentation (if appropriate)

Dependency

Please add the links to the dependent PR need to be merged before this (if any).

Special notes for your reviewer:

Signed-off-by: aryan <aryan1bhokare@gmail.com>

chaoscenter/authentication/pkg/project/repository.go

Signed-off-by: aryan <aryan1bhokare@gmail.com>

chaoscenter/authentication/pkg/project/repository.go

Signed-off-by: aryan <aryan1bhokare@gmail.com>

chaoscenter/authentication/pkg/project/repository.go

+	var project struct {
+		Members []*entities.Member `bson:"members"`
+	}
+	err := r.Collection.FindOne(context.TODO(), filter).Decode(&project)


…itmuschaos#4527) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.18.0 to 0.21.0. - [Commits](golang/crypto@v0.18.0...v0.21.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.5 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.5...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [github.com/golang/protobuf](https://github.com/golang/protobuf) from 1.5.3 to 1.5.4. - [Release notes](https://github.com/golang/protobuf/releases) - [Commits](golang/protobuf@v1.5.3...v1.5.4) --- updated-dependencies: - dependency-name: github.com/golang/protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Raj Das <mail.rajdas@gmail.com>

This modification unables to send invite with the role as owner. Signed-off-by: aryan <aryan1bhokare@gmail.com>

This modification checks if the User is the last owner of the project and if not User can leave the project. Signed-off-by: aryan <aryan1bhokare@gmail.com>

chaoscenter/authentication/pkg/project/repository.go

+	query := bson.D{{"_id", projectID}}
+	update := bson.D{{"$set", bson.M{"members.$[elem]role": role}}}
+
+	_, err := r.Collection.UpdateOne(context.TODO(), query, update, opts)


Allows Owner to be able to leave the project. Signed-off-by: aryan <aryan1bhokare@gmail.com>

This API is used for updating role of the member in the project. Signed-off-by: aryan <aryan1bhokare@gmail.com>

Saranya-jena · 2024-04-02T13:36:53Z

chaoscenter/authentication/api/handlers/rest/project_handler.go

+func GetActiveProjectOwners(service services.ApplicationService) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		projectID := c.Param("project_id")
+		// state := c.Param("state")


can remove if not required

chaoscenter/authentication/pkg/entities/project.go

Saranya-jena · 2024-04-02T13:41:06Z

chaoscenter/web/yarn.lock

-  version "1.15.5"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
-  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
+  version "1.15.6"


why is this change required?

It happened automatically. I am unable to understand I was thinking about starting new from the commit before the bumps

these changes were included in the main litmus repo I will remove it from the pr.

Signed-off-by: aryan <aryan1bhokare@gmail.com>

Saranya-jena · 2024-04-09T06:01:36Z

chaoscenter/authentication/api/handlers/rest/project_handler.go

@@ -569,6 +593,20 @@ func LeaveProject(service services.ApplicationService) gin.HandlerFunc {
 			return
 		}

+		if member.Role == nil || *member.Role == entities.RoleOwner {


Why are we checking member.Role == nil

because if we don't, it gives a runtime error attempting to access or deference nil pointer

2024/04/09 14:28:53 [Recovery] 2024/04/09 - 14:28:53 panic recovered: runtime error: invalid memory address or nil pointer dereference /usr/local/go/src/runtime/panic.go:261 (0x4556d7) panicmem: panic(memoryError) /usr/local/go/src/runtime/signal_unix.go:881 (0x4556a5) sigpanic: panicmem() /home/aryan/Desktop/dev2/lfx/litmus/chaoscenter/authentication/api/handlers/rest/project_handler.go:595 (0xc540df) ProjectRouter.LeaveProject.func16: if *member.Role == entities.RoleOwner { /home/aryan/go/pkg/mod/github.com/gin-gonic/gin@v1.9.1/context.go:174 (0xc1972a) (*Context).Next: c.handlers[c.index](c) /home/aryan/Desktop/dev2/lfx/litmus/chaoscenter/authentication/api/middleware/jwt_middlware.go:33 (0xc5824e) ProjectRouter.JwtMiddleware.func1: c.Next() /home/aryan/go/pkg/mod/github.com/gin-gonic/gin@v1.9.1/context.go:174 (0xc1972a) (*Context).Next: c.handlers[c.index](c) /home/aryan/Desktop/dev2/lfx/litmus/chaoscenter/authentication/api/middleware/jwt_middlware.go:33 (0xc5b54e) UserRouter.JwtMiddleware.func3: c.Next() /home/aryan/go/pkg/mod/github.com/gin-gonic/gin@v1.9.1/context.go:174 (0xc26619) (*Context).Next: c.handlers[c.index](c) /home/aryan/go/pkg/mod/github.com/gin-gonic/gin@v1.9.1/recovery.go:102 (0xc26607) CustomRecoveryWithWriter.func1: c.Next() /home/aryan/go/pkg/mod/github.com/gin-gonic/gin@v1.9.1/context.go:174 (0xc2575c) (*Context).Next: c.handlers[c.index](c) /home/aryan/go/pkg/mod/github.com/gin-gonic/gin@v1.9.1/logger.go:240 (0xc25743) LoggerWithConfig.func1: c.Next() /home/aryan/go/pkg/mod/github.com/gin-gonic/gin@v1.9.1/context.go:174 (0xc24c4d) (*Context).Next: c.handlers[c.index](c) /home/aryan/go/pkg/mod/github.com/gin-gonic/gin@v1.9.1/gin.go:620 (0xc248dc) (*Engine).handleHTTPRequest: c.Next() /home/aryan/go/pkg/mod/github.com/gin-gonic/gin@v1.9.1/gin.go:576 (0xc24411) (*Engine).ServeHTTP: engine.handleHTTPRequest(c) /usr/local/go/src/net/http/server.go:3137 (0x800ced) serverHandler.ServeHTTP: handler.ServeHTTP(rw, req) /usr/local/go/src/net/http/server.go:2039 (0x7fbfc7) (*conn).serve: serverHandler{c.server}.ServeHTTP(w, w.req) /usr/local/go/src/runtime/asm_amd64.s:1695 (0x472c20) goexit: BYTE $0x90 // NOP

Saranya-jena · 2024-04-09T06:20:24Z

chaoscenter/authentication/api/handlers/rest/project_handler.go

+		}
+
+		err = service.UpdateMemberRole(member.ProjectID, member.UserID, member.Role)
+		if err != nil {


I think we should also add one more check for a case: There is only 1 owner and that owner is trying update their role to viewer/editor. In this case there will be no project owner. 🤔

sure I'll do that

How about a check to not allow the logged in user to change their own project roles. This will cover all the conditions. Please check on feasibility of this approach and race conditions if any

Yes that would be better. cc: @aryan-bhokare

Owner can delete project with help of this API. Signed-off-by: aryan <aryan1bhokare@gmail.com>

Signed-off-by: aryan <aryan1bhokare@gmail.com>

…kend Signed-off-by: Aryan Bhokare <92683836+aryan-bhokare@users.noreply.github.com>

Signed-off-by: aryan <aryan1bhokare@gmail.com>

chaoscenter/authentication/api/handlers/rest/project_handler.go

SarthakJain26 · 2024-04-10T06:32:41Z

chaoscenter/authentication/api/handlers/rest/project_handler.go

+//	@Router			/delete_project [post]
+//
+// DeleteProject is used to delete a project.
+func DeleteProject (service services.ApplicationService) gin.HandlerFunc {


All the resources related to the deleted project should also be deleted. This change can go in a different PR

Lets do that in different pr.

chaoscenter/authentication/pkg/entities/project.go

chaoscenter/authentication/api/handlers/rest/project_handler.go

User cannot change role of their own, so that it will avoid edge cases like 1. User is the last owner of the project. 2. User accidentally losing owner access to the projects. Signed-off-by: aryan <aryan1bhokare@gmail.com>

Signed-off-by: aryan <aryan1bhokare@gmail.com>

Saranya-jena

looks good to me 🚀

SarthakJain26

Looks good to me 🚀 , great work

aryan-bhokare · 2024-04-12T09:58:48Z

Looks good to me 🚀 , great work

Thank you 🚀

Modified db schema of Owner.

78b82ab

Signed-off-by: aryan <aryan1bhokare@gmail.com>

github-advanced-security bot found potential problems Mar 17, 2024

View reviewed changes

chaoscenter/authentication/pkg/project/repository.go Fixed Show fixed Hide fixed

Added new API GetProjectOwners.

962175b

Signed-off-by: aryan <aryan1bhokare@gmail.com>

aryan-bhokare force-pushed the multiple-project-owner-backend branch from 974ff44 to 962175b Compare March 17, 2024 07:10

github-advanced-security bot found potential problems Mar 17, 2024

View reviewed changes

chaoscenter/authentication/pkg/project/repository.go Fixed Show fixed Hide fixed

fix: return type error.

0c8528e

Signed-off-by: aryan <aryan1bhokare@gmail.com>

aryan-bhokare force-pushed the multiple-project-owner-backend branch from d43d147 to 0c8528e Compare March 17, 2024 08:23

github-advanced-security bot found potential problems Mar 17, 2024

View reviewed changes

dependabot bot and others added 5 commits March 23, 2024 11:42

Modified SendInvitation API.

1de73da

This modification unables to send invite with the role as owner. Signed-off-by: aryan <aryan1bhokare@gmail.com>

Modified LeaveProject API.

7c79813

This modification checks if the User is the last owner of the project and if not User can leave the project. Signed-off-by: aryan <aryan1bhokare@gmail.com>

github-advanced-security bot found potential problems Mar 24, 2024

View reviewed changes

aryan-bhokare added 2 commits March 24, 2024 12:28

RBAC modification LeaveProject.

44ae3b9

Allows Owner to be able to leave the project. Signed-off-by: aryan <aryan1bhokare@gmail.com>

Added UpdateMemberRole API.

77bcd91

This API is used for updating role of the member in the project. Signed-off-by: aryan <aryan1bhokare@gmail.com>

aryan-bhokare force-pushed the multiple-project-owner-backend branch from 112e819 to 77bcd91 Compare March 24, 2024 07:06

Saranya-jena requested changes Apr 2, 2024

View reviewed changes

aryan-bhokare added 2 commits April 5, 2024 12:23

Fixed some syntax errors.

43bd3b2

Signed-off-by: aryan <aryan1bhokare@gmail.com>

Updated roles for owner.

2ac9f7d

Signed-off-by: aryan <aryan1bhokare@gmail.com>

Saranya-jena requested changes Apr 9, 2024

View reviewed changes

Saranya-jena changed the base branch from master to multiple-owner-support April 9, 2024 06:25

Saranya-jena requested a review from SarthakJain26 April 9, 2024 06:26

Saranya-jena assigned aryan-bhokare Apr 9, 2024

Saranya-jena added the LFX-MENTORSHIP Linux Foundation Mentor ship Issue label Apr 9, 2024

aryan-bhokare and others added 3 commits April 9, 2024 13:27

Added new API DeleteProject.

1860721

Owner can delete project with help of this API. Signed-off-by: aryan <aryan1bhokare@gmail.com>

Added mocks.

a2a27d4

Signed-off-by: aryan <aryan1bhokare@gmail.com>

Merge branch 'multiple-owner-support' into multiple-project-owner-bac…

4e8279a

…kend Signed-off-by: Aryan Bhokare <92683836+aryan-bhokare@users.noreply.github.com>

aryan-bhokare requested a review from Saranya-jena April 9, 2024 08:10

aryan-bhokare marked this pull request as ready for review April 9, 2024 08:26

modified go.sum

737c03f

Signed-off-by: aryan <aryan1bhokare@gmail.com>

SarthakJain26 requested changes Apr 10, 2024

View reviewed changes

aryan-bhokare added 2 commits April 10, 2024 19:12

Added condition UpdateMemberRole.

c1b2ed3

User cannot change role of their own, so that it will avoid edge cases like 1. User is the last owner of the project. 2. User accidentally losing owner access to the projects. Signed-off-by: aryan <aryan1bhokare@gmail.com>

made suggested changes.

197aabd

Signed-off-by: aryan <aryan1bhokare@gmail.com>

aryan-bhokare force-pushed the multiple-project-owner-backend branch from 93808b1 to fef4c59 Compare April 11, 2024 06:25

Changed DeleteProject endpoint to have url parameter.

4a10fe3

Signed-off-by: aryan <aryan1bhokare@gmail.com>

aryan-bhokare force-pushed the multiple-project-owner-backend branch from fef4c59 to 4a10fe3 Compare April 11, 2024 06:28

aryan-bhokare requested a review from SarthakJain26 April 11, 2024 06:29

Minor fixes.

33dec51

Signed-off-by: aryan <aryan1bhokare@gmail.com>

aryan-bhokare force-pushed the multiple-project-owner-backend branch from a954d11 to 33dec51 Compare April 11, 2024 10:19

Saranya-jena approved these changes Apr 11, 2024

View reviewed changes

SarthakJain26 approved these changes Apr 12, 2024

View reviewed changes

Saranya-jena merged commit 0e51dbf into litmuschaos:multiple-owner-support Apr 12, 2024
4 of 5 checks passed

aryan-bhokare mentioned this pull request Apr 24, 2024

Feat: Added support for multiple project owners #4597

Open

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] : Multiple project owner backend. #4536

[WIP] : Multiple project owner backend. #4536

aryan-bhokare commented Mar 17, 2024 •

edited

Saranya-jena Apr 2, 2024

aryan-bhokare Apr 2, 2024

Saranya-jena Apr 2, 2024

aryan-bhokare Apr 2, 2024

aryan-bhokare Apr 6, 2024 •

edited

Saranya-jena Apr 9, 2024

aryan-bhokare Apr 9, 2024

aryan-bhokare Apr 9, 2024

Saranya-jena Apr 9, 2024

aryan-bhokare Apr 9, 2024

SarthakJain26 Apr 10, 2024

Saranya-jena Apr 10, 2024

SarthakJain26 Apr 10, 2024

aryan-bhokare Apr 10, 2024

Saranya-jena left a comment

SarthakJain26 left a comment

aryan-bhokare commented Apr 12, 2024

[WIP] : Multiple project owner backend. #4536

[WIP] : Multiple project owner backend. #4536

Conversation

aryan-bhokare commented Mar 17, 2024 • edited

Proposed changes

Types of changes

Checklist

Dependency

Special notes for your reviewer:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aryan-bhokare Apr 6, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Saranya-jena left a comment

Choose a reason for hiding this comment

SarthakJain26 left a comment

Choose a reason for hiding this comment

aryan-bhokare commented Apr 12, 2024

aryan-bhokare commented Mar 17, 2024 •

edited

aryan-bhokare Apr 6, 2024 •

edited