SpaceMembershipExpired event

Signed-off-by: jkoberg <[email protected]>
cs3org · Jan 10, 2023 · 64f47dc · 64f47dc
1 parent eedd22c
commit 64f47dc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/pkg/events/sharing.go b/pkg/events/sharing.go
@@ -88,7 +88,7 @@ func (ShareUpdated) Unmarshal(v []byte) (interface{}, error) {
 	return e, err
 }
 
-// ShareExpired is emitted when a share is removed
+// ShareExpired is emitted when a share expires
 type ShareExpired struct {
 	ShareOwner *user.UserId
 	ItemID     *provider.ResourceId

diff --git a/pkg/events/spaces.go b/pkg/events/spaces.go
@@ -20,6 +20,7 @@ package events
 
 import (
 	"encoding/json"
+	"time"
 
 	group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1"
 	user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
@@ -145,3 +146,21 @@ func (SpaceUpdated) Unmarshal(v []byte) (interface{}, error) {
 	err := json.Unmarshal(v, &e)
 	return e, err
 }
+
+// SpaceMembershipExpired is emitted when a space membership expires
+type SpaceMembershipExpired struct {
+	SpaceOwner *user.UserId
+	SpaceID    string
+	SpaceName  string
+	ExpiredAt  time.Time
+	// split the protobuf Grantee oneof so we can use stdlib encoding/json
+	GranteeUserID  *user.UserId
+	GranteeGroupID *group.GroupId
+}
+
+// Unmarshal to fulfill umarshaller interface
+func (SpaceMembershipExpired) Unmarshal(v []byte) (interface{}, error) {
+	e := ShareExpired{}
+	err := json.Unmarshal(v, &e)
+	return e, err
+}
diff --git a/pkg/utils/grpc.go b/pkg/utils/grpc.go
@@ -24,8 +24,8 @@ func Impersonate(userID *user.UserId, gwc gateway.GatewayAPIClient, machineAuthA
 	}
 
 	// Get auth context
-	ownerCtx := revactx.ContextSetUser(context.Background(), getUserResponse.User)
-	authRes, err := gwc.Authenticate(ownerCtx, &gateway.AuthenticateRequest{
+	ctx := revactx.ContextSetUser(context.Background(), getUserResponse.User)
+	authRes, err := gwc.Authenticate(ctx, &gateway.AuthenticateRequest{
 		Type:         "machine",
 		ClientId:     "userid:" + userID.OpaqueId,
 		ClientSecret: machineAuthAPIKey,
@@ -37,5 +37,5 @@ func Impersonate(userID *user.UserId, gwc gateway.GatewayAPIClient, machineAuthA
 		return nil, nil, fmt.Errorf("error impersonating user: %s", authRes.Status.Message)
 	}
 
-	return metadata.AppendToOutgoingContext(context.Background(), revactx.TokenHeader, authRes.Token), authRes.GetUser(), nil
+	return metadata.AppendToOutgoingContext(ctx, revactx.TokenHeader, authRes.Token), authRes.GetUser(), nil
 }