TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add random string to generated domain (#3634)

Browse Source
This commit is contained in:
Fabi
2022-05-16 11:26:24 +02:00
committed by GitHub
parent 4fcf03c9c8
commit 48fbf1a28e
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/domain/instance_domain.go
View File

@@ -2,6 +2,12 @@ package domain
import (
"strings"
"github.com/zitadel/zitadel/internal/crypto"
)
var (
domainRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
)
type InstanceDomainState int32
@@ -22,8 +28,11 @@ func (f InstanceDomainState) Exists() bool {
return f == InstanceDomainStateActive
}
func NewGeneratedInstanceDomain(instanceName, iamDomain string) string {
//TODO: Add random number/string to be unique
func NewGeneratedInstanceDomain(instanceName, iamDomain string) (string, error) {
randomString, err := crypto.GenerateRandomString(6, domainRunes)
if err != nil {
return "", err
}
instanceName = strings.TrimSpace(instanceName)
return strings.ToLower(strings.ReplaceAll(instanceName, " ", "-") + "." + iamDomain)
return strings.ToLower(strings.ReplaceAll(instanceName, " ", "-") + "-" + randomString + "." + iamDomain), nil
}