X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/09f4d9f7fd5fc0518aa7d614c7f061c0b8f7d5a4..5dc622e37805f511b04eb66557441b28fba13b80:/lib/controller/localdb/login_testuser.go

diff --git a/lib/controller/localdb/login_testuser.go b/lib/controller/localdb/login_testuser.go
index 823043702a..c567a06683 100644
--- a/lib/controller/localdb/login_testuser.go
+++ b/lib/controller/localdb/login_testuser.go
@@ -17,8 +17,8 @@ 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) {
@@ -45,7 +45,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,
 			})
@@ -72,7 +72,7 @@ const loginform = `
 	  }),
 	})
 	if (!resp.ok) {
-	  document.getElementById('error').innerHTML = 'authentication failed (default accounts are user/user, admin/admin)'
+	  document.getElementById('error').innerHTML = '<p>Authentication failed.</p><p>The "test login" users are defined in Clusters.[ClusterID].Login.Test.Users section of config.yml</p><p>If you are using arvbox, use "arvbox adduser" to add users.</p>'
 	  return
 	}
 	var redir = document.getElementById('return_to').value
@@ -82,7 +82,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>