Merge remote-tracking branch 'origin/master' into feature/PRXS-1296-AddDBVersionToSDK

perxis-proto @ 8606df02

-Subproject commit f000812a1eef24093c0d0abf1318e3179b679773
+Subproject commit 8606df02e0df6807e503bf22471a295020a47fba

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
 }
 

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)