TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-02-28 22:47:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: failed events (#211)

Browse Source 
* fix: add iam roles to permissions

* fix: show state initial on usersearch

* fix: search project roles returns only roles of project

* fix: add project member owner on project create

* fix: create new object oon failed event

* feat: parse error body on chat message

* feat: remove comment

* fix: set policy eventstore in admin

* fix failed events

* fix resend for password set

* fix: create user with correct resource owner

Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
This commit is contained in:
Livio Amstutz 2020-06-11 14:59:57 +02:00 committed by GitHub
parent ddf9434282
commit 44d41b8d97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/login/handler/init_password_handler.go
View File

@ -68,7 +68,11 @@ func (l *Login) checkPWCode(w http.ResponseWriter, r *http.Request, authReq *mod
}
func (l *Login) resendPasswordSet(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest) {
err := l.authRepo.RequestPasswordReset(r.Context(), authReq.UserName)
userOrg := login
if authReq != nil {
userOrg = authReq.UserOrgID
}
err := l.authRepo.RequestPasswordReset(setContext(r.Context(), userOrg), authReq.UserName)
l.renderInitPassword(w, r, authReq, authReq.UserID, "", err)
}

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

@ -60,7 +60,7 @@ func UserCreateAggregate(ctx context.Context, aggCreator *es_models.AggregateCre
var agg *es_models.Aggregate
if resourceOwner != "" {
agg, err = UserAggregateOverwriteContext(ctx, aggCreator, user, user.AggregateID, resourceOwner)
agg, err = UserAggregateOverwriteContext(ctx, aggCreator, user, resourceOwner, user.AggregateID)
} else {
agg, err = UserAggregate(ctx, aggCreator, user)
}

6
internal/view/failed_events.go
View File

@ -13,9 +13,9 @@ const (
type FailedEvent struct {
ViewName string `gorm:"column:view_name;primary_key"`
FailedSequence uint64 `gorm:"column:failed_sequence;primary_key`
FailureCount uint64 `gorm:"column:failure_count`
ErrMsg string `gorm:"column:err_msg`
FailedSequence uint64 `gorm:"column:failed_sequence;primary_key"`
FailureCount uint64 `gorm:"column:failure_count"`
ErrMsg string `gorm:"column:err_msg"`
}
type FailedEventSearchQuery struct {

2
internal/view/sequence.go
View File

@ -11,7 +11,7 @@ type actualSequece struct {
type currentSequence struct {
ViewName string `gorm:"column:view_name;primary_key"`
CurrentSequence uint64 `gorm:"column:current_sequence`
CurrentSequence uint64 `gorm:"column:current_sequence"`
}
type SequenceSearchKey int32