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

fix: todos (#1346)

Browse Source 
* fix: pub sub in new eventstore

* fix: todos

* fix: todos

* fix: todos

* fix: todos

* fix: todos
This commit is contained in:
Fabi
2021-03-01 08:48:50 +01:00
committed by GitHub
parent c0f55e7209
commit 3c07a186fc
145 changed files with 645 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
package model
import (
"github.com/caos/zitadel/internal/model"
"github.com/caos/zitadel/internal/domain"
"time"
)
@@ -37,7 +37,7 @@ const (
type ExternalIDPSearchQuery struct {
Key ExternalIDPSearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}
@@ -57,5 +57,5 @@ func (r *ExternalIDPSearchRequest) EnsureLimit(limit uint64) {
}
func (r *ExternalIDPSearchRequest) AppendUserQuery(userID string) {
r.Queries = append(r.Queries, &ExternalIDPSearchQuery{Key: ExternalIDPSearchKeyUserID, Method: model.SearchMethodEquals, Value: userID})
r.Queries = append(r.Queries, &ExternalIDPSearchQuery{Key: ExternalIDPSearchKeyUserID, Method: domain.SearchMethodEquals, Value: userID})
}

4
internal/user/model/notify_user.go
View File

@@ -1,7 +1,7 @@
package model
import (
"github.com/caos/zitadel/internal/model"
"github.com/caos/zitadel/internal/domain"
"time"
)
@@ -45,7 +45,7 @@ const (
type NotifyUserSearchQuery struct {
Key NotifyUserSearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value string
}

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

@@ -1,9 +1,8 @@
package model
import (
"github.com/caos/zitadel/internal/domain"
"time"
"github.com/caos/zitadel/internal/model"
)
type TokenView struct {
@@ -43,7 +42,7 @@ const (
type TokenSearchQuery struct {
Key TokenSearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}

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

@@ -1,9 +1,8 @@
package model
import (
"github.com/caos/zitadel/internal/domain"
"time"
"github.com/caos/zitadel/internal/model"
)
type UserMembershipView struct {
@@ -53,7 +52,7 @@ const (
type UserMembershipSearchQuery struct {
Key UserMembershipSearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}
@@ -82,9 +81,9 @@ func (r *UserMembershipSearchRequest) GetSearchQuery(key UserMembershipSearchKey
}
func (r *UserMembershipSearchRequest) AppendResourceOwnerAndIamQuery(orgID, iamID string) {
r.Queries = append(r.Queries, &UserMembershipSearchQuery{Key: UserMembershipSearchKeyResourceOwner, Method: model.SearchMethodIsOneOf, Value: []string{orgID, iamID}})
r.Queries = append(r.Queries, &UserMembershipSearchQuery{Key: UserMembershipSearchKeyResourceOwner, Method: domain.SearchMethodIsOneOf, Value: []string{orgID, iamID}})
}
func (r *UserMembershipSearchRequest) AppendUserIDQuery(userID string) {
r.Queries = append(r.Queries, &UserMembershipSearchQuery{Key: UserMembershipSearchKeyUserID, Method: model.SearchMethodEquals, Value: userID})
r.Queries = append(r.Queries, &UserMembershipSearchQuery{Key: UserMembershipSearchKeyUserID, Method: domain.SearchMethodEquals, Value: userID})
}

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

@@ -1,10 +1,10 @@
package model
import (
"github.com/caos/zitadel/internal/domain"
"time"
req_model "github.com/caos/zitadel/internal/auth_request/model"
"github.com/caos/zitadel/internal/model"
)
type UserSessionView struct {
@@ -48,7 +48,7 @@ const (
type UserSessionSearchQuery struct {
Key UserSessionSearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}

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

@@ -10,7 +10,6 @@ import (
"github.com/caos/zitadel/internal/errors"
"github.com/caos/zitadel/internal/eventstore/v1/models"
iam_model "github.com/caos/zitadel/internal/iam/model"
"github.com/caos/zitadel/internal/model"
)
type UserView struct {
@@ -95,7 +94,7 @@ const (
type UserSearchQuery struct {
Key UserSearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}
@@ -136,7 +135,7 @@ func (r *UserSearchRequest) EnsureLimit(limit uint64) {
}
func (r *UserSearchRequest) AppendMyOrgQuery(orgID string) {
r.Queries = append(r.Queries, &UserSearchQuery{Key: UserSearchKeyResourceOwner, Method: model.SearchMethodEquals, Value: orgID})
r.Queries = append(r.Queries, &UserSearchQuery{Key: UserSearchKeyResourceOwner, Method: domain.SearchMethodEquals, Value: orgID})
}
func (u *UserView) MFATypesSetupPossible(level domain.MFALevel, policy *domain.LoginPolicy) []domain.MFAType {