5824: Rename cookie to arvados_api_token.

diff --git a/sdk/go/auth/auth.go b/sdk/go/auth/auth.go
index 71f4c480f8d13386364f74ed9cd95151ecd5b326..ca4eb948b1220c982ef25fa03c9175f40148a797 100644 (file)
--- a/sdk/go/auth/auth.go
+++ b/sdk/go/auth/auth.go
@@ -68,7 +68,7 @@ func (a *Credentials) LoadTokensFromHTTPRequest(r *http.Request) {
 }
 
 func (a *Credentials) loadTokenFromCookie(r *http.Request) {
-       cookie, err := r.Cookie("api_token")
+       cookie, err := r.Cookie("arvados_api_token")
        if err != nil || len(cookie.Value) == 0 {
                return
        }

diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 9751cd18132f3e1968a9d3b3cbf0022cd0ab0284..5f546ced69f6648af5a0c4ef078c03d9fdead574 100644 (file)
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -178,7 +178,7 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
                // resulting page.
 
                http.SetCookie(w, &http.Cookie{
-                       Name:     "api_token",
+                       Name:     "arvados_api_token",
                        Value:    auth.EncodeTokenCookie([]byte(t)),
                        Path:     "/",
                        Expires:  time.Now().AddDate(10, 0, 0),

diff --git a/services/keep-web/handler_test.go b/services/keep-web/handler_test.go
index 9b5ab2a418b31f31a3758c2c6d8d26f53d2867ef..5b2a8256a2642f03fac860ef82af8bf23774907e 100644 (file)
--- a/services/keep-web/handler_test.go
+++ b/services/keep-web/handler_test.go
@@ -61,7 +61,7 @@ func (s *IntegrationSuite) TestVhostViaCookieValue(c *check.C) {
 }
 func authzViaCookieValue(r *http.Request, tok string) int {
        r.AddCookie(&http.Cookie{
-               Name:  "api_token",
+               Name:  "arvados_api_token",
                Value: auth.EncodeTokenCookie([]byte(tok)),
        })
        return http.StatusUnauthorized