X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/12b5341528770adc532b6c3e169036addd945d52..7f4da9388e3d5ec8f38f6d6408916d1d46dfb10f:/lib/controller/rpc/conn.go?ds=sidebyside

diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index b5c56dbc4d..cd98b64718 100644
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -26,11 +26,11 @@ import (
 type TokenProvider func(context.Context) ([]string, error)
 
 func PassthroughTokenProvider(ctx context.Context) ([]string, error) {
-	if incoming, ok := auth.FromContext(ctx); !ok {
+	incoming, ok := auth.FromContext(ctx)
+	if !ok {
 		return nil, errors.New("no token provided")
-	} else {
-		return incoming.Tokens, nil
 	}
+	return incoming.Tokens, nil
 }
 
 type Conn struct {
@@ -170,9 +170,8 @@ func (conn *Conn) relativeToBaseURL(location string) string {
 		u.User = nil
 		u.Host = ""
 		return u.String()
-	} else {
-		return location
 	}
+	return location
 }
 
 func (conn *Conn) CollectionCreate(ctx context.Context, options arvados.CreateOptions) (arvados.Collection, error) {
@@ -423,8 +422,15 @@ func (conn *Conn) UserSessionCreate(ctx context.Context, options UserSessionCrea
 }
 
 func (conn *Conn) UserBatchUpdate(ctx context.Context, options arvados.UserBatchUpdateOptions) (arvados.UserList, error) {
-	ep := arvados.APIEndpoint{Method: "PATCH", Path: "arvados/v1/users/batch_update"}
+	ep := arvados.EndpointUserBatchUpdate
 	var resp arvados.UserList
 	err := conn.requestAndDecode(ctx, &resp, ep, nil, options)
 	return resp, err
 }
+
+func (conn *Conn) UserAuthenticate(ctx context.Context, options arvados.UserAuthenticateOptions) (arvados.APIClientAuthorization, error) {
+	ep := arvados.EndpointUserAuthenticate
+	var resp arvados.APIClientAuthorization
+	err := conn.requestAndDecode(ctx, &resp, ep, nil, options)
+	return resp, err
+}