mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 11:34:26 +00:00
dabd5920dc
* 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>
216 lines
5.7 KiB
Go
216 lines
5.7 KiB
Go
package user
|
|
|
|
import (
|
|
"github.com/caos/zitadel/internal/api/grpc/object"
|
|
"github.com/caos/zitadel/internal/domain"
|
|
"github.com/caos/zitadel/internal/eventstore/v1/models"
|
|
"github.com/caos/zitadel/internal/user/model"
|
|
usr_grant_model "github.com/caos/zitadel/internal/usergrant/model"
|
|
user_pb "github.com/caos/zitadel/pkg/grpc/user"
|
|
)
|
|
|
|
func UsersToPb(users []*model.UserView) []*user_pb.User {
|
|
u := make([]*user_pb.User, len(users))
|
|
for i, user := range users {
|
|
u[i] = UserToPb(user)
|
|
}
|
|
return u
|
|
}
|
|
func UserToPb(user *model.UserView) *user_pb.User {
|
|
return &user_pb.User{
|
|
Id: user.ID,
|
|
State: ModelUserStateToPb(user.State),
|
|
UserName: user.UserName,
|
|
LoginNames: user.LoginNames,
|
|
PreferredLoginName: user.PreferredLoginName,
|
|
Details: object.ToDetailsPb(
|
|
user.Sequence,
|
|
user.ChangeDate,
|
|
user.ResourceOwner,
|
|
),
|
|
}
|
|
}
|
|
|
|
func ProfileToPb(profile *model.Profile) *user_pb.Profile {
|
|
return &user_pb.Profile{
|
|
FirstName: profile.FirstName,
|
|
LastName: profile.LastName,
|
|
NickName: profile.NickName,
|
|
DisplayName: profile.DisplayName,
|
|
PreferredLanguage: profile.PreferredLanguage.String(),
|
|
Gender: GenderToPb(profile.Gender),
|
|
}
|
|
}
|
|
|
|
func EmailToPb(email *model.Email) *user_pb.Email {
|
|
return &user_pb.Email{
|
|
Email: email.EmailAddress,
|
|
IsEmailVerified: email.IsEmailVerified,
|
|
}
|
|
}
|
|
|
|
func PhoneToPb(phone *model.Phone) *user_pb.Phone {
|
|
return &user_pb.Phone{
|
|
Phone: phone.PhoneNumber,
|
|
IsPhoneVerified: phone.IsPhoneVerified,
|
|
}
|
|
}
|
|
|
|
func ModelEmailToPb(email *model.Email) *user_pb.Email {
|
|
return &user_pb.Email{
|
|
Email: email.EmailAddress,
|
|
IsEmailVerified: email.IsEmailVerified,
|
|
}
|
|
}
|
|
|
|
func ModelPhoneToPb(phone *model.Phone) *user_pb.Phone {
|
|
return &user_pb.Phone{
|
|
Phone: phone.PhoneNumber,
|
|
IsPhoneVerified: phone.IsPhoneVerified,
|
|
}
|
|
}
|
|
|
|
func ModelAddressToPb(address *model.Address) *user_pb.Address {
|
|
return &user_pb.Address{
|
|
Country: address.Country,
|
|
Locality: address.Locality,
|
|
PostalCode: address.PostalCode,
|
|
Region: address.Region,
|
|
StreetAddress: address.StreetAddress,
|
|
}
|
|
}
|
|
|
|
func GenderToDomain(gender user_pb.Gender) domain.Gender {
|
|
switch gender {
|
|
case user_pb.Gender_GENDER_DIVERSE:
|
|
return domain.GenderDiverse
|
|
case user_pb.Gender_GENDER_MALE:
|
|
return domain.GenderMale
|
|
case user_pb.Gender_GENDER_FEMALE:
|
|
return domain.GenderFemale
|
|
default:
|
|
return -1
|
|
}
|
|
}
|
|
|
|
func ModelUserStateToPb(state model.UserState) user_pb.UserState {
|
|
switch state {
|
|
case model.UserStateActive:
|
|
return user_pb.UserState_USER_STATE_ACTIVE
|
|
case model.UserStateInactive:
|
|
return user_pb.UserState_USER_STATE_INACTIVE
|
|
case model.UserStateDeleted:
|
|
return user_pb.UserState_USER_STATE_DELETED
|
|
case model.UserStateInitial:
|
|
return user_pb.UserState_USER_STATE_INITIAL
|
|
case model.UserStateLocked:
|
|
return user_pb.UserState_USER_STATE_LOCKED
|
|
case model.UserStateSuspend:
|
|
return user_pb.UserState_USER_STATE_SUSPEND
|
|
default:
|
|
return user_pb.UserState_USER_STATE_UNSPECIFIED
|
|
}
|
|
}
|
|
|
|
func ModelUserGrantStateToPb(state usr_grant_model.UserGrantState) user_pb.UserGrantState {
|
|
switch state {
|
|
case usr_grant_model.UserGrantStateActive:
|
|
return user_pb.UserGrantState_USER_GRANT_STATE_ACTIVE
|
|
case usr_grant_model.UserGrantStateInactive:
|
|
return user_pb.UserGrantState_USER_GRANT_STATE_INACTIVE
|
|
default:
|
|
return user_pb.UserGrantState_USER_GRANT_STATE_UNSPECIFIED
|
|
}
|
|
}
|
|
|
|
func GenderToPb(gender model.Gender) user_pb.Gender {
|
|
switch gender {
|
|
case model.GenderDiverse:
|
|
return user_pb.Gender_GENDER_DIVERSE
|
|
case model.GenderFemale:
|
|
return user_pb.Gender_GENDER_FEMALE
|
|
case model.GenderMale:
|
|
return user_pb.Gender_GENDER_MALE
|
|
default:
|
|
return user_pb.Gender_GENDER_UNSPECIFIED
|
|
}
|
|
}
|
|
|
|
func AuthFactorsToPb(mfas []*model.MultiFactor) []*user_pb.AuthFactor {
|
|
factors := make([]*user_pb.AuthFactor, len(mfas))
|
|
for i, mfa := range mfas {
|
|
factors[i] = AuthFactorToPb(mfa)
|
|
}
|
|
return factors
|
|
}
|
|
|
|
func AuthFactorToPb(mfa *model.MultiFactor) *user_pb.AuthFactor {
|
|
factor := &user_pb.AuthFactor{
|
|
State: MFAStateToPb(mfa.State),
|
|
}
|
|
switch mfa.Type {
|
|
case model.MFATypeOTP:
|
|
factor.Type = &user_pb.AuthFactor_Otp{
|
|
Otp: &user_pb.AuthFactorOTP{},
|
|
}
|
|
case model.MFATypeU2F:
|
|
factor.Type = &user_pb.AuthFactor_U2F{
|
|
U2F: &user_pb.AuthFactorU2F{
|
|
Id: mfa.ID,
|
|
Name: mfa.Attribute,
|
|
},
|
|
}
|
|
}
|
|
return factor
|
|
}
|
|
|
|
func MFAStateToPb(state model.MFAState) user_pb.AuthFactorState {
|
|
switch state {
|
|
case model.MFAStateNotReady:
|
|
return user_pb.AuthFactorState_AUTH_FACTOR_STATE_NOT_READY
|
|
case model.MFAStateReady:
|
|
return user_pb.AuthFactorState_AUTH_FACTOR_STATE_READY
|
|
default:
|
|
return user_pb.AuthFactorState_AUTH_FACTOR_STATE_UNSPECIFIED
|
|
}
|
|
}
|
|
|
|
func WebAuthNTokensViewToPb(tokens []*model.WebAuthNView) []*user_pb.WebAuthNToken {
|
|
t := make([]*user_pb.WebAuthNToken, len(tokens))
|
|
for i, token := range tokens {
|
|
t[i] = WebAuthNTokenViewToPb(token)
|
|
}
|
|
return t
|
|
}
|
|
|
|
func WebAuthNTokenViewToPb(token *model.WebAuthNView) *user_pb.WebAuthNToken {
|
|
return &user_pb.WebAuthNToken{
|
|
Id: token.TokenID,
|
|
State: MFAStateToPb(token.State),
|
|
Name: token.Name,
|
|
}
|
|
}
|
|
|
|
func WebAuthNTokenToWebAuthNKeyPb(token *domain.WebAuthNToken) *user_pb.WebAuthNKey {
|
|
return &user_pb.WebAuthNKey{
|
|
Id: string(token.KeyID), //TODO: ask if it's the correct id?
|
|
PublicKey: token.PublicKey,
|
|
}
|
|
}
|
|
|
|
func ExternalIDPViewsToExternalIDPs(externalIDPs []*model.ExternalIDPView) []*domain.ExternalIDP {
|
|
idps := make([]*domain.ExternalIDP, len(externalIDPs))
|
|
for i, idp := range externalIDPs {
|
|
idps[i] = &domain.ExternalIDP{
|
|
ObjectRoot: models.ObjectRoot{
|
|
AggregateID: idp.UserID,
|
|
ResourceOwner: idp.ResourceOwner,
|
|
},
|
|
IDPConfigID: idp.IDPConfigID,
|
|
ExternalUserID: idp.ExternalUserID,
|
|
DisplayName: idp.UserDisplayName,
|
|
}
|
|
}
|
|
return idps
|
|
}
|