projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17705-adc-arch-doc'
[arvados.git]
/
lib
/
controller
/
localdb
/
login_ldap.go
diff --git
a/lib/controller/localdb/login_ldap.go
b/lib/controller/localdb/login_ldap.go
index 6c430d69bbfee5505c056430540000059c0b4c4b..3f13c7b27aafed09f1c6b201270e034ca9c011d9 100644
(file)
--- a/
lib/controller/localdb/login_ldap.go
+++ b/
lib/controller/localdb/login_ldap.go
@@
-21,12
+21,12
@@
import (
)
type ldapLoginController struct {
)
type ldapLoginController struct {
- Cluster
*arvados.Cluster
- RailsProxy *railsProxy
+ Cluster *arvados.Cluster
+ Parent *Conn
}
func (ctrl *ldapLoginController) Logout(ctx context.Context, opts arvados.LogoutOptions) (arvados.LogoutResponse, error) {
}
func (ctrl *ldapLoginController) Logout(ctx context.Context, opts arvados.LogoutOptions) (arvados.LogoutResponse, error) {
- return
noopLogout(
ctrl.Cluster, opts)
+ return
logout(ctx,
ctrl.Cluster, opts)
}
func (ctrl *ldapLoginController) Login(ctx context.Context, opts arvados.LoginOptions) (arvados.LoginResponse, error) {
}
func (ctrl *ldapLoginController) Login(ctx context.Context, opts arvados.LoginOptions) (arvados.LoginResponse, error) {
@@
-143,7
+143,7
@@
func (ctrl *ldapLoginController) UserAuthenticate(ctx context.Context, opts arva
return arvados.APIClientAuthorization{}, errors.New("authentication succeeded but ldap returned no email address")
}
return arvados.APIClientAuthorization{}, errors.New("authentication succeeded but ldap returned no email address")
}
- return c
reateAPIClientAuthorization(ctx, ctrl.RailsProxy
, ctrl.Cluster.SystemRootToken, rpc.UserSessionAuthInfo{
+ return c
trl.Parent.CreateAPIClientAuthorization(ctx
, ctrl.Cluster.SystemRootToken, rpc.UserSessionAuthInfo{
Email: email,
FirstName: attrs["givenname"],
LastName: attrs["sn"],
Email: email,
FirstName: attrs["givenname"],
LastName: attrs["sn"],