new workspace wizard

auth/auth_ui/huh.go

@@ -14,6 +14,8 @@ import (
 // Huh is the Auth UI that uses the huh library to provide a terminal UI.
 type Huh struct{}
 
+var Theme = huh.ThemeBase16()
+
 func (h *Huh) RequestWorkspace(w io.Writer) (string, error) {
 	var workspace string
 	err := huh.NewForm(huh.NewGroup(
@@ -22,7 +24,7 @@ func (h *Huh) RequestWorkspace(w io.Writer) (string, error) {
 			Value(&workspace).
 			Validate(valWorkspace).
 			Description("The workspace name is the part of the URL that comes before `.slack.com' in\nhttps://<workspace>.slack.com/.  Both workspace name or URL are acceptable."),
-	)).Run()
+	)).WithTheme(Theme).Run()
 	if err != nil {
 		return "", err
 	}
@@ -44,7 +46,7 @@ func (*Huh) RequestCreds(w io.Writer, workspace string) (email string, passwd st
 				Placeholder("your slack password").
 				Validate(valRequired).EchoMode(huh.EchoModePassword),
 		),
-	)
+	).WithTheme(Theme)
 	err = f.Run()
 	return
 }
@@ -137,7 +139,7 @@ func (*Huh) RequestLoginType(w io.Writer, workspace string) (LoginOpts, error) {
 				return ""
 			}
 		}, &ret.Type))
-	if err := huh.NewForm(huh.NewGroup(fields...)).Run(); err != nil {
+	if err := huh.NewForm(huh.NewGroup(fields...)).WithTheme(Theme).Run(); err != nil {
 		return ret, err
 	}
 	if ret.Type == LUserBrowser {
@@ -170,7 +172,7 @@ func chooseBrowser() (string, error) {
 			DescriptionFunc(func() string {
 				return browsers[selection].Path
 			}, &selection),
-	)).Run()
+	)).WithTheme(Theme).Run()
 	if err != nil {
 		return "", err
 	}
@@ -189,7 +191,7 @@ func (*Huh) ConfirmationCode(email string) (int, error) {
 			Description("Slack did not recognise the browser, and sent a confirmation code.  Please enter the confirmation code below.").
 			Value(&strCode).
 			Validate(valSixDigits),
-	))
+	)).WithTheme(Theme)
 	if err := q.Run(); err != nil {
 		return 0, err
 	}

cmd/slackdump/internal/ui/filepicker.go

@@ -21,7 +21,7 @@ func NewFilePicker(prompt string, homedir string, allowedExt ...string) FileSyst
 	fp := filepicker.New()
 	fp.AllowedTypes = allowedExt
 	fp.CurrentDirectory = homedir
-	fp.Styles.Cursor = HuhTheme.Focused.SelectedOption
+	fp.Styles.Cursor = HuhTheme().Focused.SelectedOption
 
 	return FileSystemModel{
 		filepicker: fp,

cmd/slackdump/internal/ui/filesystem.go

@@ -31,7 +31,7 @@ func FileSelector(msg, descr string, opt ...Option) (string, error) {
 	var resp struct {
 		Filename string
 	}
-	q := huh.NewForm(huh.NewGroup(fieldFileInput(&resp.Filename, msg, descr, *opts))).WithTheme(HuhTheme)
+	q := huh.NewForm(huh.NewGroup(fieldFileInput(&resp.Filename, msg, descr, *opts))).WithTheme(HuhTheme())
 
 	for {
 		if err := q.Run(); err != nil {

cmd/slackdump/internal/ui/input.go

@@ -14,7 +14,7 @@ func Input(msg, help string, validateFn func(s string) error) (string, error) {
 		Title(msg).
 		Description(help).
 		Validate(validateFn).
-		Value(&resp))).WithTheme(HuhTheme).
+		Value(&resp))).WithTheme(HuhTheme()).
 		Run(); err != nil {
 		return "", err
 	}

cmd/slackdump/internal/ui/keymap.go

@@ -0,0 +1,13 @@
+package ui
+
+import (
+	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/huh"
+)
+
+var DefaultHuhKeymap = huh.NewDefaultKeyMap()
+
+func init() {
+	// redefinition of some of the default keys.
+	DefaultHuhKeymap.Quit = key.NewBinding(key.WithKeys("ctrl+c", "esc"), key.WithHelp("esc", "quit"))
+}

cmd/slackdump/internal/ui/theme.go

@@ -6,7 +6,8 @@ import (
 	"github.com/charmbracelet/lipgloss"
 )
 
-var HuhTheme = ThemeBase16Ext() // Theme is the default Wizard theme.
+// HuhTheme is the default Wizard theme.
+var HuhTheme = ThemeBase16Ext
 
 type Theme struct {
 	Focused ControlStyle
@@ -127,7 +128,7 @@ func ThemeBase16Ext() *huh.Theme {
 	t.Focused.Title = t.Focused.Title.Foreground(cyan)
 	t.Focused.NoteTitle = t.Focused.NoteTitle.Foreground(cyan)
 	t.Focused.Directory = t.Focused.Directory.Foreground(cyan)
-	t.Focused.Description = t.Focused.Description.Foreground(gray)
+	t.Focused.Description = t.Focused.Description.Foreground(white)
 	t.Focused.ErrorIndicator = t.Focused.ErrorIndicator.Foreground(ltred)
 	t.Focused.ErrorMessage = t.Focused.ErrorMessage.Foreground(ltred)
 	t.Focused.SelectSelector = t.Focused.SelectSelector.Foreground(yellow)

cmd/slackdump/internal/ui/updaters/picklist.go

@@ -22,7 +22,7 @@ func NewPicklist[T comparable](v *T, s *huh.Select[T]) *Model[T] {
 	m := &Model[T]{
 		s: s.Value(v).
 			Description("Select an option").
-			WithTheme(ui.HuhTheme).
+			WithTheme(ui.HuhTheme()).
 			WithKeyMap(huh.NewDefaultKeyMap()),
 		help: help.New(),
 

cmd/slackdump/internal/wizard/model.go

@@ -35,7 +35,7 @@ func newModel(m *menu) model {
 					Description("Slack workspace:  " + bootstrap.CurrentWsp()).
 					Options(options...),
 			),
-		).WithTheme(ui.HuhTheme),
+		).WithTheme(ui.HuhTheme()),
 	}
 }
 

cmd/slackdump/internal/workspace/wiz_select.go

@@ -134,5 +134,5 @@ func (m selectModel) View() string {
 	if m.finished {
 		return "" // don't render the table if we've selected a workspace
 	}
-	return m.style.FocusedBorder.Render((m.table.View()) + "\n\n" + ui.HuhTheme.Help.Ellipsis.Render("Select the workspace with arrow keys, press [Enter] to confirm, [Esc] to cancel."))
+	return m.style.FocusedBorder.Render((m.table.View()) + "\n\n" + ui.HuhTheme().Help.Ellipsis.Render("Select the workspace with arrow keys, press [Enter] to confirm, [Esc] to cancel."))
 }

cmd/slackdump/internal/workspace/workspaceui/dialogs.go

@@ -18,7 +18,7 @@ func askRetry(ctx context.Context, name string, err error) (retry bool) {
 		huh.NewConfirm().Title("Error Creating Workspace").
 			Description(msg).
 			Value(&retry).Affirmative("Retry").Negative("Cancel"),
-	)).WithTheme(ui.HuhTheme).RunWithContext(ctx); err != nil {
+	)).WithTheme(ui.HuhTheme()).RunWithContext(ctx); err != nil {
 		return false
 	}
 	return retry
@@ -30,5 +30,5 @@ func success(ctx context.Context, workspace string) error {
 			Description(fmt.Sprintf("Workspace %q was added and selected.\n\n", workspace)).
 			Next(true).
 			NextLabel("Exit"),
-	)).WithTheme(ui.HuhTheme).RunWithContext(ctx)
+	)).WithTheme(ui.HuhTheme()).RunWithContext(ctx)
 }

cmd/slackdump/internal/workspace/workspaceui/ezlogin3000.go

@@ -0,0 +1,76 @@
+package workspaceui
+
+import (
+	"context"
+	"errors"
+
+	"github.com/rusq/slackdump/v3/auth"
+
+	"github.com/rusq/slackdump/v3/auth/browser"
+	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/ui"
+
+	"github.com/charmbracelet/huh"
+)
+
+func ezLogin3000(ctx context.Context, mgr manager) error {
+	var (
+		legacy bool
+	)
+	form := huh.NewForm(huh.NewGroup(
+		huh.NewConfirm().
+			Title("Use legacy EZ-Login?").
+			Description("Do you want to use the legacy login?").
+			Value(&legacy),
+	)).WithTheme(ui.HuhTheme()).WithKeyMap(ui.DefaultHuhKeymap)
+	if err := form.RunWithContext(ctx); err != nil {
+		if errors.Is(err, huh.ErrUserAborted) {
+			return nil
+		}
+		return err
+	}
+	if legacy {
+		return playwrightLogin(ctx, mgr)
+	}
+	return rodLogin(ctx, mgr)
+
+}
+
+func playwrightLogin(ctx context.Context, mgr manager) error {
+	var brws = browser.Bchromium
+	formBrowser := huh.NewForm(huh.NewGroup(
+		huh.NewSelect[browser.Browser]().
+			Options(
+				huh.NewOption("Chromium", browser.Bchromium),
+				huh.NewOption("Firefox", browser.Bfirefox),
+			).
+			Value(&brws),
+	)).WithTheme(ui.HuhTheme()).WithKeyMap(ui.DefaultHuhKeymap)
+	if err := formBrowser.RunWithContext(ctx); err != nil {
+		if errors.Is(err, huh.ErrUserAborted) {
+			return nil
+		}
+		return err
+	}
+	prov, err := auth.NewBrowserAuth(ctx, auth.BrowserWithBrowser(brws))
+	if err != nil {
+		return err
+	}
+
+	name, err := createAndSelect(ctx, mgr, prov)
+	if err != nil {
+		return err
+	}
+	return success(ctx, name)
+}
+
+func rodLogin(ctx context.Context, mgr manager) error {
+	prov, err := auth.NewRODAuth(ctx)
+	if err != nil {
+		return err
+	}
+	name, err := createAndSelect(ctx, mgr, prov)
+	if err != nil {
+		return err
+	}
+	return success(ctx, name)
+}

cmd/slackdump/internal/workspace/workspaceui/tokencookie.go

@@ -18,6 +18,7 @@ func prgTokenCookie(ctx context.Context, m manager) error {
 		workspace string
 		confirmed bool
 	)
+
 	for !confirmed {
 		f := huh.NewForm(huh.NewGroup(
 			huh.NewInput().Title("Token").
@@ -30,11 +31,11 @@ func prgTokenCookie(ctx context.Context, m manager) error {
 				Placeholder("xoxd-...").
 				Value(&cookie),
 			huh.NewConfirm().Title("Confirm creation of workspace?").
-				Description("Once confirmed this will create a new workspace with the provided token and cookie").
+				Description("Once confirmed this will check the credentials for validity, detect the workspace \nand create a new workspace with the provided token and cookie").
 				Value(&confirmed).
 				Validate(makeValidator(ctx, &token, &cookie, auth.NewValueAuth)),
-		)).WithTheme(ui.HuhTheme)
-		if err := f.Run(); err != nil {
+		)).WithTheme(ui.HuhTheme()).WithKeyMap(ui.DefaultHuhKeymap)
+		if err := f.RunWithContext(ctx); err != nil {
 			return err
 		}
 		if !confirmed {
@@ -106,7 +107,7 @@ func prgTokenCookieFile(ctx context.Context, m manager) error {
 				Description("Once confirmed this will create a new workspace with the provided token and cookie").
 				Value(&confirmed).
 				Validate(makeValidator(ctx, &token, &cookiefile, auth.NewCookieFileAuth)),
-		)).WithTheme(ui.HuhTheme)
+		)).WithTheme(ui.HuhTheme()).WithKeyMap(ui.DefaultHuhKeymap)
 		if err := f.Run(); err != nil {
 			return err
 		}

cmd/slackdump/internal/workspace/workspaceui/workspaceui.go

@@ -58,6 +58,14 @@ func WorkspaceNew(ctx context.Context, _ *base.Command, _ []string) error {
 		},
 	}
 
+	// new workspace methods
+	var methods = map[string]func(context.Context, manager) error{
+		actLogin:     ezLogin3000,
+		actToken:     prgTokenCookie,
+		actTokenFile: prgTokenCookieFile,
+		actSecrets:   fileWithSecrets,
+	}
+
 LOOP:
 	for {
 		m := menu.New("New Workspace", items, true)
@@ -67,16 +75,14 @@ LOOP:
 		if m.Cancelled {
 			break LOOP
 		}
-		var err error
-		switch m.Selected.ID {
-		case actToken:
-			err = prgTokenCookie(ctx, mgr)
-		case actTokenFile:
-			err = prgTokenCookieFile(ctx, mgr)
-		case actExit:
+		if m.Selected.ID == actExit {
 			break LOOP
 		}
-		if err != nil {
+		fn, ok := methods[m.Selected.ID]
+		if !ok {
+			return errors.New("internal error:  unhandled login option")
+		}
+		if err := fn(ctx, mgr); err != nil {
 			if errors.Is(err, huh.ErrUserAborted) {
 				continue
 			}

cmd/slackdump/main.go

@@ -304,7 +304,7 @@ func whatDo() (choice, error) {
 			huh.NewOption(string(choiceHelp), choiceHelp),
 			huh.NewOption(string(choiceWizard), choiceWizard),
 			huh.NewOption(string(choiceExit), choiceExit),
-		).Value(&ans))).WithTheme(ui.HuhTheme).Run()
+		).Value(&ans))).WithTheme(ui.HuhTheme()).Run()
 
 	return ans, err
 }