TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 00:57:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(auth): efficient user session projection (#7187)

Browse Source 
* fix(auth): cache users during session projection

* fix(auth.user_sessions): add index for more efficient by user search
This commit is contained in:
Silvan
2024-01-09 19:36:46 +01:00
committed by GitHub
parent 039a1e793b
commit 43f1d59649
6 changed files with 142 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/auth/repository/eventsourcing/handler/user_session.go
View File

@@ -296,11 +296,24 @@ func (u *UserSession) Reduce(event eventstore.Event) (_ *handler.Statement, err
}
func (u *UserSession) appendEventOnSessions(sessions []*view_model.UserSessionView, event eventstore.Event) error {
users := make(map[string]*view_model.UserView)
usersByID := func(userID, instanceID string) (user *view_model.UserView, err error) {
user, ok := users[userID+"-"+instanceID]
if ok {
return user, nil
}
users[userID+"-"+instanceID], err = u.view.UserByID(userID, instanceID)
if err != nil {
return nil, err
}
return users[userID+"-"+instanceID], nil
}
for _, session := range sessions {
if err := session.AppendEvent(event); err != nil {
return err
}
if err := u.fillUserInfo(session); err != nil {
if err := u.fillUserInfo(session, usersByID); err != nil {
return err
}
}
@@ -311,7 +324,7 @@ func (u *UserSession) updateSession(session *view_model.UserSessionView, event e
if err := session.AppendEvent(event); err != nil {
return err
}
if err := u.fillUserInfo(session); err != nil {
if err := u.fillUserInfo(session, u.view.UserByID); err != nil {
return err
}
if err := u.view.PutUserSession(session); err != nil {
@@ -320,8 +333,8 @@ func (u *UserSession) updateSession(session *view_model.UserSessionView, event e
return nil
}
func (u *UserSession) fillUserInfo(session *view_model.UserSessionView) error {
user, err := u.view.UserByID(session.UserID, session.InstanceID)
func (u *UserSession) fillUserInfo(session *view_model.UserSessionView, getUserByID func(userID, instanceID string) (*view_model.UserView, error)) error {
user, err := getUserByID(session.UserID, session.InstanceID)
if err != nil {
return err
}

94
internal/auth/repository/eventsourcing/handler/user_session_test.go Normal file
View File

@@ -0,0 +1,94 @@
package handler
import (
"testing"
view_model "github.com/zitadel/zitadel/internal/user/repository/view/model"
)
// tests the proper working of the cache function
func TestUserSession_fillUserInfo(t *testing.T) {
type args struct {
sessions []*view_model.UserSessionView
}
tests := []struct {
name string
args args
cacheHits map[string]int
}{
{
name: "one session",
args: args{
sessions: []*view_model.UserSessionView{
{
UserID: "user",
InstanceID: "instance",
},
},
},
cacheHits: map[string]int{
"user-instance": 1,
},
},
{
name: "same user",
args: args{
sessions: []*view_model.UserSessionView{
{
UserID: "user",
InstanceID: "instance",
},
{
UserID: "user",
InstanceID: "instance",
},
},
},
cacheHits: map[string]int{
"user-instance": 2,
},
},
{
name: "different users",
args: args{
sessions: []*view_model.UserSessionView{
{
UserID: "user",
InstanceID: "instance",
},
{
UserID: "user2",
InstanceID: "instance",
},
},
},
cacheHits: map[string]int{
"user-instance": 1,
"user2-instance": 1,
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
cache := map[string]int{}
getUserByID := func(userID, instanceID string) (*view_model.UserView, error) {
cache[userID+"-"+instanceID]++
return &view_model.UserView{HumanView: &view_model.HumanView{}}, nil
}
for _, session := range tt.args.sessions {
if err := new(UserSession).fillUserInfo(session, getUserByID); err != nil {
t.Errorf("UserSession.fillUserInfo() unexpected error = %v", err)
}
}
if len(cache) != len(tt.cacheHits) {
t.Errorf("unexpected length of cache hits: want %d, got %d", len(tt.cacheHits), len(cache))
return
}
for key, count := range tt.cacheHits {
if cache[key] != count {
t.Errorf("unexpected cache hits on %s: want %d, got %d", key, count, cache[key])
}
}
})
}
}