snapshot of https://github.com/cortezaproject/corteza.git (2024.9.x, 2026-09-18; blobs > 131072B omitted)
Some checks failed
SonarQube / SonarQube (push) Failing after 5m28s
E2e test on main branch push / server and client test (map[name:admin port:8080]) (push) Failing after 3m33s
Server and lib tests / Library test (js) (push) Failing after 1m36s
Server and lib tests / Library test (vue) (push) Successful in 2m24s
Server and lib tests / Web client test (admin) (push) Successful in 2m52s
Server and lib tests / Web client test (compose) (push) Successful in 3m23s
Server and lib tests / Web client test (discovery) (push) Successful in 2m49s
Server and lib tests / Web client test (one) (push) Successful in 2m52s
Server and lib tests / Web client test (privacy) (push) Successful in 2m44s
Server and lib tests / Web client test (reporter) (push) Successful in 2m56s
Server and lib tests / Web client test (workflow) (push) Successful in 3m0s
Server and lib tests / Server tests (push) Failing after 4m55s
E2e test on main branch push / notify-failure (push) Failing after 9s
Server and lib tests / Send matrix testing notification (push) Successful in 2s
Mark stale issues and pull requests / stale (push) Successful in 40s
Some checks failed
SonarQube / SonarQube (push) Failing after 5m28s
E2e test on main branch push / server and client test (map[name:admin port:8080]) (push) Failing after 3m33s
Server and lib tests / Library test (js) (push) Failing after 1m36s
Server and lib tests / Library test (vue) (push) Successful in 2m24s
Server and lib tests / Web client test (admin) (push) Successful in 2m52s
Server and lib tests / Web client test (compose) (push) Successful in 3m23s
Server and lib tests / Web client test (discovery) (push) Successful in 2m49s
Server and lib tests / Web client test (one) (push) Successful in 2m52s
Server and lib tests / Web client test (privacy) (push) Successful in 2m44s
Server and lib tests / Web client test (reporter) (push) Successful in 2m56s
Server and lib tests / Web client test (workflow) (push) Successful in 3m0s
Server and lib tests / Server tests (push) Failing after 4m55s
E2e test on main branch push / notify-failure (push) Failing after 9s
Server and lib tests / Send matrix testing notification (push) Successful in 2s
Mark stale issues and pull requests / stale (push) Successful in 40s
This commit is contained in:
111
server/pkg/envoy/store/user.go
Normal file
111
server/pkg/envoy/store/user.go
Normal file
@@ -0,0 +1,111 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net/mail"
|
||||
|
||||
"github.com/cortezaproject/corteza/server/pkg/envoy/resource"
|
||||
"github.com/cortezaproject/corteza/server/store"
|
||||
"github.com/cortezaproject/corteza/server/system/types"
|
||||
)
|
||||
|
||||
type (
|
||||
user struct {
|
||||
cfg *EncoderConfig
|
||||
|
||||
res *resource.User
|
||||
u *types.User
|
||||
}
|
||||
)
|
||||
|
||||
// mergeUsers merges b into a, prioritising a
|
||||
func mergeUsers(a, b *types.User) *types.User {
|
||||
c := *a
|
||||
|
||||
if c.Username == "" {
|
||||
c.Username = b.Username
|
||||
}
|
||||
if c.Email == "" {
|
||||
c.Email = b.Email
|
||||
}
|
||||
if c.Name == "" {
|
||||
c.Name = b.Name
|
||||
}
|
||||
if c.Handle == "" {
|
||||
c.Handle = b.Handle
|
||||
}
|
||||
if c.Kind == "" {
|
||||
c.Kind = b.Kind
|
||||
}
|
||||
if c.Meta == nil {
|
||||
c.Meta = b.Meta
|
||||
}
|
||||
|
||||
if c.CreatedAt.IsZero() {
|
||||
c.CreatedAt = b.CreatedAt
|
||||
}
|
||||
if c.UpdatedAt == nil {
|
||||
c.UpdatedAt = b.UpdatedAt
|
||||
}
|
||||
if c.SuspendedAt == nil {
|
||||
c.SuspendedAt = b.SuspendedAt
|
||||
}
|
||||
if c.DeletedAt == nil {
|
||||
c.DeletedAt = b.DeletedAt
|
||||
}
|
||||
|
||||
return &c
|
||||
}
|
||||
|
||||
// findUser looks for the user in the resources & the store
|
||||
//
|
||||
// Provided resources are prioritized.
|
||||
func findUser(ctx context.Context, s store.Storer, rr resource.InterfaceSet, ii resource.Identifiers) (u *types.User, err error) {
|
||||
u = resource.FindUser(rr, ii)
|
||||
if u != nil {
|
||||
return u, nil
|
||||
}
|
||||
|
||||
return findUserStore(ctx, s, makeGenericFilter(ii))
|
||||
}
|
||||
|
||||
// findUserStore looks for the user in the store
|
||||
func findUserStore(ctx context.Context, s store.Storer, gf genericFilter) (u *types.User, err error) {
|
||||
if gf.id > 0 {
|
||||
u, err = store.LookupUserByID(ctx, s, gf.id)
|
||||
if err != nil && err != store.ErrNotFound {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if u != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
for _, i := range gf.identifiers {
|
||||
// email
|
||||
if _, err = mail.ParseAddress(i); err == nil {
|
||||
u, err = store.LookupUserByEmail(ctx, s, i)
|
||||
if err == store.ErrNotFound {
|
||||
return nil, nil
|
||||
} else if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
// Handle & username
|
||||
u, err = store.LookupUserByHandle(ctx, s, i)
|
||||
if err == store.ErrNotFound {
|
||||
u, err = store.LookupUserByUsername(ctx, s, i)
|
||||
}
|
||||
if err != nil && err != store.ErrNotFound {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if u != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
return nil, nil
|
||||
}
|
||||
Reference in New Issue
Block a user