feat: iam members in admin api (#272)

* feat: iam members in admin api

* feat: add error id in translate error

* fix: resolve merge conflicts
This commit is contained in:
Fabi
2020-06-25 08:12:29 +02:00
committed by GitHub
parent 8bfa1a083c
commit 62b654ea18
27 changed files with 3023 additions and 363 deletions

View File

@@ -2,13 +2,13 @@ package model
import (
global_model "github.com/caos/zitadel/internal/model"
proj_model "github.com/caos/zitadel/internal/org/model"
org_model "github.com/caos/zitadel/internal/org/model"
"github.com/caos/zitadel/internal/view/repository"
)
type OrgMemberSearchRequest proj_model.OrgMemberSearchRequest
type OrgMemberSearchQuery proj_model.OrgMemberSearchQuery
type OrgMemberSearchKey proj_model.OrgMemberSearchKey
type OrgMemberSearchRequest org_model.OrgMemberSearchRequest
type OrgMemberSearchQuery org_model.OrgMemberSearchQuery
type OrgMemberSearchKey org_model.OrgMemberSearchKey
func (req OrgMemberSearchRequest) GetLimit() uint64 {
return req.Limit
@@ -19,7 +19,7 @@ func (req OrgMemberSearchRequest) GetOffset() uint64 {
}
func (req OrgMemberSearchRequest) GetSortingColumn() repository.ColumnKey {
if req.SortingColumn == proj_model.OrgMemberSearchKeyUnspecified {
if req.SortingColumn == org_model.OrgMemberSearchKeyUnspecified {
return nil
}
return OrgMemberSearchKey(req.SortingColumn)
@@ -50,18 +50,18 @@ func (req OrgMemberSearchQuery) GetValue() interface{} {
}
func (key OrgMemberSearchKey) ToColumnName() string {
switch proj_model.OrgMemberSearchKey(key) {
case proj_model.OrgMemberSearchKeyEmail:
switch org_model.OrgMemberSearchKey(key) {
case org_model.OrgMemberSearchKeyEmail:
return OrgMemberKeyEmail
case proj_model.OrgMemberSearchKeyFirstName:
case org_model.OrgMemberSearchKeyFirstName:
return OrgMemberKeyFirstName
case proj_model.OrgMemberSearchKeyLastName:
case org_model.OrgMemberSearchKeyLastName:
return OrgMemberKeyLastName
case proj_model.OrgMemberSearchKeyUserName:
case org_model.OrgMemberSearchKeyUserName:
return OrgMemberKeyUserName
case proj_model.OrgMemberSearchKeyUserID:
case org_model.OrgMemberSearchKeyUserID:
return OrgMemberKeyUserID
case proj_model.OrgMemberSearchKeyOrgID:
case org_model.OrgMemberSearchKeyOrgID:
return OrgMemberKeyOrgID
default:
return ""