projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15003: Format durations as "336h", not "336h0m0s".
[arvados.git]
/
sdk
/
go
/
auth
/
auth.go
diff --git
a/sdk/go/auth/auth.go
b/sdk/go/auth/auth.go
index ad1d398c763d7eaacefefcde8993e39044582f2a..3c266e0d3afda2254df6b3c7ccad7157a121bc6c 100644
(file)
--- a/
sdk/go/auth/auth.go
+++ b/
sdk/go/auth/auth.go
@@
-19,7
+19,11
@@
func NewCredentials() *Credentials {
return &Credentials{Tokens: []string{}}
}
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
c := NewCredentials()
c.LoadTokensFromHTTPRequest(r)
return c