(V2) google auth support

auth/auth_ui/auth_ui.go

@@ -14,6 +14,8 @@ const (
 	LInteractive LoginType = iota
 	// LHeadless is the email/password login type.
 	LHeadless
+	// LGoogleAuth is the google auth option
+	LGoogleAuth
 	// LCancel should be returned if the user cancels the login intent.
 	LCancel
 )

auth/auth_ui/cli.go

@@ -33,13 +33,14 @@ func (cl *CLI) RequestWorkspace(w io.Writer) (string, error) {
 	return Sanitize(workspace)
 }
 
-func (cl *CLI) RequestEmail(w io.Writer) (string, error) {
-	return prompt(w, "Enter Email: ", readln)
-}
-
-func (cl *CLI) RequestPassword(w io.Writer, account string) (string, error) {
+func (*CLI) RequestCreds(w io.Writer, workspace string) (email string, passwd string, err error) {
+	email, err = prompt(w, "Enter Email: ", readln)
+	if err != nil {
+		return
+	}
 	defer fmt.Fprintln(w)
-	return prompt(w, fmt.Sprintf("Enter Password for %s (won't be visible): ", account), readpwd)
+	passwd, err = prompt(w, fmt.Sprintf("Enter Password for %s (won't be visible): ", email), readpwd)
+	return
 }
 
 func (cl *CLI) RequestLoginType(w io.Writer) (LoginType, error) {
@@ -48,7 +49,7 @@ func (cl *CLI) RequestLoginType(w io.Writer) (LoginType, error) {
 		value LoginType
 	}{
 		{"Email", LHeadless},
-		{"Google", LInteractive},
+		{"Google", LGoogleAuth},
 		{"Apple", LInteractive},
 		{"Login with Single-Sign-On (SSO)", LInteractive},
 		{"Other/Manual", LInteractive},

auth/auth_ui/huh.go

@@ -42,7 +42,7 @@ func (*Huh) RequestCreds(w io.Writer, workspace string) (email string, passwd st
 			huh.NewInput().
 				Title("Password").Value(&passwd).
 				Placeholder("your slack password").
-				Validate(valRequired).Password(true),
+				Validate(valRequired).EchoMode(huh.EchoModePassword),
 		),
 	)
 	err = f.Run()
@@ -54,8 +54,8 @@ func (*Huh) RequestLoginType(w io.Writer) (LoginType, error) {
 	err := huh.NewSelect[LoginType]().Title("Select login type").
 		Options(
 			huh.NewOption("Email (manual)", LInteractive),
-			huh.NewOption("Email (automatic, experimental)", LHeadless),
-			huh.NewOption("Google", LInteractive),
+			huh.NewOption("Email (automatic)", LHeadless),
+			huh.NewOption("Google", LGoogleAuth),
 			huh.NewOption("Apple", LInteractive),
 			huh.NewOption("Login with Single-Sign-On (SSO)", LInteractive),
 			huh.NewOption("Other/Manual", LInteractive),

auth/rod.go

@@ -5,11 +5,19 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"time"
 
 	"github.com/rusq/slackauth"
+
 	"github.com/rusq/slackdump/v2/auth/auth_ui"
+	"github.com/rusq/slackdump/v2/logger"
 )
 
+// RODHeadlessTimeout is the default timeout for the headless login flow.
+// It is a net time of headless browser interaction, without the browser
+// starting time.
+const RODHeadlessTimeout = 40 * time.Second
+
 // RodAuth is an authentication provider that uses a headless or interactive
 // browser to authenticate with Slack, depending on the user's choice.  It uses
 // rod library to drive the browser via the CDP protocol.
@@ -26,12 +34,29 @@ type RodAuth struct {
 	opts options
 }
 
-func (p RodAuth) Type() Type {
-	return TypeRod
+type rodOpts struct {
+	ui             browserAuthUIExt
+	autoTimeout    time.Duration
+	userAgent      string
+	usermode       bool
+	bundledBrowser bool
 }
 
-type rodOpts struct {
-	ui browserAuthUIExt
+func (ro rodOpts) slackauthOpts() []slackauth.Option {
+	sopts := []slackauth.Option{
+		slackauth.WithChallengeFunc(ro.ui.ConfirmationCode),
+		slackauth.WithAutologinTimeout(ro.autoTimeout),
+	}
+	if ro.userAgent != "" {
+		sopts = append(sopts, slackauth.WithUserAgent(ro.userAgent))
+	}
+	if ro.usermode {
+		sopts = append(sopts, slackauth.WithForceUser())
+	}
+	if ro.bundledBrowser {
+		sopts = append(sopts, slackauth.WithBundledBrowser())
+	}
+	return sopts
 }
 
 type browserAuthUIExt interface {
@@ -53,7 +78,11 @@ func NewRODAuth(ctx context.Context, opts ...Option) (RodAuth, error) {
 	r := RodAuth{
 		opts: options{
 			rodOpts: rodOpts{
-				ui: &auth_ui.Huh{},
+				ui:             &auth_ui.Huh{},
+				autoTimeout:    RODHeadlessTimeout,
+				userAgent:      "", // slackauth default user agent.
+				usermode:       false,
+				bundledBrowser: false,
 			},
 		},
 	}
@@ -80,19 +109,28 @@ func NewRODAuth(ctx context.Context, opts ...Option) (RodAuth, error) {
 	if err != nil {
 		return r, err
 	}
+	sopts := r.opts.slackauthOpts()
+	if resp == auth_ui.LGoogleAuth {
+		// it doesn't need to know that this browser is just a puppet in the
+		// masterful hands.
+		sopts = append(sopts, slackauth.WithForceUser())
+	}
 
 	cl, err := slackauth.New(
 		r.opts.workspace,
-		slackauth.WithChallengeFunc(r.opts.ui.ConfirmationCode),
+		sopts...,
 	)
 	if err != nil {
 		return r, err
 	}
 	defer cl.Close()
 
+	lg := logger.FromContext(ctx)
+	t := time.Now()
 	var sp simpleProvider
 	switch resp {
-	case auth_ui.LInteractive:
+	case auth_ui.LInteractive, auth_ui.LGoogleAuth:
+		lg.Printf("ℹ️ Initialising browser, once the browser appears, login as usual")
 		var err error
 		sp.Token, sp.Cookie, err = cl.Manual(ctx)
 		if err != nil {
@@ -107,7 +145,7 @@ func NewRODAuth(ctx context.Context, opts ...Option) (RodAuth, error) {
 		return r, ErrCancelled
 	}
 
-	fmt.Fprintln(os.Stderr, "authenticated.")
+	lg.Printf("✅ authenticated (time taken: %s)", time.Since(t))
 
 	return RodAuth{
 		simpleProvider: sp,
@@ -125,7 +163,8 @@ func headlessFlow(ctx context.Context, cl *slackauth.Client, workspace string, u
 	if password == "" {
 		return sp, fmt.Errorf("password cannot be empty")
 	}
-	fmt.Println("Logging in to Slack, depending on your connection speed, it will take 25-40 seconds...")
+	logger.FromContext(ctx).Println("⏳ Logging in to Slack, depending on your connection speed, it will take 25-40 seconds...")
+
 	var loginErr error
 	sp.Token, sp.Cookie, loginErr = cl.Headless(ctx, username, password)
 	if loginErr != nil {

auth/rod_v2.go

@@ -0,0 +1,7 @@
+package auth
+
+// things specific to v2 (to ease backporting)
+
+func (p RodAuth) Type() Type {
+	return TypeRod
+}

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/rusq/dlog v1.4.0
 	github.com/rusq/osenv/v2 v2.0.1
 	github.com/rusq/secure v0.0.4
-	github.com/rusq/slackauth v0.3.1
+	github.com/rusq/slackauth v0.4.0
 	github.com/rusq/tracer v1.0.1
 	github.com/schollz/progressbar/v3 v3.13.0
 	github.com/slack-go/slack v0.14.0

go.sum

@@ -141,6 +141,8 @@ github.com/rusq/slackauth v0.3.0 h1:5ieWjlQHhmqMO4qhTsVZzXEsIt8AD6ADc2hhaxwERmY=
 github.com/rusq/slackauth v0.3.0/go.mod h1:/+6JZULYSpWk7/Dc232132wF6UbFOLV8DhSz55zBcnw=
 github.com/rusq/slackauth v0.3.1 h1:lAFuMQMVfe2VGZVCd8Hrwhqfrd8cy6nOzG0mhX9BvSg=
 github.com/rusq/slackauth v0.3.1/go.mod h1:/+6JZULYSpWk7/Dc232132wF6UbFOLV8DhSz55zBcnw=
+github.com/rusq/slackauth v0.4.0 h1:hNOEWw6Tji24MRJ8rsepgb4w47v0wPGxjhGpvkQJQJU=
+github.com/rusq/slackauth v0.4.0/go.mod h1:wAtNCbeKH0pnaZnqJjG5RKY3e5BF9F2L/YTzhOjBIb0=
 github.com/rusq/tracer v1.0.1 h1:5u4PCV8NGO97VuAINQA4gOVRkPoqHimLE2jpezRVNMU=
 github.com/rusq/tracer v1.0.1/go.mod h1:Rqu48C3/K8bA5NPmF20Hft73v431MQIdM+Co+113pME=
 github.com/schollz/progressbar/v3 v3.13.0 h1:9TeeWRcjW2qd05I8Kf9knPkW4vLM/hYoa6z9ABvxje8=