projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14366-crunch2-upgrade' refs #14366
[arvados.git]
/
services
/
keep-web
/
handler.go
diff --git
a/services/keep-web/handler.go
b/services/keep-web/handler.go
index 912398fa64db5d8b18605178f14a77884e234f1d..95948e32505f40112cff4da72c88692d7ea6edff 100644
(file)
--- a/
services/keep-web/handler.go
+++ b/
services/keep-web/handler.go
@@
-320,7
+320,7
@@
func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
if useSiteFS {
if tokens == nil {
if useSiteFS {
if tokens == nil {
- tokens = auth.
NewCredentialsFromHTTP
Request(r).Tokens
+ tokens = auth.
CredentialsFrom
Request(r).Tokens
}
h.serveSiteFS(w, r, tokens, credentialsOK, attachment)
return
}
h.serveSiteFS(w, r, tokens, credentialsOK, attachment)
return
@@
-342,7
+342,7
@@
func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
if tokens == nil {
if credentialsOK {
if tokens == nil {
if credentialsOK {
- reqTokens = auth.
NewCredentialsFromHTTP
Request(r).Tokens
+ reqTokens = auth.
CredentialsFrom
Request(r).Tokens
}
tokens = append(reqTokens, h.Config.AnonymousTokens...)
}
}
tokens = append(reqTokens, h.Config.AnonymousTokens...)
}