Skip to content

Fix provisioning for pages to user #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
btipling merged 2 commits into from
Feb 21, 2025
Merged

Fix provisioning for pages to user #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c12d197
Fix provisioning for pages to user
MarcusGoldschmidt Feb 19, 2025
c750cb1
Add EntitlementImmutable
MarcusGoldschmidt Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions pkg/connector/pages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ func (s *pageSyncer) Entitlements(ctx context.Context, resource *v2.Resource, pT
for _, level := range accessLevels {
entitlement := ent.NewPermissionEntitlement(
resource,
level,
fmt.Sprintf("%s:%s", "group", level),
ent.WithGrantableTo(resourceTypeGroup),
ent.WithDisplayName(fmt.Sprintf("%s %s Access", resource.DisplayName, titleCase(accessLevelDisplayNames[level]))),
ent.WithDescription(fmt.Sprintf("Has %s access on the %s page", accessLevelDisplayNames[level], resource.DisplayName)),
ent.WithAnnotation(&v2.EntitlementImmutable{}),
)
entitlement.Slug = accessLevelDisplayNames[level]

ret = append(ret, entitlement)
}
Expand All @@ -90,7 +90,6 @@ func (s *pageSyncer) Entitlements(ctx context.Context, resource *v2.Resource, pT
ent.WithDisplayName(fmt.Sprintf("User can %s on %s", titleCase(accessLevelDisplayNames[level]), resource.DisplayName)),
ent.WithDescription(fmt.Sprintf("Has %s access on the %s page", accessLevelDisplayNames[level], resource.DisplayName)),
)
entitlement.Slug = accessLevelDisplayNames[level]

ret = append(ret, entitlement)
}
Expand Down Expand Up @@ -198,7 +197,7 @@ func (s *pageSyncer) Grants(ctx context.Context, resource *v2.Resource, pToken *
},
}

newGrant := grant.NewGrant(resource, level, groupId, grant.WithAnnotation(grantExpandable))
newGrant := grant.NewGrant(resource, fmt.Sprintf("%s:%s", "group", level), groupId, grant.WithAnnotation(grantExpandable))

ret = append(ret, newGrant)
}
Expand All @@ -221,12 +220,12 @@ func (s *pageSyncer) Grant(ctx context.Context, resource *v2.Resource, entitleme
switch resource.Id.ResourceType {
// Grant user to a page
case resourceTypeUser.Id:
userId, err := parseObjectID(entitlement.Resource.Id.Resource)
userId, err := parseObjectID(resource.Id.Resource)
if err != nil {
return nil, nil, err
}

pageID, err := parseObjectID(resource.Id.Resource)
pageID, err := parseObjectID(entitlement.Resource.Id.Resource)
if err != nil {
return nil, nil, err
}
Expand All @@ -247,18 +246,18 @@ func (s *pageSyncer) Grant(ctx context.Context, resource *v2.Resource, entitleme
return []*v2.Grant{newGrant}, nil, nil
// Grant group
case resourceTypeGroup.Id:
groupID, err := parseObjectID(entitlement.Resource.Id.Resource)
groupID, err := parseObjectID(resource.Id.Resource)
if err != nil {
return nil, nil, err
}

pageID, err := parseObjectID(resource.Id.Resource)
pageID, err := parseObjectID(entitlement.Resource.Id.Resource)
if err != nil {
return nil, nil, err
}

splitV := strings.Split(entitlement.Id, ":")
if len(splitV) != 3 {
if len(splitV) != 4 {
return nil, nil, fmt.Errorf("unexpected entitlement ID format while processing page grant: %s", entitlement.Id)
}
accessLevel := splitV[len(splitV)-1]
Expand Down Expand Up @@ -361,7 +360,7 @@ func (s *pageSyncer) Revoke(ctx context.Context, grant *v2.Grant) (annotations.A
}

splitV := strings.Split(grant.Entitlement.Id, ":")
if len(splitV) != 3 {
if len(splitV) != 4 {
return nil, fmt.Errorf("unexpected entitlement ID format while processing page grant: %s", grant.Entitlement.Id)
}
accessLevel := splitV[len(splitV)-1]
Expand Down
Loading