From 63ccdb11475a5107921d4736c5079c72a4d22bc8 Mon Sep 17 00:00:00 2001
From: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Date: Fri, 26 Jun 2020 15:42:34 +0200
Subject: [PATCH] fix: setup org, user invalid (#298)

---
 pkg/admin/api/grpc/org_converter.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkg/admin/api/grpc/org_converter.go b/pkg/admin/api/grpc/org_converter.go
index d8905b1c8..4d24456c9 100644
--- a/pkg/admin/api/grpc/org_converter.go
+++ b/pkg/admin/api/grpc/org_converter.go
@@ -28,8 +28,7 @@ func orgCreateRequestToModel(org *CreateOrgRequest) *org_model.Org {
 func userCreateRequestToModel(user *CreateUserRequest) *usr_model.User {
 	preferredLanguage, err := language.Parse(user.PreferredLanguage)
 	logging.Log("GRPC-30hwz").OnError(err).Debug("unable to parse language")
-
-	return &usr_model.User{
+	result := &usr_model.User{
 		Profile: &usr_model.Profile{
 			UserName:          user.UserName,
 			FirstName:         user.FirstName,
@@ -45,10 +44,6 @@ func userCreateRequestToModel(user *CreateUserRequest) *usr_model.User {
 			EmailAddress:    user.Email,
 			IsEmailVerified: user.IsEmailVerified,
 		},
-		Phone: &usr_model.Phone{
-			IsPhoneVerified: user.IsPhoneVerified,
-			PhoneNumber:     user.Phone,
-		},
 		Address: &usr_model.Address{
 			Country:       user.Country,
 			Locality:      user.Locality,
@@ -57,6 +52,10 @@ func userCreateRequestToModel(user *CreateUserRequest) *usr_model.User {
 			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 {