X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f159fab8f9d6bc4254192ce43432defd5bd400aa..8f1185e3709f99475611c7f60122b4d2ebc67e5c:/sdk/go/auth/auth.go

diff --git a/sdk/go/auth/auth.go b/sdk/go/auth/auth.go
index ad1d398c76..3c266e0d3a 100644
--- a/sdk/go/auth/auth.go
+++ b/sdk/go/auth/auth.go
@@ -19,7 +19,11 @@ func NewCredentials() *Credentials {
 	return &Credentials{Tokens: []string{}}
 }
 
-func NewCredentialsFromHTTPRequest(r *http.Request) *Credentials {
+func CredentialsFromRequest(r *http.Request) *Credentials {
+	if c, ok := r.Context().Value(contextKeyCredentials).(*Credentials); ok {
+		// preloaded by middleware
+		return c
+	}
 	c := NewCredentials()
 	c.LoadTokensFromHTTPRequest(r)
 	return c