diff --git a/cmd/common-main.go b/cmd/common-main.go index 21326da69..4a9f68b06 100644 --- a/cmd/common-main.go +++ b/cmd/common-main.go @@ -264,7 +264,7 @@ func initConsoleServer() (*restapi.Server, error) { return nil, err } - api := operations.NewConsoleAPI(swaggerSpec, buildOpenIDConsoleConfig()) + api := operations.NewConsoleAPI(swaggerSpec) if !serverDebugLog { // Disable console logging if server debug log is not enabled @@ -275,6 +275,12 @@ func initConsoleServer() (*restapi.Server, error) { api.Logger = noLog } + // Pass in console application config. This needs to happen before the + // ConfigureAPI() call. + restapi.GlobalMinIOConfig = restapi.MinIOConfig{ + OpenIDProviders: buildOpenIDConsoleConfig(), + } + server := restapi.NewServer(api) // register all APIs server.ConfigureAPI() diff --git a/go.mod b/go.mod index 982b6a558..6d7548f6e 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/lib/pq v1.10.4 github.com/miekg/dns v1.1.48 github.com/minio/cli v1.22.0 - github.com/minio/console v0.19.3 + github.com/minio/console v0.19.4-0.20220728202016-3b11556f4b9d github.com/minio/csvparser v1.0.0 github.com/minio/dperf v0.4.2 github.com/minio/highwayhash v1.0.2 diff --git a/go.sum b/go.sum index 6c9123b86..4c3a8b5b7 100644 --- a/go.sum +++ b/go.sum @@ -607,8 +607,8 @@ github.com/minio/cli v1.22.0 h1:VTQm7lmXm3quxO917X3p+el1l0Ca5X3S4PM2ruUYO68= github.com/minio/cli v1.22.0/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY= github.com/minio/colorjson v1.0.2 h1:Em3IM68MTm3h+Oxa0nxrV9VQqDgbxvC5iq5A+pqzDeI= github.com/minio/colorjson v1.0.2/go.mod h1:JWxcL2n8T8JVf+NY6awl6kn5nK49aAzHOeQEM33dL0k= -github.com/minio/console v0.19.3 h1:JthPmd8eNKLgQME5t775VmpH8b08pAxgIeHfP0uSxN0= -github.com/minio/console v0.19.3/go.mod h1:1qeA/u15v0TE/uC27o/jVK6MCpGpK97avKxp+SKBsuI= +github.com/minio/console v0.19.4-0.20220728202016-3b11556f4b9d h1:yAO+dCbXH4UMvZ3tC1XqX2LigQZdiGB7HEs9t5y2bYc= +github.com/minio/console v0.19.4-0.20220728202016-3b11556f4b9d/go.mod h1:1qeA/u15v0TE/uC27o/jVK6MCpGpK97avKxp+SKBsuI= github.com/minio/csvparser v1.0.0 h1:xJEHcYK8ZAjeW4hNV9Zu30u+/2o4UyPnYgyjWp8b7ZU= github.com/minio/csvparser v1.0.0/go.mod h1:lKXskSLzPgC5WQyzP7maKH7Sl1cqvANXo9YCto8zbtM= github.com/minio/dperf v0.4.2 h1:u2fcdXViX3+alZcEYSOh1crNbGtVU5drQ24lP3Xx6j8=