[ARVADOS] updated: 2.1.0-262-g6e7530185

[Git user]

Summary of changes:
 lib/controller/integration_test.go                       | 2 --
 lib/controller/rpc/conn.go                               | 1 -
 services/api/app/controllers/user_sessions_controller.rb | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

       via  6e7530185206e4c55696d20078aae4677e474fb7 (commit)
      from  f37a98d9509da449abf0d8c7bca298d0e702f4c9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 6e7530185206e4c55696d20078aae4677e474fb7
Author: Nico Cesar <nico at nicocesar.com>
Date:   Wed Jan 20 20:35:36 2021 -0500

    addressing https://dev.arvados.org/issues/17014#note-41
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index a574f3978..b240c216c 100644
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -21,7 +21,6 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
-	"time"
 
 	"git.arvados.org/arvados.git/lib/boot"
 	"git.arvados.org/arvados.git/lib/config"
@@ -211,7 +210,6 @@ func (s *IntegrationSuite) userClients(rootctx context.Context, c *check.C, conn
 			FirstName: "Example",
 			LastName:  "User",
 			Username:  "example",
-			ExpiresAt: time.Now().Add(1 * time.Hour),
 		},
 	})
 	c.Assert(err, check.IsNil)
diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index 455c20fa9..d9d24260b 100644
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -469,7 +469,6 @@ type UserSessionCreateOptions struct {
 
 func (conn *Conn) UserSessionCreate(ctx context.Context, options UserSessionCreateOptions) (arvados.LoginResponse, error) {
 	ep := arvados.APIEndpoint{Method: "POST", Path: "auth/controller/callback"}
-	// if ExpiresAt is empty value then add 2 hour expiration
 	var resp arvados.LoginResponse
 	err := conn.requestAndDecode(ctx, &resp, ep, nil, options)
 	return resp, err
diff --git a/services/api/app/controllers/user_sessions_controller.rb b/services/api/app/controllers/user_sessions_controller.rb
index 3d109c49c..da0523d2b 100644
--- a/services/api/app/controllers/user_sessions_controller.rb
+++ b/services/api/app/controllers/user_sessions_controller.rb
@@ -116,7 +116,7 @@ class UserSessionsController < ApplicationController
       # FIXME: if current_user has never authorized this app before,
       # ask for confirmation here!
 
-      return send_api_token_to(params[:return_to], current_user, params[:remote], params[:expires_at])
+      return send_api_token_to(params[:return_to], current_user, params[:remote])
     end
     p = []
     p << "auth_provider=#{CGI.escape(params[:auth_provider])}" if params[:auth_provider]

-----------------------------------------------------------------------


hooks/post-receive
--