Skip to content
Snippets Groups Projects
Commit 7aa1d497 authored by Pavel Antonov's avatar Pavel Antonov :asterisk:
Browse files

fix(core): Исправлена ошибка, из-за которой проверка на принадлежность...

fix(core): Исправлена ошибка, из-за которой проверка на принадлежность пользователя к разным организациям отрабатывала некорректно. Добавлена очистка кэша при переносе пространства

Close #PRXS-1297
parents 477cddc6 7a1ad756
No related branches found
No related tags found
No related merge requests found
Subproject commit f000812a1eef24093c0d0abf1318e3179b679773 Subproject commit 8606df02e0df6807e503bf22471a295020a47fba
...@@ -42,6 +42,7 @@ func (u UserPrincipal) Format(f fmt.State, verb rune) { ...@@ -42,6 +42,7 @@ func (u UserPrincipal) Format(f fmt.State, verb rune) {
func (u *UserPrincipal) Space(spaceID string) SpaceAccessor { func (u *UserPrincipal) Space(spaceID string) SpaceAccessor {
u.spaceID = spaceID u.spaceID = spaceID
u.orgID = "" u.orgID = ""
u.hasMemberRole = false
return u return u
} }
...@@ -55,6 +56,8 @@ func (u *UserPrincipal) getSpace(ctx context.Context, spaceID string) *spaces.Sp ...@@ -55,6 +56,8 @@ func (u *UserPrincipal) getSpace(ctx context.Context, spaceID string) *spaces.Sp
func (u UserPrincipal) Organization(orgID string) OrganizationAccessor { func (u UserPrincipal) Organization(orgID string) OrganizationAccessor {
u.orgID = orgID u.orgID = orgID
u.spaceID = ""
u.hasMemberRole = false
return &u return &u
} }
......
...@@ -112,6 +112,7 @@ func (m cachingMiddleware) Transfer(ctx context.Context, spaceID, transferToOrg ...@@ -112,6 +112,7 @@ func (m cachingMiddleware) Transfer(ctx context.Context, spaceID, transferToOrg
if e == nil { if e == nil {
space := value.(*service.Space) space := value.(*service.Space)
m.cache.Remove(orgKey(space.OrgID)) m.cache.Remove(orgKey(space.OrgID))
m.cache.Remove(orgKey(space.TransferToOrg))
} }
m.cache.Remove(spaceID) m.cache.Remove(spaceID)
} }
...@@ -125,6 +126,7 @@ func (m cachingMiddleware) AbortTransfer(ctx context.Context, spaceID string) er ...@@ -125,6 +126,7 @@ func (m cachingMiddleware) AbortTransfer(ctx context.Context, spaceID string) er
if e == nil { if e == nil {
space := value.(*service.Space) space := value.(*service.Space)
m.cache.Remove(orgKey(space.OrgID)) m.cache.Remove(orgKey(space.OrgID))
m.cache.Remove(orgKey(space.TransferToOrg))
} }
m.cache.Remove(spaceID) m.cache.Remove(spaceID)
} }
...@@ -141,7 +143,7 @@ func (m cachingMiddleware) Move(ctx context.Context, spaceID, orgID string) erro ...@@ -141,7 +143,7 @@ func (m cachingMiddleware) Move(ctx context.Context, spaceID, orgID string) erro
value, e := m.cache.Get(spaceID) value, e := m.cache.Get(spaceID)
if e == nil { if e == nil {
space := value.(*service.Space) space := value.(*service.Space)
m.cache.Remove(orgKey(space.OrgID)) m.cache.Remove(orgKey(space.TransferToOrg))
} }
m.cache.Remove(spaceID) m.cache.Remove(spaceID)
m.cache.Remove(orgID) m.cache.Remove(orgID)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment