LoginCancel

auth/auth.go

@@ -52,6 +52,9 @@ var (
 	ErrNoToken      = errors.New("no token")
 	ErrNoCookies    = errors.New("no cookies")
 	ErrNotSupported = errors.New("not supported")
+	// ErrCancelled may be returned by auth providers, if the authentication
+	// process was cancelled.
+	ErrCancelled = errors.New("authentication cancelled")
 )
 
 type simpleProvider struct {

auth/auth_ui/auth_ui.go

@@ -6,8 +6,9 @@ import (
 )
 
 const (
-	LoginEmail = 0
-	LoginSSO   = 1
+	LoginEmail  = 0
+	LoginSSO    = 1
+	LoginCancel = 2
 )
 
 func Sanitize(workspace string) (string, error) {

auth/auth_ui/cli.go

@@ -51,7 +51,8 @@ func (cl *CLI) RequestLoginType(w io.Writer) (int, error) {
 		{"Google", LoginSSO},
 		{"Apple", LoginSSO},
 		{"Login with Single-Sign-On (SSO)", LoginSSO},
-		{"Other", LoginSSO},
+		{"Other/Manual", LoginSSO},
+		{"Cancel", LoginCancel},
 	}
 
 	var idx int = -1
@@ -60,7 +61,7 @@ func (cl *CLI) RequestLoginType(w io.Writer) (int, error) {
 		for i, t := range types {
 			fmt.Fprintf(w, "\t%d. %s\n", i+1, t.name)
 		}
-		fmt.Fprintf(w, "Enter number: ")
+		fmt.Fprintf(w, "Enter number, and press Enter: ")
 
 		_, err := fmt.Fscanf(os.Stdin, "%d", &idx)
 		if err != nil {

auth/auth_ui/huh.go

@@ -1,6 +1,7 @@
 package auth_ui
 
 import (
+	"fmt"
 	"io"
 
 	"github.com/charmbracelet/huh"
@@ -29,8 +30,13 @@ func (*Huh) Stop() {}
 func (*Huh) RequestCreds(w io.Writer, workspace string) (email string, passwd string, err error) {
 	f := huh.NewForm(
 		huh.NewGroup(
-			huh.NewInput().Title("Slack email").Inline(true).Value(&email).Validate(valAND(valEmail, valRequired)),
-			huh.NewInput().Title("Slack password").Inline(true).Value(&passwd).Password(true).Validate(valRequired).Password(true),
+			huh.NewInput().
+				Title("You Slack Login Email").Value(&email).
+				Description(fmt.Sprintf("This is the email that you log into %s with.", workspace)).
+				Validate(valAND(valEmail, valRequired)),
+			huh.NewInput().
+				Title("Password").Value(&passwd).
+				Validate(valRequired).Password(true),
 		),
 	)
 	err = f.Run()
@@ -45,7 +51,9 @@ func (*Huh) RequestLoginType(w io.Writer) (int, error) {
 			huh.NewOption("Google", LoginSSO),
 			huh.NewOption("Apple", LoginSSO),
 			huh.NewOption("Login with Single-Sign-On (SSO)", LoginSSO),
-			huh.NewOption("Other", LoginSSO),
+			huh.NewOption("Other/Manual", LoginSSO),
+			huh.NewOption("------", LoginCancel),
+			huh.NewOption("Cancel", LoginCancel),
 		).
 		Value(&loginType).
 		Description("If you are not sure, select 'Other'.").

auth/rod.go

@@ -59,18 +59,21 @@ func NewRODAuth(ctx context.Context, opts ...Option) (RodAuth, error) {
 	} else {
 		r.opts.workspace = wsp
 	}
+
 	resp, err := r.opts.ui.RequestLoginType(os.Stdout)
 	if err != nil {
 		return r, err
 	}
+
 	var sp simpleProvider
-	if resp == auth_ui.LoginSSO {
+	switch resp {
+	case auth_ui.LoginSSO:
 		var err error
 		sp.Token, sp.Cookie, err = slackauth.Browser(ctx, r.opts.workspace)
 		if err != nil {
 			return r, err
 		}
-	} else {
+	case auth_ui.LoginEmail:
 		var err error
 		username, password, err := r.opts.ui.RequestCreds(os.Stdout, r.opts.workspace)
 		if err != nil {
@@ -83,13 +86,16 @@ func NewRODAuth(ctx context.Context, opts ...Option) (RodAuth, error) {
 			return r, fmt.Errorf("password cannot be empty")
 		}
 		sctx, cancel := context.WithCancel(ctx)
-		go spinner.New().Title("Logging in...").Context(sctx).Run()
+		spin := spinner.New().Title("Logging in...").Context(sctx)
+		go spin.Run()
 		sp.Token, sp.Cookie, err = slackauth.Headless(ctx, r.opts.workspace, username, password)
 		cancel()
 		if err != nil {
 			return r, err
 		}
 		fmt.Fprintln(os.Stderr, "authenticated.")
+	case auth_ui.LoginCancel:
+		return r, ErrCancelled
 	}
 
 	return RodAuth{

cmd/slackdump/internal/auth/new.go

@@ -2,6 +2,7 @@ package auth
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/rusq/slackdump/v2/auth"
@@ -60,6 +61,10 @@ func runWspNew(ctx context.Context, cmd *base.Command, args []string) error {
 	prov, err := m.Auth(ctx, wsp, creds)
 	if err != nil {
 		base.SetExitStatus(base.SAuthError)
+		if errors.Is(err, auth.ErrCancelled) {
+			lg.Println(auth.ErrCancelled)
+			return nil
+		}
 		return err
 	}
 

go.mod

@@ -4,7 +4,7 @@ go 1.21.4
 
 require (
 	github.com/MercuryEngineering/CookieMonster v0.0.0-20180304172713-1584578b3403
-	github.com/charmbracelet/huh v0.2.3
+	github.com/charmbracelet/huh v0.2.4-0.20240104183627-a92fbe913dd7
 	github.com/charmbracelet/huh/spinner v0.0.0-20231222231237-4bd4657a36ac
 	github.com/fatih/color v1.16.0
 	github.com/go-playground/locales v0.14.1

go.sum

@@ -19,6 +19,8 @@ github.com/charmbracelet/glamour v0.6.0 h1:wi8fse3Y7nfcabbbDuwolqTqMQPMnVPeZhDM2
 github.com/charmbracelet/glamour v0.6.0/go.mod h1:taqWV4swIMMbWALc0m7AfE9JkPSU8om2538k9ITBxOc=
 github.com/charmbracelet/huh v0.2.3 h1:fZaqnd/fiO7jlfcLqhP2iwpLt670IaHQfL/7Qu+fBm0=
 github.com/charmbracelet/huh v0.2.3/go.mod h1:XmADLRnJs/Jqw7zIbi9BTss5gXbOkR6feyVoNAp19rA=
+github.com/charmbracelet/huh v0.2.4-0.20240104183627-a92fbe913dd7 h1:RMo0SwJr+Nw+0rePd09AtOuvo75eSfMPgzJIIk8Rhvc=
+github.com/charmbracelet/huh v0.2.4-0.20240104183627-a92fbe913dd7/go.mod h1:NlYSEnyQxG6pAy5MfrUXJdJOYQv691EwTLbjo8Nw3us=
 github.com/charmbracelet/huh/spinner v0.0.0-20231222231237-4bd4657a36ac h1:sl0PfzeQCpHWWNxs9iimnTivB5WK+ln85mBBNFxLFOg=
 github.com/charmbracelet/huh/spinner v0.0.0-20231222231237-4bd4657a36ac/go.mod h1:CM9bYw6ky86T3ZCniTp4Mj4n3TXwwp8GCHxeUsKiITo=
 github.com/charmbracelet/lipgloss v0.9.1 h1:PNyd3jvaJbg4jRHKWXnCj1akQm4rh8dbEzN1p/u1KWg=