eyjhb/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Make displayName include basedomain if set

Browse source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2022-11-22 17:36:19 +01:00 • committed by Juan Font
parent e7f322b9b6
commit 99e33181b2
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
namespaces.go
View file

@ -211,7 +211,10 @@ func (n *Namespace) toLogin() *tailcfg.Login {
return &login
}
func getMapResponseUserProfiles(machine Machine, peers Machines) []tailcfg.UserProfile {
func (h *Headscale) getMapResponseUserProfiles(
machine Machine,
peers Machines,
) []tailcfg.UserProfile {
namespaceMap := make(map[string]Namespace)
namespaceMap[machine.Namespace.Name] = machine.Namespace
for _, peer := range peers {
@ -220,11 +223,17 @@ func getMapResponseUserProfiles(machine Machine, peers Machines) []tailcfg.UserP
profiles := []tailcfg.UserProfile{}
for _, namespace := range namespaceMap {
displayName := namespace.Name
if h.cfg.BaseDomain != "" {
displayName = fmt.Sprintf("%s@%s", namespace.Name, h.cfg.BaseDomain)
}
profiles = append(profiles,
tailcfg.UserProfile{
ID: tailcfg.UserID(namespace.ID),
LoginName: namespace.Name,
DisplayName: namespace.Name,
DisplayName: displayName,
})
}