diff --git a/perxis-proto b/perxis-proto index f000812a1eef24093c0d0abf1318e3179b679773..8606df02e0df6807e503bf22471a295020a47fba 160000 --- a/perxis-proto +++ b/perxis-proto @@ -1 +1 @@ -Subproject commit f000812a1eef24093c0d0abf1318e3179b679773 +Subproject commit 8606df02e0df6807e503bf22471a295020a47fba diff --git a/pkg/auth/user.go b/pkg/auth/user.go index a4500c140ee48d80b97000fd3f703da8be7c782d..00c817e23b3906bb1a5dd62cfac4e73a22228728 100644 --- a/pkg/auth/user.go +++ b/pkg/auth/user.go @@ -42,6 +42,7 @@ func (u UserPrincipal) Format(f fmt.State, verb rune) { func (u *UserPrincipal) Space(spaceID string) SpaceAccessor { u.spaceID = spaceID u.orgID = "" + u.hasMemberRole = false return u } @@ -55,6 +56,8 @@ func (u *UserPrincipal) getSpace(ctx context.Context, spaceID string) *spaces.Sp func (u UserPrincipal) Organization(orgID string) OrganizationAccessor { u.orgID = orgID + u.spaceID = "" + u.hasMemberRole = false return &u } diff --git a/pkg/spaces/middleware/caching_middleware.go b/pkg/spaces/middleware/caching_middleware.go index 28081245e038b3527e3e8b7b68d10ff53c2488d5..99c50a90e56fc8d25a34eca38962689f48f5abf3 100644 --- a/pkg/spaces/middleware/caching_middleware.go +++ b/pkg/spaces/middleware/caching_middleware.go @@ -112,8 +112,10 @@ func (m cachingMiddleware) Transfer(ctx context.Context, spaceID, transferToOrg if e == nil { space := value.(*service.Space) m.cache.Remove(orgKey(space.OrgID)) + m.cache.Remove(orgKey(space.TransferToOrg)) } m.cache.Remove(spaceID) + m.cache.Remove(transferToOrg) } return err } @@ -125,6 +127,7 @@ func (m cachingMiddleware) AbortTransfer(ctx context.Context, spaceID string) er if e == nil { space := value.(*service.Space) m.cache.Remove(orgKey(space.OrgID)) + m.cache.Remove(orgKey(space.TransferToOrg)) } m.cache.Remove(spaceID) } @@ -142,6 +145,7 @@ func (m cachingMiddleware) Move(ctx context.Context, spaceID, orgID string) erro if e == nil { space := value.(*service.Space) m.cache.Remove(orgKey(space.OrgID)) + m.cache.Remove(orgKey(space.TransferToOrg)) } m.cache.Remove(spaceID) m.cache.Remove(orgID)