Skip to content
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

Jump to bottom

SpaceShareUpdated Event #4631

Merged
merged 1 commit into from
Apr 15, 2024
Merged

SpaceShareUpdated Event #4631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions changelog/unreleased/space-share-updated.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Enhancement: Add space-share-updated event

This event is triggered when a share on a space root (aka space membership) is changed

https://github.com/cs3org/reva/pull/4631
12 changes: 12 additions & 0 deletions internal/grpc/interceptors/eventsmiddleware/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,18 @@ func SpaceShared(r *provider.AddGrantResponse, req *provider.AddGrantRequest, ex
}
}

// SpaceShareUpdated converts the response to an events
func SpaceShareUpdated(r *provider.UpdateGrantResponse, req *provider.UpdateGrantRequest, executant *user.UserId) events.SpaceShareUpdated {
id := storagespace.FormatStorageID(req.Ref.ResourceId.StorageId, req.Ref.ResourceId.SpaceId)
return events.SpaceShareUpdated{
Executant: executant,
GranteeUserID: req.Grant.GetGrantee().GetUserId(),
GranteeGroupID: req.Grant.GetGrantee().GetGroupId(),
ID: &provider.StorageSpaceId{OpaqueId: id},
Timestamp: time.Now(),
}
}

// SpaceUnshared converts the response to an event
func SpaceUnshared(r *provider.RemoveGrantResponse, req *provider.RemoveGrantRequest, executant *user.UserId) events.SpaceUnshared {
id := storagespace.FormatStorageID(req.Ref.ResourceId.StorageId, req.Ref.ResourceId.SpaceId)
Expand Down
5 changes: 5 additions & 0 deletions internal/grpc/interceptors/eventsmiddleware/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,11 @@ func NewUnary(m map[string]interface{}) (grpc.UnaryServerInterceptor, int, error
if isSuccess(v) && utils.ExistsInOpaque(r.Opaque, "spacegrant") {
ev = SpaceShared(v, r, executantID)
}
case *provider.UpdateGrantResponse:
r := req.(*provider.UpdateGrantRequest)
if isSuccess(v) && utils.ExistsInOpaque(r.Opaque, "spacegrant") {
ev = SpaceShareUpdated(v, r, executantID)
}
case *provider.RemoveGrantResponse:
r := req.(*provider.RemoveGrantRequest)
if isSuccess(v) && utils.ExistsInOpaque(r.Opaque, "spacegrant") {
Expand Down
16 changes: 16 additions & 0 deletions pkg/events/spaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,22 @@ func (SpaceShared) Unmarshal(v []byte) (interface{}, error) {
return e, err
}

// SpaceShareUpdated is emitted when a space share is updated
type SpaceShareUpdated struct {
Executant *user.UserId
GranteeUserID *user.UserId
GranteeGroupID *group.GroupId
ID *provider.StorageSpaceId
Timestamp time.Time
}

// Unmarshal to fulfill umarshaller interface
func (SpaceShareUpdated) Unmarshal(v []byte) (interface{}, error) {
ev := SpaceShareUpdated{}
err := json.Unmarshal(v, &ev)
return ev, err
}

// SpaceUnshared is emitted when a space is unshared
type SpaceUnshared struct {
Executant *user.UserId
Expand Down
Loading