feat: protos refactoring
* start with user
* user first try done in all services
* user, org, idp for discussion
* remove unused stuff
* bla
* dockerbuild
* rename search, get multiple to list...
* add annotation
* update proto dependencies
* update proto dependencies
* change proto imports
* replace all old imports
* fix go out
* remove unused lines
* correct protoc flags
* grpc and openapi flags
* go out source path relative
* -p
* remove dead code
* sourcepath relative
* ls
* is onenapi the problem?
* hobla
* authoption output
* wrong field name
* gopf
* correct option, add correct flags
* small improvments
* SIMPLYFY
* relative path
* gopf bin ich en tubel
* correct path
* default policies in admin
* grpc generation in one file
* remove non ascii
* metadata on manipulations
* correct auth_option import
* fixes
* larry
* idp provider to idp
* fix generate
* admin and auth nearly done
* admin and auth nearly done
* gen
* healthz
* imports
* deleted too much imports
* fix org
* add import
* imports
* import
* naming
* auth_opt
* gopf
* management
* imports
* _TYPE_UNSPECIFIED
* improts
* auth opts
* management policies
* imports
* passwordlessType to MFAType
* auth_opt
* add user grant calls
* add missing messages
* result
* fix option
* improvements
* ids
* fix http
* imports
* fixes
* fields
* body
* add fields
* remove wrong member query
* fix request response
* fixes
* add copy files
* variable versions
* generate all files
* improvements
* add dependencies
* factors
* user session
* oidc information, iam
* remove unused file
* changes
* enums
* dockerfile
* fix build
* remove unused folder
* update readme for build
* move old server impl
* add event type to change
* some changes
* start admin
* remove wrong field
* admin only list calls missing
* fix proto numbers
* surprisingly it compiles
* service ts changes
* admin mgmt
* mgmt
* auth manipulation and gets done, lists missing
* validations and some field changes
* validations
* enum validations
* remove todo
* move proto files to proto/zitadel
* change proto path in dockerfile
* it compiles!
* add validate import
* remove duplicate import
* fix protos
* fix import
* tests
* cleanup
* remove unimplemented methods
* iam member multiple queries
* all auth and admin calls
* add initial password on crate human
* message names
* management user server
* machine done
* fix: todos (#1346)
* fix: pub sub in new eventstore
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix tests
* fix: search method domain
* admin service, user import type typescript
* admin changes
* admin changes
* fix: search method domain
* more user grpc and begin org, fix configs
* fix: return object details
* org grpc
* remove creation date add details
* app
* fix: return object details
* fix: return object details
* mgmt service, project members
* app
* fix: convert policies
* project, members, granted projects, searches
* fix: convert usergrants
* fix: convert usergrants
* auth user detail, user detail, mfa, second factor, auth
* fix: convert usergrants
* mfa, memberships, password, owned proj detail
* fix: convert usergrants
* project grant
* missing details
* changes, userview
* idp table, keys
* org list and user table filter
* unify rest paths (#1381)
* unify rest paths
* post for all searches,
mfa to multi_factor,
secondfactor to second_factor
* remove v1
* fix tests
* rename api client key to app key
* machine keys, age policy
* user list, machine keys, changes
* fix: org states
* add default flag to policy
* second factor to type
* idp id
* app type
* unify ListQuery, ListDetails, ObjectDetails field names
* user grants, apps, memberships
* fix type params
* metadata to detail, linke idps
* api create, membership, app detail, create
* idp, app, policy
* queries, multi -> auth factors and missing fields
* update converters
* provider to user, remove old mgmt refs
* temp remove authfactor dialog, build finish
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
2021-03-09 10:30:11 +01:00
|
|
|
package user
|
|
|
|
|
|
|
|
import (
|
|
|
|
"github.com/caos/zitadel/internal/api/grpc/object"
|
|
|
|
"github.com/caos/zitadel/internal/domain"
|
|
|
|
user_model "github.com/caos/zitadel/internal/user/model"
|
|
|
|
user_pb "github.com/caos/zitadel/pkg/grpc/user"
|
|
|
|
)
|
|
|
|
|
|
|
|
func UserQueriesToModel(queries []*user_pb.SearchQuery) []*user_model.UserSearchQuery {
|
|
|
|
q := make([]*user_model.UserSearchQuery, len(queries))
|
|
|
|
for i, query := range queries {
|
|
|
|
q[i] = UserQueryToModel(query)
|
|
|
|
}
|
|
|
|
return q
|
|
|
|
}
|
|
|
|
|
|
|
|
func UserQueryToModel(query *user_pb.SearchQuery) *user_model.UserSearchQuery {
|
|
|
|
switch q := query.Query.(type) {
|
|
|
|
case *user_pb.SearchQuery_UserNameQuery:
|
|
|
|
return UserNameQueryToModel(q.UserNameQuery)
|
|
|
|
case *user_pb.SearchQuery_FirstNameQuery:
|
|
|
|
return FirstNameQueryToModel(q.FirstNameQuery)
|
|
|
|
case *user_pb.SearchQuery_LastNameQuery:
|
|
|
|
return LastNameQueryToModel(q.LastNameQuery)
|
|
|
|
case *user_pb.SearchQuery_NickNameQuery:
|
|
|
|
return NickNameQueryToModel(q.NickNameQuery)
|
|
|
|
case *user_pb.SearchQuery_DisplayNameQuery:
|
|
|
|
return DisplayNameQueryToModel(q.DisplayNameQuery)
|
|
|
|
case *user_pb.SearchQuery_EmailQuery:
|
|
|
|
return EmailQueryToModel(q.EmailQuery)
|
|
|
|
case *user_pb.SearchQuery_StateQuery:
|
|
|
|
return StateQueryToModel(q.StateQuery)
|
|
|
|
case *user_pb.SearchQuery_TypeQuery:
|
|
|
|
return TypeQueryToModel(q.TypeQuery)
|
|
|
|
case *user_pb.SearchQuery_ResourceOwner:
|
|
|
|
return ResourceOwnerQueryToModel(q.ResourceOwner)
|
|
|
|
default:
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func UserNameQueryToModel(q *user_pb.UserNameQuery) *user_model.UserSearchQuery {
|
|
|
|
return &user_model.UserSearchQuery{
|
|
|
|
Key: user_model.UserSearchKeyUserName,
|
|
|
|
Method: object.TextMethodToModel(q.Method),
|
|
|
|
Value: q.UserName,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func FirstNameQueryToModel(q *user_pb.FirstNameQuery) *user_model.UserSearchQuery {
|
|
|
|
return &user_model.UserSearchQuery{
|
|
|
|
Key: user_model.UserSearchKeyFirstName,
|
|
|
|
Method: object.TextMethodToModel(q.Method),
|
|
|
|
Value: q.FirstName,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func LastNameQueryToModel(q *user_pb.LastNameQuery) *user_model.UserSearchQuery {
|
|
|
|
return &user_model.UserSearchQuery{
|
|
|
|
Key: user_model.UserSearchKeyLastName,
|
|
|
|
Method: object.TextMethodToModel(q.Method),
|
|
|
|
Value: q.LastName,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func NickNameQueryToModel(q *user_pb.NickNameQuery) *user_model.UserSearchQuery {
|
|
|
|
return &user_model.UserSearchQuery{
|
|
|
|
Key: user_model.UserSearchKeyNickName,
|
|
|
|
Method: object.TextMethodToModel(q.Method),
|
|
|
|
Value: q.NickName,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func DisplayNameQueryToModel(q *user_pb.DisplayNameQuery) *user_model.UserSearchQuery {
|
|
|
|
return &user_model.UserSearchQuery{
|
|
|
|
Key: user_model.UserSearchKeyDisplayName,
|
|
|
|
Method: object.TextMethodToModel(q.Method),
|
|
|
|
Value: q.DisplayName,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func EmailQueryToModel(q *user_pb.EmailQuery) *user_model.UserSearchQuery {
|
|
|
|
return &user_model.UserSearchQuery{
|
|
|
|
Key: user_model.UserSearchKeyEmail,
|
|
|
|
Method: object.TextMethodToModel(q.Method),
|
|
|
|
Value: q.EmailAddress,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func StateQueryToModel(q *user_pb.StateQuery) *user_model.UserSearchQuery {
|
|
|
|
return &user_model.UserSearchQuery{
|
|
|
|
Key: user_model.UserSearchKeyState,
|
|
|
|
Method: domain.SearchMethodEquals,
|
|
|
|
Value: q.State,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TypeQueryToModel(q *user_pb.TypeQuery) *user_model.UserSearchQuery {
|
|
|
|
return &user_model.UserSearchQuery{
|
|
|
|
Key: user_model.UserSearchKeyType,
|
|
|
|
Method: domain.SearchMethodEquals,
|
2021-03-12 14:06:05 +01:00
|
|
|
Value: UserTypeToModel(q.Type),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func UserTypeToModel(t user_pb.Type) string {
|
|
|
|
switch t {
|
|
|
|
case user_pb.Type_TYPE_HUMAN:
|
|
|
|
return "human"
|
|
|
|
case user_pb.Type_TYPE_MACHINE:
|
|
|
|
return "machine"
|
|
|
|
default:
|
|
|
|
return ""
|
feat: protos refactoring
* start with user
* user first try done in all services
* user, org, idp for discussion
* remove unused stuff
* bla
* dockerbuild
* rename search, get multiple to list...
* add annotation
* update proto dependencies
* update proto dependencies
* change proto imports
* replace all old imports
* fix go out
* remove unused lines
* correct protoc flags
* grpc and openapi flags
* go out source path relative
* -p
* remove dead code
* sourcepath relative
* ls
* is onenapi the problem?
* hobla
* authoption output
* wrong field name
* gopf
* correct option, add correct flags
* small improvments
* SIMPLYFY
* relative path
* gopf bin ich en tubel
* correct path
* default policies in admin
* grpc generation in one file
* remove non ascii
* metadata on manipulations
* correct auth_option import
* fixes
* larry
* idp provider to idp
* fix generate
* admin and auth nearly done
* admin and auth nearly done
* gen
* healthz
* imports
* deleted too much imports
* fix org
* add import
* imports
* import
* naming
* auth_opt
* gopf
* management
* imports
* _TYPE_UNSPECIFIED
* improts
* auth opts
* management policies
* imports
* passwordlessType to MFAType
* auth_opt
* add user grant calls
* add missing messages
* result
* fix option
* improvements
* ids
* fix http
* imports
* fixes
* fields
* body
* add fields
* remove wrong member query
* fix request response
* fixes
* add copy files
* variable versions
* generate all files
* improvements
* add dependencies
* factors
* user session
* oidc information, iam
* remove unused file
* changes
* enums
* dockerfile
* fix build
* remove unused folder
* update readme for build
* move old server impl
* add event type to change
* some changes
* start admin
* remove wrong field
* admin only list calls missing
* fix proto numbers
* surprisingly it compiles
* service ts changes
* admin mgmt
* mgmt
* auth manipulation and gets done, lists missing
* validations and some field changes
* validations
* enum validations
* remove todo
* move proto files to proto/zitadel
* change proto path in dockerfile
* it compiles!
* add validate import
* remove duplicate import
* fix protos
* fix import
* tests
* cleanup
* remove unimplemented methods
* iam member multiple queries
* all auth and admin calls
* add initial password on crate human
* message names
* management user server
* machine done
* fix: todos (#1346)
* fix: pub sub in new eventstore
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix tests
* fix: search method domain
* admin service, user import type typescript
* admin changes
* admin changes
* fix: search method domain
* more user grpc and begin org, fix configs
* fix: return object details
* org grpc
* remove creation date add details
* app
* fix: return object details
* fix: return object details
* mgmt service, project members
* app
* fix: convert policies
* project, members, granted projects, searches
* fix: convert usergrants
* fix: convert usergrants
* auth user detail, user detail, mfa, second factor, auth
* fix: convert usergrants
* mfa, memberships, password, owned proj detail
* fix: convert usergrants
* project grant
* missing details
* changes, userview
* idp table, keys
* org list and user table filter
* unify rest paths (#1381)
* unify rest paths
* post for all searches,
mfa to multi_factor,
secondfactor to second_factor
* remove v1
* fix tests
* rename api client key to app key
* machine keys, age policy
* user list, machine keys, changes
* fix: org states
* add default flag to policy
* second factor to type
* idp id
* app type
* unify ListQuery, ListDetails, ObjectDetails field names
* user grants, apps, memberships
* fix type params
* metadata to detail, linke idps
* api create, membership, app detail, create
* idp, app, policy
* queries, multi -> auth factors and missing fields
* update converters
* provider to user, remove old mgmt refs
* temp remove authfactor dialog, build finish
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
2021-03-09 10:30:11 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func ResourceOwnerQueryToModel(q *user_pb.ResourceOwnerQuery) *user_model.UserSearchQuery {
|
|
|
|
return &user_model.UserSearchQuery{
|
|
|
|
Key: user_model.UserSearchKeyResourceOwner,
|
|
|
|
Method: domain.SearchMethodEquals,
|
|
|
|
Value: q.OrgID,
|
|
|
|
}
|
|
|
|
}
|