16159: Expires tokens on logout on different login controllers.

[arvados.git] / lib / controller / localdb / login_testuser.go

diff --git a/lib/controller/localdb/login_testuser.go b/lib/controller/localdb/login_testuser.go
index 7bb620baa9e5083adf882caae40678c16bb96c23..9988f6997a1b6f03ceb1d46505bbd4b84e7acee2 100644 (file)
--- a/lib/controller/localdb/login_testuser.go
+++ b/lib/controller/localdb/login_testuser.go
@@ -7,15 +7,12 @@ package localdb
 import (
        "bytes"
        "context"
-       "errors"
        "fmt"
        "html/template"
-       "net/http"
 
        "git.arvados.org/arvados.git/lib/controller/rpc"
        "git.arvados.org/arvados.git/sdk/go/arvados"
        "git.arvados.org/arvados.git/sdk/go/ctxlog"
-       "git.arvados.org/arvados.git/sdk/go/httpserver"
        "github.com/sirupsen/logrus"
 )
 
@@ -25,12 +22,7 @@ type testLoginController struct {
 }
 
 func (ctrl *testLoginController) Logout(ctx context.Context, opts arvados.LogoutOptions) (arvados.LogoutResponse, error) {
-       err := ctrl.Parent.expireAPIClientAuthorization(ctx)
-       if err != nil {
-               ctxlog.FromContext(ctx).Errorf("attempting to expire token on logout: %q", err)
-               return arvados.LogoutResponse{}, httpserver.ErrorWithStatus(errors.New("could not expire token on logout"), http.StatusInternalServerError)
-       }
-       return noopLogout(ctrl.Cluster, opts)
+       return logout(ctx, ctrl.Cluster, opts)
 }
 
 func (ctrl *testLoginController) Login(ctx context.Context, opts arvados.LoginOptions) (arvados.LoginResponse, error) {