Use reserved namespace 'projects' for the redirect uri to handle situation where root pages domain is not handled with pages daemon

1 files changed, 3 insertions, 3 deletions

diff --git a/internal/auth/auth.go b/internal/auth/auth.go
index d3701207..936754cc 100644
--- a/internal/auth/auth.go
+++ b/internal/auth/auth.go
@@ -24,7 +24,7 @@ const (
 	tokenURLTemplate       = "%s/oauth/token"
 	tokenContentTemplate   = "client_id=%s&client_secret=%s&code=%s&grant_type=authorization_code&redirect_uri=%s"
 	callbackPath           = "/auth"
-	authorizeProxyTemplate = "%s/auth?domain=%s&state=%s"
+	authorizeProxyTemplate = "%s?domain=%s&state=%s"
 )
 
 // Auth handles authenticating users with GitLab API
@@ -308,9 +308,9 @@ func (a *Auth) checkTokenExists(session *sessions.Session, w http.ResponseWriter
 
 func (a *Auth) getProxyAddress(r *http.Request, state string) string {
 	if r.TLS != nil {
-		return fmt.Sprintf(authorizeProxyTemplate, "https://"+a.pagesDomain, r.Host, state)
+		return fmt.Sprintf(authorizeProxyTemplate, a.redirectURI, r.Host, state)
 	}
-	return fmt.Sprintf(authorizeProxyTemplate, "http://"+a.pagesDomain, r.Host, state)
+	return fmt.Sprintf(authorizeProxyTemplate, a.redirectURI, r.Host, state)
 }
 
 func destroySession(session *sessions.Session, w http.ResponseWriter, r *http.Request) {