feat(login): add the ability to log in using an offline token (#450)

docs/commands/rhoas_login.adoc

@@ -36,6 +36,7 @@ $ rhoas login --print-sso-url
       --mas-auth-url string   The URL of the MAS-SSO Authentication server. (default "https://keycloak-edge-redhat-rhoam-user-sso.apps.mas-sso-stage.1gzl.s1.devshift.org/auth/realms/mas-sso-staging")
       --print-sso-url         Prints the console login URL, which you can use to log in to RHOAS from a different web browser. This is useful if you need to log in with different credentials than the credentials you used in your default web browser.
       --scope stringArray     Override the default OpenID scope. To specify multiple scopes, use a separate --scope for each scope. (default [openid])
+  -t, --token string          Allows you to log in using an offline token, which can be obtained at https://cloud.redhat.com/openshift/token.
 ....
 
 === Options inherited from parent commands

locales/cmd/login/active.en.toml

@@ -44,6 +44,9 @@ one = "The URL of the SSO Authentication server."
 description = 'Description for the --auth-url flag'
 one = "The URL of the MAS-SSO Authentication server."
 
+[login.flag.token]
+one = "Allows you to log in using an offline token, which can be obtained at https://cloud.redhat.com/openshift/token."
+
 [login.flag.printSsoUrl]
 description = 'Description for the --print-sso-url'
 one = "Prints the console login URL, which you can use to log in to RHOAS from a different web browser. This is useful if you need to log in with different credentials than the credentials you used in your default web browser."
@@ -80,10 +83,26 @@ one = 'Redirected to callback URL: {{.URL}}'
 description = 'Log in success message'
 one = 'You are now logged in as "{{.Username}}"'
 
+[login.log.info.loginSuccessNoUsername]
+description = 'Log in success message'
+one = 'You are now logged in'
+
 [login.log.info.openSSOUrl]
 description = 'Info message for opening auth URL instructions'
 one = 'Open the following URL in your browser to log in:'
 
 [login.log.error.unableToStartServer]
 description = 'Error message for when unable to start server'
 one = 'unable to start server: {{.Error}}'
+
+[login.log.info.loggingIn]
+one = 'Logging in...'
+
+[login.log.info.loggedIn]
+one = 'Logged in successfully'
+
+[login.log.info.loggingInMAS]
+one = 'Logging in to MAS-SSO...'
+
+[login.log.info.loggedInMAS]
+one = 'Logged in successfully to MAS-SSO'

locales/cmd/whoami/active.en.toml

@@ -19,4 +19,7 @@ description = 'Examples of how to use the command'
 one = '''
 # print current username
 $ rhoas whoami
-'''
+'''
+
+[whoami.log.info.tokenHasNoUsername]
+one = 'Token has no username'

locales/connection/active.en.toml

@@ -1,5 +1,8 @@
 [connection.error.notLoggedInError]
 one = 'not logged in. Run "rhoas login" to authenticate'
 
+[connection.error.notLoggedInMASError]
+one = 'not logged in to MAS-SSO. Run "rhoas login" to authenticate'
+
 [connection.error.sessionExpiredError]
 one = 'session expired. Run "rhoas login" to authenticate'

pkg/auth/login/login.go

@@ -37,14 +37,18 @@ type SSOConfig struct {
 // https://tools.ietf.org/html/rfc6749#section-4.1
 func (a *AuthorizationCodeGrant) Execute(ctx context.Context, ssoCfg *SSOConfig, masSSOCfg *SSOConfig) (err error) {
 	// log in to SSO
+	a.Logger.Info(localizer.MustLocalizeFromID("login.log.info.loggingIn"))
 	if err = a.loginSSO(ctx, ssoCfg); err != nil {
 		return err
 	}
+	a.Logger.Info(localizer.MustLocalizeFromID("login.log.info.loggedIn"))
 
+	a.Logger.Info(localizer.MustLocalizeFromID("login.log.info.loggingInMAS"))
 	// log in to MAS-SSO
 	if err = a.loginMAS(ctx, masSSOCfg); err != nil {
 		return err
 	}
+	a.Logger.Info(localizer.MustLocalizeFromID("login.log.info.loggedInMAS"))
 
 	return nil
 }

pkg/cmd/cluster/connect/connect.go

@@ -3,6 +3,7 @@ package connect
 import (
 	"context"
 	"errors"
+
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/config"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/localizer"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cluster"
@@ -16,7 +17,7 @@ import (
 
 type Options struct {
 	Config     config.IConfig
-	Connection func() (connection.Connection, error)
+	Connection func(connectionCfg *connection.Config) (connection.Connection, error)
 	Logger     func() (logging.Logger, error)
 	IO         *iostreams.IOStreams
 
@@ -65,7 +66,7 @@ func NewConnectCommand(f *factory.Factory) *cobra.Command {
 }
 
 func runBind(opts *Options) error {
-	connection, err := opts.Connection()
+	connection, err := opts.Connection(connection.DefaultConfigSkipMasAuth)
 	if err != nil {
 		return err
 	}

pkg/cmd/cluster/status/status.go

@@ -22,7 +22,7 @@ import (
 
 type Options struct {
 	Config     config.IConfig
-	Connection func() (connection.Connection, error)
+	Connection factory.ConnectionFunc
 	Logger     func() (logging.Logger, error)
 	IO         *iostreams.IOStreams
 
@@ -53,7 +53,7 @@ func NewStatusCommand(f *factory.Factory) *cobra.Command {
 }
 
 func runStatus(opts *Options) error {
-	connection, err := opts.Connection()
+	connection, err := opts.Connection(connection.DefaultConfigSkipMasAuth)
 	if err != nil {
 		return err
 	}

pkg/cmd/factory/default.go

@@ -41,7 +41,7 @@ func New(cliVersion string) *Factory {
 		return logger, nil
 	}
 
-	connectionFunc := func() (connection.Connection, error) {
+	connectionFunc := func(connectionCfg *connection.Config) (connection.Connection, error) {
 		if conn != nil {
 			return conn, nil
 		}
@@ -94,6 +94,8 @@ func New(cliVersion string) *Factory {
 			return nil, err
 		}
 
+		builder.WithConnectionConfig(connectionCfg)
+
 		conn, err = builder.Build()
 		if err != nil {
 			return nil, err

pkg/cmd/factory/factory.go

@@ -15,7 +15,9 @@ type Factory struct {
 	// Interface to read/write to the config
 	Config config.IConfig
 	// Creates a connection to the API
-	Connection func() (connection.Connection, error)
+	Connection ConnectionFunc
 	// Returns a logger to create leveled logs in the application
 	Logger func() (logging.Logger, error)
 }
+
+type ConnectionFunc func(cfg *connection.Config) (connection.Connection, error)

pkg/cmd/kafka/create/create.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/flag"
 	flagutil "github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmdutil/flags"
+	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/connection"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/kafka"
 
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/localizer"
@@ -21,7 +22,6 @@ import (
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/dump"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/iostreams"
 
-	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/connection"
 	pkgKafka "github.com/bf2fc6cc711aee1a0c2a/cli/pkg/kafka"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/logging"
 
@@ -46,7 +46,7 @@ type Options struct {
 
 	IO         *iostreams.IOStreams
 	Config     config.IConfig
-	Connection func() (connection.Connection, error)
+	Connection factory.ConnectionFunc
 	Logger     func() (logging.Logger, error)
 }
 
@@ -122,7 +122,7 @@ func runCreate(opts *Options) error {
 		return err
 	}
 
-	connection, err := opts.Connection()
+	connection, err := opts.Connection(connection.DefaultConfigSkipMasAuth)
 	if err != nil {
 		return err
 	}
@@ -200,7 +200,7 @@ func runCreate(opts *Options) error {
 
 // Show a prompt to allow the user to interactively insert the data for their Kafka
 func promptKafkaPayload(opts *Options) (payload *kasclient.KafkaRequestPayload, err error) {
-	connection, err := opts.Connection()
+	connection, err := opts.Connection(connection.DefaultConfigSkipMasAuth)
 	if err != nil {
 		return nil, err
 	}

pkg/cmd/kafka/create/create_test.go

@@ -60,7 +60,7 @@ func TestNewCreateCommand(t *testing.T) {
 						AccessToken:  "valid",
 						RefreshToken: "valid",
 					}),
-					Connection: func() (connection.Connection, error) {
+					Connection: func(connectionCfg *connection.Config) (connection.Connection, error) {
 						mockDefaultAPI := &kasclient.DefaultApiMock{}
 						mockDefaultAPI.CreateKafkaFunc = func(ctx context.Context) kasclient.ApiCreateKafkaRequest {
 							req := kasclient.ApiCreateKafkaRequest{
@@ -111,7 +111,7 @@ func TestNewCreateCommand(t *testing.T) {
 						AccessToken:  "valid",
 						RefreshToken: "valid",
 					}),
-					Connection: func() (connection.Connection, error) {
+					Connection: func(connectionCfg *connection.Config) (connection.Connection, error) {
 						mockDefaultAPI := &kasclient.DefaultApiMock{}
 						mockDefaultAPI.CreateKafkaFunc = func(ctx context.Context) kasclient.ApiCreateKafkaRequest {
 							req := kasclient.ApiCreateKafkaRequest{
@@ -162,7 +162,7 @@ func TestNewCreateCommand(t *testing.T) {
 						AccessToken:  "valid",
 						RefreshToken: "valid",
 					}),
-					Connection: func() (connection.Connection, error) {
+					Connection: func(connectionCfg *connection.Config) (connection.Connection, error) {
 						mockDefaultAPI := &kasclient.DefaultApiMock{}
 						mockDefaultAPI.CreateKafkaFunc = func(ctx context.Context) kasclient.ApiCreateKafkaRequest {
 							req := kasclient.ApiCreateKafkaRequest{
@@ -214,7 +214,7 @@ func TestNewCreateCommand(t *testing.T) {
 						AccessToken:  "valid",
 						RefreshToken: "valid",
 					}),
-					Connection: func() (connection.Connection, error) {
+					Connection: func(connectionCfg *connection.Config) (connection.Connection, error) {
 						mockDefaultAPI := &kasclient.DefaultApiMock{}
 						mockDefaultAPI.CreateKafkaFunc = func(ctx context.Context) kasclient.ApiCreateKafkaRequest {
 							req := kasclient.ApiCreateKafkaRequest{

pkg/cmd/kafka/delete/delete.go

@@ -7,6 +7,7 @@ import (
 
 	kasclient "github.com/bf2fc6cc711aee1a0c2a/cli/pkg/api/kas/client"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmdutil"
+	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/connection"
 
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/iostreams"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/kafka"
@@ -17,7 +18,6 @@ import (
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/config"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/localizer"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/factory"
-	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/connection"
 	"github.com/spf13/cobra"
 )
 
@@ -28,7 +28,7 @@ type options struct {
 
 	IO         *iostreams.IOStreams
 	Config     config.IConfig
-	Connection func() (connection.Connection, error)
+	Connection factory.ConnectionFunc
 	Logger     func() (logging.Logger, error)
 }
 
@@ -109,7 +109,7 @@ func runDelete(opts *options) error {
 		return err
 	}
 
-	connection, err := opts.Connection()
+	connection, err := opts.Connection(connection.DefaultConfigSkipMasAuth)
 	if err != nil {
 		return err
 	}

pkg/cmd/kafka/describe/describe.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 
 	flagutil "github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmdutil/flags"
+	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/connection"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/iostreams"
 
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/flag"
@@ -15,7 +16,6 @@ import (
 	kasclient "github.com/bf2fc6cc711aee1a0c2a/cli/pkg/api/kas/client"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/factory"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmdutil"
-	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/connection"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/dump"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/kafka"
 	"github.com/spf13/cobra"
@@ -29,7 +29,7 @@ type Options struct {
 
 	IO         *iostreams.IOStreams
 	Config     config.IConfig
-	Connection func() (connection.Connection, error)
+	Connection factory.ConnectionFunc
 }
 
 // NewDescribeCommand describes a Kafka instance, either by passing an `--id flag`
@@ -96,7 +96,7 @@ func NewDescribeCommand(f *factory.Factory) *cobra.Command {
 }
 
 func runDescribe(opts *Options) error {
-	connection, err := opts.Connection()
+	connection, err := opts.Connection(connection.DefaultConfigSkipMasAuth)
 	if err != nil {
 		return err
 	}

pkg/cmd/kafka/list/list.go

@@ -8,6 +8,7 @@ import (
 
 	kasclient "github.com/bf2fc6cc711aee1a0c2a/cli/pkg/api/kas/client"
 	flagutil "github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmdutil/flags"
+	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/connection"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/iostreams"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/kafka"
 
@@ -19,7 +20,6 @@ import (
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/localizer"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/factory"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/flag"
-	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/connection"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/logging"
 
 	"gopkg.in/yaml.v2"
@@ -43,7 +43,7 @@ type options struct {
 
 	IO         *iostreams.IOStreams
 	Config     config.IConfig
-	Connection func() (connection.Connection, error)
+	Connection factory.ConnectionFunc
 	Logger     func() (logging.Logger, error)
 }
 
@@ -94,7 +94,7 @@ func runList(opts *options) error {
 		return err
 	}
 
-	connection, err := opts.Connection()
+	connection, err := opts.Connection(connection.DefaultConfigSkipMasAuth)
 	if err != nil {
 		return err
 	}

pkg/cmd/kafka/topic/create/create.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/localizer"
 
+	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/connection"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/kafka/topic"
 
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/flag"
@@ -19,7 +20,6 @@ import (
 
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/config"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/factory"
-	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/connection"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/logging"
 
 	"github.com/spf13/cobra"
@@ -39,7 +39,7 @@ type Options struct {
 
 	IO         *iostreams.IOStreams
 	Config     config.IConfig
-	Connection func() (connection.Connection, error)
+	Connection factory.ConnectionFunc
 	Logger     func() (logging.Logger, error)
 }
 
@@ -108,7 +108,7 @@ func NewCreateTopicCommand(f *factory.Factory) *cobra.Command {
 }
 
 func runCmd(opts *Options) error {
-	conn, err := opts.Connection()
+	conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth)
 	if err != nil {
 		return err
 	}