TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-02-28 12:57:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(instance-create): linter fixes

Browse Source
This commit is contained in:
Stefan Benz 2022-11-25 17:34:42 +01:00
parent a52aef8223
commit f5da95e25a
No known key found for this signature in database
GPG Key ID: 9D2FE4EA50BEFE68
2 changed files with 64 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
internal/api/grpc/system/instance_converter.go
View File

@ -30,62 +30,11 @@ func CreateInstancePbToSetupInstance(req *system_pb.CreateInstanceRequest, defau
}
if user := req.GetMachine(); user != nil {
defaultInstance.Org.Machine = &command.AddMachine{
Machine: &command.Machine{},
}
if user.UserName != "" {
defaultInstance.Org.Machine.Machine.Username = user.UserName
}
if user.Name != "" {
defaultInstance.Org.Machine.Machine.Name = user.Name
}
if user.PersonalAccessToken != nil {
defaultInstance.Org.Machine.Pat = true
defaultInstance.Org.Machine.PatScopes = []string{oidc.ScopeOpenID, z_oidc.ScopeUserMetaData, z_oidc.ScopeResourceOwner}
if user.PersonalAccessToken.ExpirationDate != nil {
defaultInstance.Org.Machine.PatExpirationDate = user.PersonalAccessToken.ExpirationDate.AsTime()
}
}
if user.MachineKey != nil {
defaultInstance.Org.Machine.MachineKey = true
defaultInstance.Org.Machine.MachineKeyType = authn.KeyTypeToDomain(user.MachineKey.Type)
if user.MachineKey.ExpirationDate != nil {
defaultInstance.Org.Machine.MachineKeyExpirationDate = user.MachineKey.ExpirationDate.AsTime()
}
}
defaultInstance.Org.Machine = createInstancePbToAddMachine(user)
defaultInstance.Org.Human = nil
}
if user := req.GetHuman(); user != nil {
if user.Email != nil {
defaultInstance.Org.Human.Email.Address = user.Email.Email
defaultInstance.Org.Human.Email.Verified = user.Email.IsEmailVerified
}
if user.Profile != nil {
if user.Profile.FirstName != "" {
defaultInstance.Org.Human.FirstName = user.Profile.FirstName
}
if user.Profile.LastName != "" {
defaultInstance.Org.Human.LastName = user.Profile.LastName
}
if user.Profile.PreferredLanguage != "" {
lang, err := language.Parse(user.Profile.PreferredLanguage)
if err == nil {
defaultInstance.Org.Human.PreferredLanguage = lang
}
}
}
// check if default username is email style or else append @<orgname>.<custom-domain>
// this way we have the same value as before changing `UserLoginMustBeDomain` to false
if !defaultInstance.DomainPolicy.UserLoginMustBeDomain && !strings.Contains(defaultInstance.Org.Human.Username, "@") {
defaultInstance.Org.Human.Username = defaultInstance.Org.Human.Username + "@" + domain.NewIAMDomainName(defaultInstance.Org.Name, externalDomain)
}
if user.UserName != "" {
defaultInstance.Org.Human.Username = user.UserName
}
if user.Password != nil {
defaultInstance.Org.Human.Password = user.Password.Password
defaultInstance.Org.Human.PasswordChangeRequired = user.Password.PasswordChangeRequired
}
defaultInstance.Org.Human = createInstancePbToAddHuman(user, defaultInstance.DomainPolicy.UserLoginMustBeDomain, defaultInstance.Org.Name, externalDomain)
defaultInstance.Org.Machine = nil
}
@ -95,6 +44,67 @@ func CreateInstancePbToSetupInstance(req *system_pb.CreateInstanceRequest, defau
return &defaultInstance
}
func createInstancePbToAddHuman(user *system_pb.CreateInstanceRequest_Human, userLoginMustBeDomain bool, org, externalDomain string) *command.AddHuman {
human := &command.AddHuman{}
if user.Email != nil {
human.Email.Address = user.Email.Email
human.Email.Verified = user.Email.IsEmailVerified
}
if user.Profile != nil {
if user.Profile.FirstName != "" {
human.FirstName = user.Profile.FirstName
}
if user.Profile.LastName != "" {
human.LastName = user.Profile.LastName
}
if user.Profile.PreferredLanguage != "" {
lang, err := language.Parse(user.Profile.PreferredLanguage)
if err == nil {
human.PreferredLanguage = lang
}
}
}
// check if default username is email style or else append @<orgname>.<custom-domain>
// this way we have the same value as before changing `UserLoginMustBeDomain` to false
if !userLoginMustBeDomain && !strings.Contains(human.Username, "@") {
human.Username = human.Username + "@" + domain.NewIAMDomainName(org, externalDomain)
}
if user.UserName != "" {
human.Username = user.UserName
}
if user.Password != nil {
human.Password = user.Password.Password
human.PasswordChangeRequired = user.Password.PasswordChangeRequired
}
return human
}
func createInstancePbToAddMachine(user *system_pb.CreateInstanceRequest_Machine) *command.AddMachine {
machine := &command.AddMachine{
Machine: &command.Machine{},
}
if user.UserName != "" {
machine.Machine.Username = user.UserName
}
if user.Name != "" {
machine.Machine.Name = user.Name
}
if user.PersonalAccessToken != nil {
machine.Pat = true
machine.PatScopes = []string{oidc.ScopeOpenID, z_oidc.ScopeUserMetaData, z_oidc.ScopeResourceOwner}
if user.PersonalAccessToken.ExpirationDate != nil {
machine.PatExpirationDate = user.PersonalAccessToken.ExpirationDate.AsTime()
}
}
if user.MachineKey != nil {
machine.MachineKey = true
machine.MachineKeyType = authn.KeyTypeToDomain(user.MachineKey.Type)
if user.MachineKey.ExpirationDate != nil {
machine.MachineKeyExpirationDate = user.MachineKey.ExpirationDate.AsTime()
}
}
return machine
}
func AddInstancePbToSetupInstance(req *system_pb.AddInstanceRequest, defaultInstance command.InstanceSetup, externalDomain string) *command.InstanceSetup {
if req.InstanceName != "" {

2
internal/command/instance.go
View File

@ -286,7 +286,7 @@ func (c *Commands) SetUpInstance(ctx context.Context, setup *InstanceSetup) (str
AddOrgCommand(ctx, orgAgg, setup.Org.Name),
c.prepareSetDefaultOrg(instanceAgg, orgAgg.ID),
)
//only a human or a machine user should be created as owner
// only a human or a machine user should be created as owner
if setup.Org.Human != nil {
validations = append(validations,
AddHumanCommand(userAgg, setup.Org.Human, c.userPasswordAlg, c.userEncryption),