From 782e4e21c51b5ab7912bb414f9c36617479c329d Mon Sep 17 00:00:00 2001 From: Owen Schwartz Date: Sun, 6 Oct 2024 22:09:45 -0400 Subject: [PATCH] Its working! --- main.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index c79c472..664ede1 100644 --- a/main.go +++ b/main.go @@ -39,7 +39,7 @@ func (p *Badger) ServeHTTP(rw http.ResponseWriter, req *http.Request) { cookie, err := req.Cookie(SessionCookieName) if err != nil { // No session cookie, redirect to login - originalRequestURL := url.QueryEscape(req.URL.String()) + originalRequestURL := url.QueryEscape(fmt.Sprintf("%s://%s%s", p.getScheme(req), req.Host, req.URL.RequestURI())) http.Redirect(rw, req, fmt.Sprintf("%s/auth/login?redirect=%s", p.appBaseUrl, originalRequestURL), http.StatusFound) return } @@ -62,3 +62,10 @@ func (p *Badger) ServeHTTP(rw http.ResponseWriter, req *http.Request) { p.next.ServeHTTP(rw, req) } + +func (p *Badger) getScheme(req *http.Request) string { + if req.TLS != nil { + return "https" + } + return "http" +}