fix: return empty list of memberships instead of error (#984)

migmartri · web-flow · commit 408f62343202 · 2024-06-19T10:31:09.000+02:00
Signed-off-by: Miguel Martinez Trivino &lt;miguel@chainloop.dev&gt;
diff --git a/app/controlplane/internal/server/grpc.go b/app/controlplane/internal/server/grpc.go
@@ -245,9 +245,9 @@ func requireRobotAccountMatcher() selector.MatchFunc {
 
 // Matches all operations that require to have a current organization
 func requireAllButOrganizationOperationsMatcher() selector.MatchFunc {
-	const skipMatcher = "/controlplane.v1.OrganizationService/Create"
+	const skipRegexp = "/controlplane.v1.OrganizationService/Create|/controlplane.v1.UserService/ListMemberships"
 	return func(ctx context.Context, operation string) bool {
-		r := regexp.MustCompile(skipMatcher)
+		r := regexp.MustCompile(skipRegexp)
 		return !r.MatchString(operation)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -245,9 +245,9 @@ func requireRobotAccountMatcher() selector.MatchFunc {`
`245`	`245`
`246`	`246`	`// Matches all operations that require to have a current organization`
`247`	`247`	`func requireAllButOrganizationOperationsMatcher() selector.MatchFunc {`
`248`		`- const skipMatcher = "/controlplane.v1.OrganizationService/Create"`
	`248`	`+ const skipRegexp = "/controlplane.v1.OrganizationService/Create\|/controlplane.v1.UserService/ListMemberships"`
`249`	`249`	`return func(ctx context.Context, operation string) bool {`
`250`		`- r := regexp.MustCompile(skipMatcher)`
	`250`	`+ r := regexp.MustCompile(skipRegexp)`
`251`	`251`	`return !r.MatchString(operation)`
`252`	`252`	`}`
`253`	`253`	`}`