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

fix: new es fix (#1532)

Browse Source 
* fix: handle ListMyProjectOrgsRequestToModel queries

* fix: sort orgs for admin org list by org name

* fix: features converters

* fix: remove last role from user grant

* fix: ensure limit

* fix: ensure limit

Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Fabi
2021-04-06 16:03:07 +02:00
committed by GitHub
parent efc90b382c
commit 08bfec6652
38 changed files with 325 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/user/model/external_idp_view.go
View File

@@ -2,6 +2,8 @@ package model
import (
"github.com/caos/zitadel/internal/domain"
caos_errors "github.com/caos/zitadel/internal/errors"
"time"
)
@@ -50,10 +52,14 @@ type ExternalIDPSearchResponse struct {
Timestamp time.Time
}
func (r *ExternalIDPSearchRequest) EnsureLimit(limit uint64) {
if r.Limit == 0 || r.Limit > limit {
func (r *ExternalIDPSearchRequest) EnsureLimit(limit uint64) error {
if r.Limit > limit {
return caos_errors.ThrowInvalidArgument(nil, "SEARCH-3n8fM", "Errors.Limit.ExceedsDefault")
}
if r.Limit == 0 {
r.Limit = limit
}
return nil
}
func (r *ExternalIDPSearchRequest) AppendUserQuery(userID string) {

10
internal/user/model/token_view.go
View File

@@ -2,6 +2,8 @@ package model
import (
"github.com/caos/zitadel/internal/domain"
caos_errors "github.com/caos/zitadel/internal/errors"
"time"
)
@@ -53,8 +55,12 @@ type TokenSearchResponse struct {
Result []*Token
}
func (r *TokenSearchRequest) EnsureLimit(limit uint64) {
if r.Limit == 0 || r.Limit > limit {
func (r *TokenSearchRequest) EnsureLimit(limit uint64) error {
if r.Limit > limit {
return caos_errors.ThrowInvalidArgument(nil, "SEARCH-M0fse", "Errors.Limit.ExceedsDefault")
}
if r.Limit == 0 {
r.Limit = limit
}
return nil
}

10
internal/user/model/user_membership_view.go
View File

@@ -2,6 +2,8 @@ package model
import (
"github.com/caos/zitadel/internal/domain"
caos_errors "github.com/caos/zitadel/internal/errors"
"time"
)
@@ -65,10 +67,14 @@ type UserMembershipSearchResponse struct {
Timestamp time.Time
}
func (r *UserMembershipSearchRequest) EnsureLimit(limit uint64) {
if r.Limit == 0 || r.Limit > limit {
func (r *UserMembershipSearchRequest) EnsureLimit(limit uint64) error {
if r.Limit > limit {
return caos_errors.ThrowInvalidArgument(nil, "SEARCH-288fJ", "Errors.Limit.ExceedsDefault")
}
if r.Limit == 0 {
r.Limit = limit
}
return nil
}
func (r *UserMembershipSearchRequest) GetSearchQuery(key UserMembershipSearchKey) (int, *UserMembershipSearchQuery) {

10
internal/user/model/user_session_view.go
View File

@@ -2,6 +2,8 @@ package model
import (
"github.com/caos/zitadel/internal/domain"
caos_errors "github.com/caos/zitadel/internal/errors"
"time"
req_model "github.com/caos/zitadel/internal/auth_request/model"
@@ -59,8 +61,12 @@ type UserSessionSearchResponse struct {
Result []*UserSessionView
}
func (r *UserSessionSearchRequest) EnsureLimit(limit uint64) {
if r.Limit == 0 || r.Limit > limit {
func (r *UserSessionSearchRequest) EnsureLimit(limit uint64) error {
if r.Limit > limit {
return caos_errors.ThrowInvalidArgument(nil, "SEARCH-27ifs", "Errors.Limit.ExceedsDefault")
}
if r.Limit == 0 {
r.Limit = limit
}
return nil
}

8
internal/user/model/user_view.go
View File

@@ -128,10 +128,14 @@ const (
GenderDiverse
)
func (r *UserSearchRequest) EnsureLimit(limit uint64) {
if r.Limit == 0 || r.Limit > limit {
func (r *UserSearchRequest) EnsureLimit(limit uint64) error {
if r.Limit > limit {
return errors.ThrowInvalidArgument(nil, "SEARCH-zz62F", "Errors.Limit.ExceedsDefault")
}
if r.Limit == 0 {
r.Limit = limit
}
return nil
}
func (r *UserSearchRequest) AppendMyOrgQuery(orgID string) {