Open browser at login URL

Author: arielshaqed

cmd/lakectl/cmd/login.go

@@ -8,17 +8,19 @@ import (
 	"time"
 
 	"github.com/cenkalti/backoff/v4"
+	"github.com/skratchdot/open-golang/open"
 	"github.com/spf13/cobra"
 	"github.com/treeverse/lakefs/pkg/api/apigen"
 )
 
 const (
 	// TODO(ariels): Underline the link?
-	webLoginTemplate = `Opening {{.RedirectURL|bold|blue}} where you should log in.
-
-If that URL does not open automatically, please open it manually and log in.
+	webLoginTemplate = `Opening {{.RedirectURL | blue | underline}} where you should log in.
+If it does not open automatically, please try to open it manually and log in.
+`
+	loggedInTemplate = `
+[{{.Time | green}}] {{"Logged in." | green | bold}}
 `
-	loggedInTemplate = `Logged in as {{.Username}}.`
 )
 
 type webLoginParams struct {
@@ -56,8 +58,11 @@ var loginCmd = &cobra.Command{
 		redirectURL := serverURL.ResolveReference(relativeLocation)
 
 		Write(webLoginTemplate, webLoginParams{RedirectURL: redirectURL.String()})
-		// TODO(ariels): Open redirectURL (xdg-open on Linux, something on MacOS, maybe
-		//     a library does it?)
+		err = open.Run(redirectURL.String())
+		if err != nil {
+			Warning(fmt.Sprintf("Failed to open URL: %s", err.Error()))
+			// Keep going, user can manually use the URL.
+		}
 
 		loginToken, err := backoff.RetryWithData(
 			func() (*apigen.AuthenticationToken, error) {
@@ -94,6 +99,8 @@ var loginCmd = &cobra.Command{
 		if err != nil {
 			DieErr(fmt.Errorf("save login token: %w", err))
 		}
+
+		Write(loggedInTemplate, struct{ Time string }{Time: time.Now().Format(time.DateTime)})
 	},
 }
 

cmd/lakectl/cmd/root.go

@@ -668,6 +668,9 @@ func getClientOptions(awsIAMparams *awsiam.IAMAuthParams, serverEndpoint string)
 	logger := logging.ContextUnavailable().WithField("component", "client_auth")
 
 	if awsIAMparams == nil {
+		if token == nil {
+			return nil
+		}
 		return []apigen.ClientOption{
 			internalidp.WithLoginTokenAuth(logger, internalidp.NewFixedLoginClient(token.Token)),
 		}

go.mod

@@ -186,6 +186,7 @@ require (
 	github.com/sagikazarmark/locafero v0.7.0 // indirect
 	github.com/samber/mo v1.11.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
 	github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6 // indirect

go.sum

@@ -984,6 +984,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
+github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
 github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
 github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=