projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 e9c6e82f6e2c8c6dac3255fce957ff28d199505f..9988f6997a1b6f03ceb1d46505bbd4b84e7acee2 100644
(file)
--- a/
lib/controller/localdb/login_testuser.go
+++ b/
lib/controller/localdb/login_testuser.go
@@
-17,12
+17,12
@@
import (
)
type testLoginController struct {
)
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) {
}
func (ctrl *testLoginController) Logout(ctx context.Context, opts arvados.LogoutOptions) (arvados.LogoutResponse, error) {
- return
noopLogout(
ctrl.Cluster, opts)
+ return
logout(ctx,
ctrl.Cluster, opts)
}
func (ctrl *testLoginController) Login(ctx context.Context, opts arvados.LoginOptions) (arvados.LoginResponse, error) {
}
func (ctrl *testLoginController) Login(ctx context.Context, opts arvados.LoginOptions) (arvados.LoginResponse, error) {
@@
-45,7
+45,7
@@
func (ctrl *testLoginController) UserAuthenticate(ctx context.Context, opts arva
"username": username,
"email": user.Email,
}).Debug("test authentication succeeded")
"username": username,
"email": user.Email,
}).Debug("test authentication succeeded")
- return c
reateAPIClientAuthorization(ctx, ctrl.RailsProxy
, ctrl.Cluster.SystemRootToken, rpc.UserSessionAuthInfo{
+ return c
trl.Parent.CreateAPIClientAuthorization(ctx
, ctrl.Cluster.SystemRootToken, rpc.UserSessionAuthInfo{
Username: username,
Email: user.Email,
})
Username: username,
Email: user.Email,
})
@@
-82,7
+82,7
@@
const loginform = `
redir += '?'
}
const respj = await resp.json()
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>
}
</script>
</head>
@@
-90,7
+90,7
@@
const loginform = `
<h3>Arvados test login</h3>
<form method="POST">
<input id="return_to" type="hidden" name="return_to" value="{{.ReturnTo}}">
<h3>Arvados test login</h3>
<form method="POST">
<input id="return_to" type="hidden" name="return_to" value="{{.ReturnTo}}">
- username <input id="username" type="text" name="username" size=16>
+ username <input id="username" type="text" name="username"
autofocus
size=16>
password <input id="password" type="password" name="password" size=16>
<input type="submit" value="Log in">
<br>
password <input id="password" type="password" name="password" size=16>
<input type="submit" value="Log in">
<br>