Merge pull request #28 from ConductorOne/bt/expand_user_grants

btipling · web-flow · commit 860e13dcbf06 · 2025-03-10T10:24:22.000-07:00
Also grant expand user access. Marcus reviewed this change.
diff --git a/pkg/connector/pages.go b/pkg/connector/pages.go
@@ -197,9 +197,10 @@ func (s *pageSyncer) Grants(ctx context.Context, resource *v2.Resource, pToken *
 				},
 			}
 
-			newGrant := grant.NewGrant(resource, fmt.Sprintf("%s:%s", "group", level), groupId, grant.WithAnnotation(grantExpandable))
+			newGroupGrant := grant.NewGrant(resource, fmt.Sprintf("%s:%s", "group", level), groupId, grant.WithAnnotation(grantExpandable))
+			newUserGrant := grant.NewGrant(resource, fmt.Sprintf("%s:%s", "user", level), groupId, grant.WithAnnotation(grantExpandable))
 
-			ret = append(ret, newGrant)
+			ret = append(ret, newGroupGrant, newUserGrant)
 		}
 
 		bag.Pop()

Original file line number	Diff line number	Diff line change
`@@ -197,9 +197,10 @@ func (s pageSyncer) Grants(ctx context.Context, resource v2.Resource, pToken *`
`197`	`197`	`},`
`198`	`198`	`}`
`199`	`199`
`200`		`- newGrant := grant.NewGrant(resource, fmt.Sprintf("%s:%s", "group", level), groupId, grant.WithAnnotation(grantExpandable))`
	`200`	`+ newGroupGrant := grant.NewGrant(resource, fmt.Sprintf("%s:%s", "group", level), groupId, grant.WithAnnotation(grantExpandable))`
	`201`	`+ newUserGrant := grant.NewGrant(resource, fmt.Sprintf("%s:%s", "user", level), groupId, grant.WithAnnotation(grantExpandable))`
`201`	`202`
`202`		`- ret = append(ret, newGrant)`
	`203`	`+ ret = append(ret, newGroupGrant, newUserGrant)`
`203`	`204`	`}`
`204`	`205`
`205`	`206`	`bag.Pop()`