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

fix: handle logout correctly on tokens (#1803)

Browse Source
This commit is contained in:
Livio Amstutz
2021-06-01 13:30:29 +02:00
committed by GitHub
parent a625a86124
commit 92506d69c0
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/user/repository/view/model/token.go
View File

@@ -79,6 +79,16 @@ func (t *TokenView) AppendEventIfMyToken(event *es_models.Event) (err error) {
case usr_es_model.UserTokenAdded:
view.setRootData(event)
err = view.setData(event)
case usr_es_model.SignedOut,
usr_es_model.HumanSignedOut:
id, err := agentIDFromSession(event)
if err != nil {
return err
}
if view.UserAgentID == id {
t.Deactivated = true
}
return nil
case usr_es_model.UserRemoved,
usr_es_model.UserDeactivated,
usr_es_model.UserLocked:
@@ -126,3 +136,12 @@ func (t *TokenView) setData(event *es_models.Event) error {
}
return nil
}
func agentIDFromSession(event *es_models.Event) (string, error) {
session := make(map[string]interface{})
if err := json.Unmarshal(event.Data, &session); err != nil {
logging.Log("EVEN-Ghgt3").WithError(err).Error("could not unmarshal event data")
return "", caos_errs.ThrowInternal(nil, "MODEL-GBf32", "could not unmarshal data")
}
return session["userAgentID"].(string), nil
}