TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:27:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: terminate usersession (#212)

Browse Source
This commit is contained in:
Livio Amstutz
2020-06-11 16:34:54 +02:00
committed by GitHub
parent 44d41b8d97
commit e57d4b1ed4
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/auth/repository/eventsourcing/eventstore/auth_request.go
View File

@@ -317,7 +317,8 @@ func userSessionByIDs(ctx context.Context, provider userSessionViewProvider, eve
case es_model.UserPasswordCheckSucceeded,
es_model.UserPasswordCheckFailed,
es_model.MfaOtpCheckSucceeded,
es_model.MfaOtpCheckFailed:
es_model.MfaOtpCheckFailed,
es_model.SignedOut:
eventData, err := view_model.UserSessionFromEvent(event)
if err != nil {
logging.Log("EVENT-sdgT3").WithError(err).Debug("error getting event data")

4
internal/auth/repository/eventsourcing/handler/token.go
View File

@@ -61,9 +61,9 @@ func (u *Token) OnError(event *models.Event, err error) error {
func agentIDFromSession(event *models.Event) (string, error) {
session := make(map[string]interface{})
if err := json.Unmarshal(event.Data, session); err != nil {
if err := json.Unmarshal(event.Data, &session); err != nil {
logging.Log("EVEN-s3bq9").WithError(err).Error("could not unmarshal event data")
return "", caos_errs.ThrowInternal(nil, "MODEL-sd325", "could not unmarshal data")
}
return session["agentID"].(string), nil
return session["userAgentID"].(string), nil
}

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

@@ -46,7 +46,8 @@ func (u *UserSession) Process(event *models.Event) (err error) {
case es_model.UserPasswordCheckSucceeded,
es_model.UserPasswordCheckFailed,
es_model.MfaOtpCheckSucceeded,
es_model.MfaOtpCheckFailed:
es_model.MfaOtpCheckFailed,
es_model.SignedOut:
eventData, err := view_model.UserSessionFromEvent(event)
if err != nil {
return err

4
internal/user/repository/eventsourcing/user.go
View File

@@ -610,11 +610,11 @@ func MfaOTPRemoveAggregate(aggCreator *es_models.AggregateCreator, existing *mod
func SignOutAggregate(aggCreator *es_models.AggregateCreator, existing *model.User, agentID string) func(ctx context.Context) (*es_models.Aggregate, error) {
return func(ctx context.Context) (*es_models.Aggregate, error) {
agg, err := UserAggregate(ctx, aggCreator, existing)
agg, err := UserAggregateOverwriteContext(ctx, aggCreator, existing, existing.ResourceOwner, existing.AggregateID)
if err != nil {
return nil, err
}
return agg.AppendEvent(model.SignedOut, map[string]interface{}{"agentID": agentID})
return agg.AppendEvent(model.SignedOut, map[string]interface{}{"userAgentID": agentID})
}
}