From 79580c1c51d88882e72e50943ccdfa0af5fc2563 Mon Sep 17 00:00:00 2001
From: Denys Konovalov <kontakt@denyskon.de>
Date: Sun, 15 Jan 2023 22:29:56 +0100
Subject: [PATCH] modernizations

---
 env/sample.config | 5 ++++-
 main.go           | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/env/sample.config b/env/sample.config
index fe4ef90..aaeb223 100644
--- a/env/sample.config
+++ b/env/sample.config
@@ -5,6 +5,9 @@ environment="development"
 host="localhost"
 port="3000"
 sessionSecret="super-secret"
+publicProto="https"
+public="oauth.example.com"
+publicPort="443"
 
 # Delete if not in use
 [gitea]
@@ -14,7 +17,7 @@ baseURL="https://gitea.yourcompany.com"
 authURI=
 accessTokenURI=
 userURI=
-callbackURI="http://localhost:3000/callback/gitea"
+callbackURI="https://oauth.example.com/callback/gitea"
 
 # Delete if not in use
 [gitlab]
diff --git a/main.go b/main.go
index 38df46b..a666136 100644
--- a/main.go
+++ b/main.go
@@ -169,8 +169,9 @@ func main() {
 	// redirect to correct auth/{provider} URL if Auth request is submited with a query param '&provider=X'
 	// TODO: Remove hardcoded http://
 	r.HandleFunc("/auth", func(w http.ResponseWriter, r *http.Request) {
+		proto := config.GetString("server.publicProto")
 		host := net.JoinHostPort(config.GetString("server.host"), config.GetString("server.port"))
-		URL := fmt.Sprintf("http://%s/auth/%s", host, r.FormValue("provider"))
+		URL := fmt.Sprintf("%s://%s/auth/%s", proto, host, r.FormValue("provider"))
 
 		log.Infof("redirecting to '%s'\n", URL)
 		http.Redirect(w, r, URL, http.StatusTemporaryRedirect)