TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-07-11 02:38:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: setup org, user invalid (#298)

Browse Source
This commit is contained in:
Fabi 2020-06-26 15:42:34 +02:00 committed by GitHub
parent f31bea8d1c
commit 63ccdb1147
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/admin/api/grpc/org_converter.go
View File

@ -28,8 +28,7 @@ func orgCreateRequestToModel(org *CreateOrgRequest) *org_model.Org {
func userCreateRequestToModel(user *CreateUserRequest) *usr_model.User { func userCreateRequestToModel(user *CreateUserRequest) *usr_model.User {
preferredLanguage, err := language.Parse(user.PreferredLanguage) preferredLanguage, err := language.Parse(user.PreferredLanguage)
logging.Log("GRPC-30hwz").OnError(err).Debug("unable to parse language") logging.Log("GRPC-30hwz").OnError(err).Debug("unable to parse language")
result := &usr_model.User{
return &usr_model.User{
Profile: &usr_model.Profile{ Profile: &usr_model.Profile{
UserName: user.UserName, UserName: user.UserName,
FirstName: user.FirstName, FirstName: user.FirstName,
@ -45,10 +44,6 @@ func userCreateRequestToModel(user *CreateUserRequest) *usr_model.User {
EmailAddress: user.Email, EmailAddress: user.Email,
IsEmailVerified: user.IsEmailVerified, IsEmailVerified: user.IsEmailVerified,
}, },
Phone: &usr_model.Phone{
IsPhoneVerified: user.IsPhoneVerified,
PhoneNumber: user.Phone,
},
Address: &usr_model.Address{ Address: &usr_model.Address{
Country: user.Country, Country: user.Country,
Locality: user.Locality, Locality: user.Locality,
@ -57,6 +52,10 @@ func userCreateRequestToModel(user *CreateUserRequest) *usr_model.User {
StreetAddress: user.StreetAddress, StreetAddress: user.StreetAddress,
}, },
} }
if user.Phone != "" {
result.Phone = &usr_model.Phone{PhoneNumber: user.Phone, IsPhoneVerified: user.IsPhoneVerified}
}
return result
} }
func setUpOrgResponseFromModel(setUp *admin_model.SetupOrg) *OrgSetUpResponse { func setUpOrgResponseFromModel(setUp *admin_model.SetupOrg) *OrgSetUpResponse {