projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15107-prefer-domain-for-username'
[arvados.git]
/
lib
/
controller
/
rpc
/
conn.go
diff --git
a/lib/controller/rpc/conn.go
b/lib/controller/rpc/conn.go
index cb23c7fad1ea99dce585f3626b66bf9130b82069..3d6a9852089c3005a084e61290da0b45f0a67489 100644
(file)
--- a/
lib/controller/rpc/conn.go
+++ b/
lib/controller/rpc/conn.go
@@
-315,9
+315,17
@@
func (conn *Conn) APIClientAuthorizationCurrent(ctx context.Context, options arv
return resp, err
}
return resp, err
}
+type UserSessionAuthInfo struct {
+ Email string `json:"email"`
+ AlternateEmails []string `json:"alternate_emails"`
+ FirstName string `json:"first_name"`
+ LastName string `json:"last_name"`
+ Username string `json:"username"`
+}
+
type UserSessionCreateOptions struct {
type UserSessionCreateOptions struct {
- AuthInfo
map[string]interface{}
`json:"auth_info"`
- ReturnTo string
`json:"return_to"`
+ AuthInfo
UserSessionAuthInfo
`json:"auth_info"`
+ ReturnTo string `json:"return_to"`
}
func (conn *Conn) UserSessionCreate(ctx context.Context, options UserSessionCreateOptions) (arvados.LoginResponse, error) {
}
func (conn *Conn) UserSessionCreate(ctx context.Context, options UserSessionCreateOptions) (arvados.LoginResponse, error) {