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

fix: language.Tag marshalling (#1110)

Browse Source 
* fix(searchlimit): increase to 1000

* rafactor: remove unused return

* fix(user): marshalling of language tag

* fix(spooler): shuffle handlers on start

* fix(sql): reduce max open conns from 200 to 25 per pod

* chore(deps): google.golang.org/grpc and github.com/lib/pq

* chore(deps): update github.com/cockroachdb/cockroach-go/v2
This commit is contained in:
Silvan
2020-12-17 08:55:11 +01:00
committed by GitHub
parent 055cdf98ed
commit 584bcda108
14 changed files with 120 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/user/repository/eventsourcing/model/user_human.go
View File

@@ -12,7 +12,7 @@ import (
)
type Human struct {
*User `json:"-"`
user *User `json:"-"`
*Password
*Profile
@@ -231,27 +231,27 @@ func (h *Human) AppendEvent(event *es_models.Event) (err error) {
}
func (h *Human) ComputeObject() {
if h.State == int32(model.UserStateUnspecified) || h.State == int32(model.UserStateInitial) {
if h.user.State == int32(model.UserStateUnspecified) || h.user.State == int32(model.UserStateInitial) {
if h.Email != nil && h.IsEmailVerified {
h.State = int32(model.UserStateActive)
h.user.State = int32(model.UserStateActive)
} else {
h.State = int32(model.UserStateInitial)
h.user.State = int32(model.UserStateInitial)
}
}
if h.Password != nil && h.Password.ObjectRoot.IsZero() {
h.Password.ObjectRoot = h.User.ObjectRoot
h.Password.ObjectRoot = h.user.ObjectRoot
}
if h.Profile != nil && h.Profile.ObjectRoot.IsZero() {
h.Profile.ObjectRoot = h.User.ObjectRoot
h.Profile.ObjectRoot = h.user.ObjectRoot
}
if h.Email != nil && h.Email.ObjectRoot.IsZero() {
h.Email.ObjectRoot = h.User.ObjectRoot
h.Email.ObjectRoot = h.user.ObjectRoot
}
if h.Phone != nil && h.Phone.ObjectRoot.IsZero() {
h.Phone.ObjectRoot = h.User.ObjectRoot
h.Phone.ObjectRoot = h.user.ObjectRoot
}
if h.Address != nil && h.Address.ObjectRoot.IsZero() {
h.Address.ObjectRoot = h.User.ObjectRoot
h.Address.ObjectRoot = h.user.ObjectRoot
}
}