fix: setup instance domain handling (#3529)

internal/api/grpc/admin/user_converter.go

@@ -14,16 +14,16 @@ func setUpOrgHumanToCommand(human *admin_grpc.SetUpOrgRequest_Human) command.Add
 	lang, err := language.Parse(human.Profile.PreferredLanguage)
 	logging.OnError(err).Debug("unable to parse language")
 	return command.AddHuman{
-		Username:      human.UserName,
-		FirstName:     human.Profile.FirstName,
-		LastName:      human.Profile.LastName,
-		NickName:      human.Profile.NickName,
-		DisplayName:   human.Profile.DisplayName,
-		PreferredLang: lang,
-		Gender:        user_grpc.GenderToDomain(human.Profile.Gender),
-		Email:         setUpOrgHumanEmailToDomain(human.Email),
-		Phone:         setUpOrgHumanPhoneToDomain(human.Phone),
-		Password:      human.Password,
+		Username:          human.UserName,
+		FirstName:         human.Profile.FirstName,
+		LastName:          human.Profile.LastName,
+		NickName:          human.Profile.NickName,
+		DisplayName:       human.Profile.DisplayName,
+		PreferredLanguage: lang,
+		Gender:            user_grpc.GenderToDomain(human.Profile.Gender),
+		Email:             setUpOrgHumanEmailToDomain(human.Email),
+		Phone:             setUpOrgHumanPhoneToDomain(human.Phone),
+		Password:          human.Password,
 	}
 }
 

internal/api/grpc/management/user.go

@@ -209,12 +209,8 @@ func (s *Server) AddHumanUser(ctx context.Context, req *mgmt_pb.AddHumanUserRequ
 			Address:  req.Email.Email,
 			Verified: req.Email.IsEmailVerified,
 		},
-		PreferredLang: lang,
-		Gender:        user_grpc.GenderToDomain(req.Profile.Gender),
-		Phone: command.Phone{
-			Number:   req.Phone.Phone,
-			Verified: req.Phone.IsPhoneVerified,
-		},
+		PreferredLanguage:      lang,
+		Gender:                 user_grpc.GenderToDomain(req.Profile.Gender),
 		Password:               req.InitialPassword,
 		PasswordChangeRequired: true,
 		Passwordless:           false,

internal/api/grpc/system/instance.go

@@ -41,7 +41,7 @@ func (s *Server) GetInstance(ctx context.Context, req *system_pb.GetInstanceRequ
 }
 
 func (s *Server) AddInstance(ctx context.Context, req *system_pb.AddInstanceRequest) (*system_pb.AddInstanceResponse, error) {
-	id, details, err := s.command.SetUpInstance(ctx, AddInstancePbToSetupInstance(req, s.DefaultInstance), s.ExternalSecure)
+	id, details, err := s.command.SetUpInstance(ctx, AddInstancePbToSetupInstance(req, s.DefaultInstance))
 	if err != nil {
 		return nil, err
 	}

internal/api/grpc/system/instance_converter.go

@@ -1,13 +1,14 @@
 package system
 
 import (
+	"golang.org/x/text/language"
+
 	instance_grpc "github.com/zitadel/zitadel/internal/api/grpc/instance"
 	"github.com/zitadel/zitadel/internal/api/grpc/object"
 	"github.com/zitadel/zitadel/internal/command"
 	"github.com/zitadel/zitadel/internal/query"
 	instance_pb "github.com/zitadel/zitadel/pkg/grpc/instance"
 	system_pb "github.com/zitadel/zitadel/pkg/grpc/system"
-	"golang.org/x/text/language"
 )
 
 func AddInstancePbToSetupInstance(req *system_pb.AddInstanceRequest, defaultInstance command.InstanceSetup) *command.InstanceSetup {
@@ -35,7 +36,7 @@ func AddInstancePbToSetupInstance(req *system_pb.AddInstanceRequest, defaultInst
 		if req.OwnerProfile.PreferredLanguage != "" {
 			lang, err := language.Parse(req.OwnerProfile.PreferredLanguage)
 			if err == nil {
-				defaultInstance.Org.Human.PreferredLang = lang
+				defaultInstance.Org.Human.PreferredLanguage = lang
 			}
 		}
 	}

internal/api/grpc/system/server.go

@@ -25,7 +25,6 @@ type Server struct {
 	query           *query.Queries
 	administrator   repository.AdministratorRepository
 	DefaultInstance command.InstanceSetup
-	ExternalSecure  bool
 }
 
 type Config struct {
@@ -36,13 +35,12 @@ func CreateServer(command *command.Commands,
 	query *query.Queries,
 	repo repository.Repository,
 	defaultInstance command.InstanceSetup,
-	externalSecure bool) *Server {
+) *Server {
 	return &Server{
 		command:         command,
 		query:           query,
 		administrator:   repo,
 		DefaultInstance: defaultInstance,
-		ExternalSecure:  externalSecure,
 	}
 }