X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/98db65de63c9e2acfeae6636ccc619171635bda0..32ad89ae2fe1732b659643bda98d5ab8bc6ab744:/lib/controller/localdb/login_testuser.go?ds=sidebyside

diff --git a/lib/controller/localdb/login_testuser.go b/lib/controller/localdb/login_testuser.go
index e9c6e82f6e..2c7e43bddd 100644
--- a/lib/controller/localdb/login_testuser.go
+++ b/lib/controller/localdb/login_testuser.go
@@ -17,11 +17,15 @@ import (
 )
 
 type testLoginController struct {
-	Cluster    *arvados.Cluster
-	RailsProxy *railsProxy
+	Cluster *arvados.Cluster
+	Parent  *Conn
 }
 
 func (ctrl *testLoginController) Logout(ctx context.Context, opts arvados.LogoutOptions) (arvados.LogoutResponse, error) {
+	err := ctrl.Parent.ExpireAPIClientAuthorization(ctx)
+	if err != nil {
+		return arvados.LogoutResponse{}, err
+	}
 	return noopLogout(ctrl.Cluster, opts)
 }
 
@@ -45,7 +49,7 @@ func (ctrl *testLoginController) UserAuthenticate(ctx context.Context, opts arva
 				"username": username,
 				"email":    user.Email,
 			}).Debug("test authentication succeeded")
-			return createAPIClientAuthorization(ctx, ctrl.RailsProxy, ctrl.Cluster.SystemRootToken, rpc.UserSessionAuthInfo{
+			return ctrl.Parent.CreateAPIClientAuthorization(ctx, ctrl.Cluster.SystemRootToken, rpc.UserSessionAuthInfo{
 				Username: username,
 				Email:    user.Email,
 			})
@@ -82,7 +86,7 @@ const loginform = `
 	  redir += '?'
 	}
         const respj = await resp.json()
-	document.location = redir + "api_token=" + respj.api_token
+	document.location = redir + "api_token=v2/" + respj.uuid + "/" + respj.api_token
       }
     </script>
   </head>