From a655e7f820854a8f60748222032787aa04d67104 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Mon, 12 Jul 2021 15:21:07 -0700
Subject: [PATCH] fix: use browser redirect URL for IDP callback (#12689)

if browser_redirect_url is set use that for IDP callback
automatically, if we do not have to set REDIRECT_URI
for OpenID callback URL.
---
 cmd/common-main.go | 1 +
 cmd/net.go         | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/cmd/common-main.go b/cmd/common-main.go
index 8c9b537fb..c0b04a7b7 100644
--- a/cmd/common-main.go
+++ b/cmd/common-main.go
@@ -428,6 +428,7 @@ func handleCommonEnvVars() {
 				err := fmt.Errorf("URL contains unexpected resources, expected URL to be of http(s)://minio.example.com format: %v", u)
 				logger.Fatal(err, "Invalid MINIO_BROWSER_REDIRECT value is environment variable")
 			}
+			u.Path = "" // remove any path component such as `/`
 			globalBrowserRedirectURL = u
 		}
 	}
diff --git a/cmd/net.go b/cmd/net.go
index a0ba9ff0e..9caa0f04e 100644
--- a/cmd/net.go
+++ b/cmd/net.go
@@ -157,6 +157,9 @@ func sortIPs(ipList []string) []string {
 }
 
 func getConsoleEndpoints() (consoleEndpoints []string) {
+	if globalBrowserRedirectURL != nil {
+		return []string{globalBrowserRedirectURL.String()}
+	}
 	var ipList []string
 	if globalMinioConsoleHost == "" {
 		ipList = sortIPs(mustGetLocalIP4().ToSlice())