Allow default domain

Author: bolkedebruin

api/web.go

@@ -43,6 +43,7 @@ type Config struct {
 	BandwidthAutoDetect  int
 	ConnectionType       int
 	SplitUserDomain		 bool
+	DefaultDomain		 string
 }
 
 func (c *Config) NewApi() {
@@ -158,16 +159,14 @@ func (c *Config) HandleDownload(w http.ResponseWriter, r *http.Request) {
 	host = strings.Replace(host, "{{ preferred_username }}", userName, 1)
 
 	// split the username into user and domain
-	var user string
-	var domain string
+	var user = userName
+	var domain = c.DefaultDomain
 	if c.SplitUserDomain {
 		creds := strings.SplitN(userName, "@", 2)
 		user = creds[0]
 		if len(creds) > 1 {
 			domain = creds[1]
 		}
-	} else {
-		user = userName
 	}
 
 	render := user

config/configuration.go

@@ -58,6 +58,7 @@ type ClientConfig struct {
 	ConnectionType      int
 	UsernameTemplate    string
 	SplitUserDomain     bool
+	DefaultDomain       string
 }
 
 func init() {

dev/docker/docker-compose.yml

@@ -33,16 +33,4 @@ services:
       volumes:
         - ${PWD}/xrdp_users.txt:/root/createusers.txt
       environment:
-        TZ: "Europe/London"
-  rdpgw:
-      build: .
-      ports:
-        - 9443:9443
-      restart: on-failure
-      depends_on:
-        - keycloak
-      healthcheck:
-        test: ["CMD", "curl", "-f", "http://keycloak:8080"]
-        interval: 30s
-        timeout: 10s
-        retries: 10
+        TZ: "Europe/Amsterdam"

main.go

@@ -77,6 +77,7 @@ func main() {
 		BandwidthAutoDetect:  conf.Client.BandwidthAutoDetect,
 		ConnectionType:       conf.Client.ConnectionType,
 		SplitUserDomain:      conf.Client.SplitUserDomain,
+		DefaultDomain:		  conf.Client.DefaultDomain,
 	}
 	api.NewApi()