X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/23d90de7344ae39d1d0082a369b0dc5e9086531d..c9aaa4d329b08c8b1c8cfd566c5282ab57e97f05:/sdk/go/arvados/login.go diff --git a/sdk/go/arvados/login.go b/sdk/go/arvados/login.go index 26c04b2c13..ab76375462 100644 --- a/sdk/go/arvados/login.go +++ b/sdk/go/arvados/login.go @@ -6,14 +6,11 @@ package arvados import ( "bytes" - "encoding/json" "net/http" ) type LoginResponse struct { RedirectLocation string `json:"redirect_location,omitempty"` - Token string `json:"token,omitempty"` - Message string `json:"message,omitempty"` HTML bytes.Buffer `json:"-"` } @@ -22,12 +19,6 @@ func (resp LoginResponse) ServeHTTP(w http.ResponseWriter, req *http.Request) { if resp.RedirectLocation != "" { w.Header().Set("Location", resp.RedirectLocation) w.WriteHeader(http.StatusFound) - } else if resp.Token != "" || resp.Message != "" { - w.Header().Set("Content-Type", "application/json") - if resp.Token == "" { - w.WriteHeader(http.StatusUnauthorized) - } - json.NewEncoder(w).Encode(resp) } else { w.Header().Set("Content-Type", "text/html") w.Write(resp.HTML.Bytes()) @@ -35,7 +26,7 @@ func (resp LoginResponse) ServeHTTP(w http.ResponseWriter, req *http.Request) { } type LogoutResponse struct { - RedirectLocation string + RedirectLocation string `json:"redirect_location,omitempty"` } func (resp LogoutResponse) ServeHTTP(w http.ResponseWriter, req *http.Request) {