From 4082764d48847db42b5d817b05ff795a1f059cd2 Mon Sep 17 00:00:00 2001 From: Kanagaraj M Date: Mon, 11 Nov 2019 23:01:46 +0530 Subject: [PATCH] fix loading config from openid config_url (#8503) --- cmd/config/identity/openid/jwt.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/config/identity/openid/jwt.go b/cmd/config/identity/openid/jwt.go index 198e6ac4c..7dccc26f0 100644 --- a/cmd/config/identity/openid/jwt.go +++ b/cmd/config/identity/openid/jwt.go @@ -282,6 +282,13 @@ func LookupConfig(kv config.KVS, transport *http.Transport, closeRespFn func(io. jwksURL = env.Get(EnvIdentityOpenIDJWKSURL, kv.Get(JwksURL)) } + c = Config{ + ClaimPrefix: env.Get(EnvIdentityOpenIDClaimPrefix, kv.Get(ClaimPrefix)), + publicKeys: make(map[string]crypto.PublicKey), + transport: transport, + closeRespFn: closeRespFn, + } + configURL := env.Get(EnvIdentityOpenIDURL, kv.Get(ConfigURL)) if configURL != "" { c.URL, err = xnet.ParseHTTPURL(configURL) @@ -308,13 +315,6 @@ func LookupConfig(kv config.KVS, transport *http.Transport, closeRespFn func(io. return c, nil } - c = Config{ - ClaimPrefix: env.Get(EnvIdentityOpenIDClaimPrefix, kv.Get(ClaimPrefix)), - publicKeys: make(map[string]crypto.PublicKey), - transport: transport, - closeRespFn: closeRespFn, - } - c.JWKS.URL, err = xnet.ParseHTTPURL(jwksURL) if err != nil { return c, err