From b9c605bf1a38fa06f902969ae98b19b14f3ffe39 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Wed, 8 Sep 2021 22:03:41 +0200
Subject: [PATCH] outpost/proxy: fix double slash when trailing slash in
 authentik_host

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 .../proxyv2/application/application.go        | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/internal/outpost/proxyv2/application/application.go b/internal/outpost/proxyv2/application/application.go
index ee1667f1d..9deb51cd7 100644
--- a/internal/outpost/proxyv2/application/application.go
+++ b/internal/outpost/proxyv2/application/application.go
@@ -48,18 +48,30 @@ func akProviderToEndpoint(p api.ProxyOutpostConfig, authentikHost string) oauth2
 		host := os.Getenv("AUTHENTIK_HOST")
 		authUrl = strings.ReplaceAll(authUrl, host, browserHost)
 	}
-	if strings.HasPrefix(authUrl, "http://localhost:8000") {
-		if authentikHost == "" {
-			log.Warning("Outpost has localhost/blank API Connection but no authentik_host is configured.")
-		} else {
-			authUrl = strings.ReplaceAll(authUrl, "http://localhost:8000", authentikHost)
-		}
-	}
-	return oauth2.Endpoint{
+	ep := oauth2.Endpoint{
 		AuthURL:   authUrl,
 		TokenURL:  p.OidcConfiguration.TokenEndpoint,
 		AuthStyle: oauth2.AuthStyleInParams,
 	}
+	u, err := url.Parse(authUrl)
+	if err != nil {
+		return ep
+	}
+	if u.Host != "localhost:8000" {
+		return ep
+	}
+	if authentikHost == "" {
+		log.Warning("Outpost has localhost/blank API Connection but no authentik_host is configured.")
+		return ep
+	}
+	aku, err := url.Parse(authentikHost)
+	if err != nil {
+		return ep
+	}
+	u.Host = aku.Host
+	u.Scheme = aku.Scheme
+	ep.AuthURL = u.String()
+	return ep
 }
 
 func NewApplication(p api.ProxyOutpostConfig, c *http.Client, cs *ak.CryptoStore, akHost string) *Application {