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

fix: flags on application view (#910)

Browse Source 
* wg24q

* fix: set ProjectRoleCheck and ProjectRoleAssertion on added application
This commit is contained in:
Silvan
2020-10-27 15:53:36 +01:00
committed by GitHub
parent 9d009beb36
commit e686268e81
4 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,12 +24,12 @@ const (
tokenTable = "auth.tokens"
)
func (u *Token) ViewModel() string {
func (t *Token) ViewModel() string {
return tokenTable
}
func (u *Token) EventQuery() (*models.SearchQuery, error) {
sequence, err := u.view.GetLatestTokenSequence()
func (t *Token) EventQuery() (*models.SearchQuery, error) {
sequence, err := t.view.GetLatestTokenSequence()
if err != nil {
return nil, err
}
@@ -41,7 +41,7 @@ func (u *Token) EventQuery() (*models.SearchQuery, error) {
LatestSequenceFilter(sequence.CurrentSequence), nil
}
func (u *Token) Reduce(event *models.Event) (err error) {
func (t *Token) Reduce(event *models.Event) (err error) {
switch event.Type {
case user_es_model.UserTokenAdded:
token := new(view_model.TokenView)
@@ -49,40 +49,40 @@ func (u *Token) Reduce(event *models.Event) (err error) {
if err != nil {
return err
}
return u.view.PutToken(token)
return t.view.PutToken(token)
case user_es_model.UserProfileChanged,
user_es_model.HumanProfileChanged:
user := new(view_model.UserView)
user.AppendEvent(event)
tokens, err := u.view.TokensByUserID(event.AggregateID)
tokens, err := t.view.TokensByUserID(event.AggregateID)
if err != nil {
return err
}
for _, token := range tokens {
token.PreferredLanguage = user.PreferredLanguage
}
return u.view.PutTokens(tokens, event.Sequence)
return t.view.PutTokens(tokens, event.Sequence)
case user_es_model.SignedOut,
user_es_model.HumanSignedOut:
id, err := agentIDFromSession(event)
if err != nil {
return err
}
return u.view.DeleteSessionTokens(id, event.AggregateID, event.Sequence)
return t.view.DeleteSessionTokens(id, event.AggregateID, event.Sequence)
case user_es_model.UserLocked,
user_es_model.UserDeactivated,
user_es_model.UserRemoved:
return u.view.DeleteUserTokens(event.AggregateID, event.Sequence)
return t.view.DeleteUserTokens(event.AggregateID, event.Sequence)
case project_es_model.ApplicationDeactivated,
project_es_model.ApplicationRemoved:
application, err := applicationFromSession(event)
if err != nil {
return err
}
return u.view.DeleteApplicationTokens(event.Sequence, application.AppID)
return t.view.DeleteApplicationTokens(event.Sequence, application.AppID)
case project_es_model.ProjectDeactivated,
project_es_model.ProjectRemoved:
project, err := u.ProjectEvents.ProjectByID(context.Background(), event.AggregateID)
project, err := t.ProjectEvents.ProjectByID(context.Background(), event.AggregateID)
if err != nil {
return err
}
@@ -90,15 +90,15 @@ func (u *Token) Reduce(event *models.Event) (err error) {
for _, app := range project.Applications {
applicationsIDs = append(applicationsIDs, app.AppID)
}
return u.view.DeleteApplicationTokens(event.Sequence, applicationsIDs...)
return t.view.DeleteApplicationTokens(event.Sequence, applicationsIDs...)
default:
return u.view.ProcessedTokenSequence(event.Sequence)
return t.view.ProcessedTokenSequence(event.Sequence)
}
}
func (u *Token) OnError(event *models.Event, err error) error {
func (t *Token) OnError(event *models.Event, err error) error {
logging.LogWithFields("SPOOL-3jkl4", "id", event.AggregateID).WithError(err).Warn("something went wrong in token handler")
return spooler.HandleError(event, err, u.view.GetLatestTokenFailedEvent, u.view.ProcessedTokenFailedEvent, u.view.ProcessedTokenSequence, u.errorCountUntilSkip)
return spooler.HandleError(event, err, t.view.GetLatestTokenFailedEvent, t.view.ProcessedTokenFailedEvent, t.view.ProcessedTokenSequence, t.errorCountUntilSkip)
}
func agentIDFromSession(event *models.Event) (string, error) {