mirror of
https://github.com/zitadel/zitadel.git
synced 2025-04-08 05:44:31 +00:00

* feat(instance): implement create instance with direct machine user and credentials * fix: deprecated add endpoint and variable declaration * fix(instance): update logic for pats and machinekeys * fix(instance): unit test corrections and additional unit test for pats and machinekeys * fix(instance-create): include review changes * fix(instance-create): linter fixes * move iframe usage to solution scenarios configurations * Revert "move iframe usage to solution scenarios configurations" This reverts commit 9db31f3808e6dfcae9907bc574c072436a19865a. * fix merge * fix: add review suggestions Co-authored-by: Livio Spring <livio.a@gmail.com> * fix: add review changes * fix: add review changes for default definitions * fix: add review changes for machinekey details * fix: add machinekey output when setup with machineuser * fix: add changes from review * fix instance converter for machine and allow overwriting of further machine fields Co-authored-by: Livio Spring <livio.a@gmail.com>
245 lines
8.4 KiB
Go
245 lines
8.4 KiB
Go
package system
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/zitadel/oidc/v2/pkg/oidc"
|
|
"golang.org/x/text/language"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/grpc/authn"
|
|
instance_grpc "github.com/zitadel/zitadel/internal/api/grpc/instance"
|
|
"github.com/zitadel/zitadel/internal/api/grpc/object"
|
|
z_oidc "github.com/zitadel/zitadel/internal/api/oidc"
|
|
"github.com/zitadel/zitadel/internal/command"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
instance_pb "github.com/zitadel/zitadel/pkg/grpc/instance"
|
|
system_pb "github.com/zitadel/zitadel/pkg/grpc/system"
|
|
)
|
|
|
|
func CreateInstancePbToSetupInstance(req *system_pb.CreateInstanceRequest, defaultInstance command.InstanceSetup, externalDomain string) *command.InstanceSetup {
|
|
if req.InstanceName != "" {
|
|
defaultInstance.InstanceName = req.InstanceName
|
|
defaultInstance.Org.Name = req.InstanceName
|
|
}
|
|
if req.CustomDomain != "" {
|
|
defaultInstance.CustomDomain = req.CustomDomain
|
|
}
|
|
if req.FirstOrgName != "" {
|
|
defaultInstance.Org.Name = req.FirstOrgName
|
|
}
|
|
|
|
if user := req.GetMachine(); user != nil {
|
|
defaultMachine := command.AddMachine{}
|
|
if defaultInstance.Org.Machine != nil {
|
|
defaultMachine = *defaultInstance.Org.Machine
|
|
}
|
|
|
|
defaultInstance.Org.Machine = createInstancePbToAddMachine(user, defaultMachine)
|
|
defaultInstance.Org.Human = nil
|
|
}
|
|
if user := req.GetHuman(); user != nil {
|
|
defaultHuman := command.AddHuman{}
|
|
if defaultInstance.Org.Human != nil {
|
|
defaultHuman = *defaultInstance.Org.Human
|
|
}
|
|
|
|
defaultInstance.Org.Human = createInstancePbToAddHuman(user, defaultHuman, defaultInstance.DomainPolicy.UserLoginMustBeDomain, defaultInstance.Org.Name, externalDomain)
|
|
defaultInstance.Org.Machine = nil
|
|
}
|
|
|
|
if lang := language.Make(req.DefaultLanguage); lang != language.Und {
|
|
defaultInstance.DefaultLanguage = lang
|
|
}
|
|
|
|
return &defaultInstance
|
|
}
|
|
|
|
func createInstancePbToAddHuman(user *system_pb.CreateInstanceRequest_Human, defaultHuman command.AddHuman, userLoginMustBeDomain bool, org, externalDomain string) *command.AddHuman {
|
|
if user.Email != nil {
|
|
defaultHuman.Email.Address = user.Email.Email
|
|
defaultHuman.Email.Verified = user.Email.IsEmailVerified
|
|
}
|
|
if user.Profile != nil {
|
|
if user.Profile.FirstName != "" {
|
|
defaultHuman.FirstName = user.Profile.FirstName
|
|
}
|
|
if user.Profile.LastName != "" {
|
|
defaultHuman.LastName = user.Profile.LastName
|
|
}
|
|
if user.Profile.PreferredLanguage != "" {
|
|
lang, err := language.Parse(user.Profile.PreferredLanguage)
|
|
if err == nil {
|
|
defaultHuman.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(defaultHuman.Username, "@") {
|
|
defaultHuman.Username = defaultHuman.Username + "@" + domain.NewIAMDomainName(org, externalDomain)
|
|
}
|
|
if user.UserName != "" {
|
|
defaultHuman.Username = user.UserName
|
|
}
|
|
|
|
if user.Password != nil {
|
|
defaultHuman.Password = user.Password.Password
|
|
defaultHuman.PasswordChangeRequired = user.Password.PasswordChangeRequired
|
|
}
|
|
return &defaultHuman
|
|
}
|
|
|
|
func createInstancePbToAddMachine(user *system_pb.CreateInstanceRequest_Machine, defaultMachine command.AddMachine) *command.AddMachine {
|
|
machine := command.Machine{}
|
|
if defaultMachine.Machine != nil {
|
|
machine = *defaultMachine.Machine
|
|
}
|
|
if user.UserName != "" {
|
|
machine.Username = user.UserName
|
|
}
|
|
if user.Name != "" {
|
|
machine.Name = user.Name
|
|
}
|
|
defaultMachine.Machine = &machine
|
|
|
|
if defaultMachine.Pat != nil || user.PersonalAccessToken != nil {
|
|
pat := command.AddPat{}
|
|
if defaultMachine.Pat != nil {
|
|
pat = *defaultMachine.Pat
|
|
}
|
|
// scopes are currently static and can not be overwritten
|
|
pat.Scopes = []string{oidc.ScopeOpenID, z_oidc.ScopeUserMetaData, z_oidc.ScopeResourceOwner}
|
|
if user.PersonalAccessToken.ExpirationDate != nil {
|
|
pat.ExpirationDate = user.PersonalAccessToken.ExpirationDate.AsTime()
|
|
}
|
|
defaultMachine.Pat = &pat
|
|
}
|
|
|
|
if defaultMachine.MachineKey != nil || user.MachineKey != nil {
|
|
machineKey := command.AddMachineKey{}
|
|
if defaultMachine.MachineKey != nil {
|
|
machineKey = *defaultMachine.MachineKey
|
|
}
|
|
if user.MachineKey != nil {
|
|
if user.MachineKey.Type != 0 {
|
|
machineKey.Type = authn.KeyTypeToDomain(user.MachineKey.Type)
|
|
}
|
|
if user.MachineKey.ExpirationDate != nil {
|
|
machineKey.ExpirationDate = user.MachineKey.ExpirationDate.AsTime()
|
|
}
|
|
}
|
|
defaultMachine.MachineKey = &machineKey
|
|
}
|
|
return &defaultMachine
|
|
}
|
|
|
|
func AddInstancePbToSetupInstance(req *system_pb.AddInstanceRequest, defaultInstance command.InstanceSetup, externalDomain string) *command.InstanceSetup {
|
|
if req.InstanceName != "" {
|
|
defaultInstance.InstanceName = req.InstanceName
|
|
defaultInstance.Org.Name = req.InstanceName
|
|
}
|
|
if req.CustomDomain != "" {
|
|
defaultInstance.CustomDomain = req.CustomDomain
|
|
}
|
|
if req.FirstOrgName != "" {
|
|
defaultInstance.Org.Name = req.FirstOrgName
|
|
}
|
|
if req.OwnerEmail.Email != "" {
|
|
defaultInstance.Org.Human.Email.Address = req.OwnerEmail.Email
|
|
defaultInstance.Org.Human.Email.Verified = req.OwnerEmail.IsEmailVerified
|
|
}
|
|
if req.OwnerProfile != nil {
|
|
if req.OwnerProfile.FirstName != "" {
|
|
defaultInstance.Org.Human.FirstName = req.OwnerProfile.FirstName
|
|
}
|
|
if req.OwnerProfile.LastName != "" {
|
|
defaultInstance.Org.Human.LastName = req.OwnerProfile.LastName
|
|
}
|
|
if req.OwnerProfile.PreferredLanguage != "" {
|
|
lang, err := language.Parse(req.OwnerProfile.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 req.OwnerUserName != "" {
|
|
defaultInstance.Org.Human.Username = req.OwnerUserName
|
|
}
|
|
if req.OwnerPassword != nil {
|
|
defaultInstance.Org.Human.Password = req.OwnerPassword.Password
|
|
defaultInstance.Org.Human.PasswordChangeRequired = req.OwnerPassword.PasswordChangeRequired
|
|
}
|
|
if lang := language.Make(req.DefaultLanguage); lang != language.Und {
|
|
defaultInstance.DefaultLanguage = lang
|
|
}
|
|
|
|
return &defaultInstance
|
|
}
|
|
func ListInstancesRequestToModel(req *system_pb.ListInstancesRequest) (*query.InstanceSearchQueries, error) {
|
|
offset, limit, asc := object.ListQueryToModel(req.Query)
|
|
queries, err := instance_grpc.InstanceQueriesToModel(req.Queries)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &query.InstanceSearchQueries{
|
|
SearchRequest: query.SearchRequest{
|
|
Offset: offset,
|
|
Limit: limit,
|
|
Asc: asc,
|
|
SortingColumn: fieldNameToInstanceColumn(req.SortingColumn),
|
|
},
|
|
Queries: queries,
|
|
}, nil
|
|
}
|
|
|
|
func fieldNameToInstanceColumn(fieldName instance_pb.FieldName) query.Column {
|
|
switch fieldName {
|
|
case instance_pb.FieldName_FIELD_NAME_ID:
|
|
return query.InstanceColumnID
|
|
case instance_pb.FieldName_FIELD_NAME_NAME:
|
|
return query.InstanceColumnName
|
|
case instance_pb.FieldName_FIELD_NAME_CREATION_DATE:
|
|
return query.InstanceColumnCreationDate
|
|
default:
|
|
return query.Column{}
|
|
}
|
|
}
|
|
|
|
func ListInstanceDomainsRequestToModel(req *system_pb.ListDomainsRequest) (*query.InstanceDomainSearchQueries, error) {
|
|
offset, limit, asc := object.ListQueryToModel(req.Query)
|
|
queries, err := instance_grpc.DomainQueriesToModel(req.Queries)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &query.InstanceDomainSearchQueries{
|
|
SearchRequest: query.SearchRequest{
|
|
Offset: offset,
|
|
Limit: limit,
|
|
Asc: asc,
|
|
SortingColumn: fieldNameToInstanceDomainColumn(req.SortingColumn),
|
|
},
|
|
Queries: queries,
|
|
}, nil
|
|
}
|
|
|
|
func fieldNameToInstanceDomainColumn(fieldName instance_pb.DomainFieldName) query.Column {
|
|
switch fieldName {
|
|
case instance_pb.DomainFieldName_DOMAIN_FIELD_NAME_DOMAIN:
|
|
return query.InstanceDomainDomainCol
|
|
case instance_pb.DomainFieldName_DOMAIN_FIELD_NAME_GENERATED:
|
|
return query.InstanceDomainIsGeneratedCol
|
|
case instance_pb.DomainFieldName_DOMAIN_FIELD_NAME_PRIMARY:
|
|
return query.InstanceDomainIsPrimaryCol
|
|
case instance_pb.DomainFieldName_DOMAIN_FIELD_NAME_CREATION_DATE:
|
|
return query.InstanceDomainCreationDateCol
|
|
default:
|
|
return query.Column{}
|
|
}
|
|
}
|