Merge pull request #45 from dispatchrun/fix-43

tui: fix how auth errors are displayed in TUI mode

Author: chriso

cli/error.go

@@ -5,7 +5,7 @@ import "fmt"
 type authError struct{}
 
 func (authError) Error() string {
-	const message = "Authentication error when contacting the Dispatch API"
+	const message = "Authentication error"
 	var detail string
 	switch DispatchApiKeyLocation {
 	case "env":

cli/run.go

@@ -232,13 +232,14 @@ Run 'dispatch help run' to learn about Dispatch sessions.`, BridgeSession)
 						if ctx.Err() != nil {
 							return
 						}
-						switch e := err.(type) {
-						case authError:
-							failure(e.Error())
-							return
-						default:
-							slog.Warn(err.Error())
+						slog.Warn(err.Error())
+
+						if tui != nil {
+							if _, ok := err.(authError); ok {
+								tui.SetError(err)
+							}
 						}
+
 						time.Sleep(1 * time.Second)
 						continue
 					} else if res == nil {

cli/tui.go

@@ -89,6 +89,8 @@ type TUI struct {
 	windowHeight     int
 	selected         *DispatchID
 
+	err error
+
 	mu sync.Mutex
 }
 
@@ -249,7 +251,7 @@ func (t *TUI) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			case "s":
 				// Don't accept s/select until at least one function
 				// call has been received.
-				if len(t.calls) > 0 {
+				if len(t.calls) > 0 && t.err == nil {
 					cmds = append(cmds, focusSelect)
 				}
 			case "t":
@@ -341,6 +343,10 @@ func (t *TUI) View() string {
 		}
 	}
 
+	if t.err != nil {
+		statusBarContent = errorStyle.Render(t.err.Error())
+	}
+
 	t.viewport.SetContent(viewportContent)
 
 	// Shrink the viewport so it contains the content and status bar only.
@@ -945,6 +951,13 @@ func (t *TUI) Read(b []byte) (int, error) {
 	return t.logs.Read(b)
 }
 
+func (t *TUI) SetError(err error) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+
+	t.err = err
+}
+
 func statusString(status sdkv1.Status) string {
 	switch status {
 	case sdkv1.Status_STATUS_OK: