Skip to content

fix(auth): always show login URL so headless login can complete #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
theFong wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(auth): always show login URL so headless login can complete #420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 16 additions & 25 deletions pkg/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ import (
"bufio"
"errors"
"fmt"
"io"
"os"
"os/exec"
"runtime"
"strings"

"github.com/brevdev/brev-cli/pkg/config"
Expand Down Expand Up @@ -324,10 +323,20 @@ func (t Auth) LoginWithAPIKey(apiKey string, orgID string) error {
return nil
}

// showLoginURL displays the login link and CLI alternative for manual navigation.
func init() {
// pkg/browser pipes the launcher's stderr to ours, which leaks confusing
// noise like "xdg-open: no DISPLAY environment variable specified" on
// headless machines. We always print the login URL, so discard it.
browser.Stderr = io.Discard
}

// showLoginURL prints the login link, framed as a fallback for when the
// browser doesn't open (e.g. headless machine, wrong default browser).
func showLoginURL(url string) {
urlType := color.New(color.FgCyan, color.Bold).SprintFunc()
fmt.Println("Login here: " + urlType(url))
fmt.Println("Browser didn't open? Use the URL below to sign in:")
fmt.Println()
fmt.Println(urlType(url))
}

func defaultAuthFunc(url, code string) {
Expand All @@ -337,12 +346,9 @@ func defaultAuthFunc(url, code string) {
fmt.Print("\n")
}

if hasBrowser() {
if err := browser.OpenURL(url); err == nil {
fmt.Println("Waiting for login to complete in browser...")
return
}
}
// Best-effort: try to open the browser, but always show the URL below so
// the user is never stranded if it doesn't open.
_ = browser.OpenURL(url)
showLoginURL(url)
fmt.Println("\nWaiting for login to complete...")
}
Expand All @@ -352,21 +358,6 @@ func skipBrowserAuthFunc(url, _ string) {
fmt.Println("\nWaiting for login to complete...")
}

// hasBrowser reports whether a browser can be opened on the current platform.
func hasBrowser() bool {
if runtime.GOOS == "darwin" {
// macOS always has "open".
return true
}
// Linux: check for a known browser launcher.
for _, name := range []string{"xdg-open", "x-www-browser", "www-browser"} {
if _, err := exec.LookPath(name); err == nil {
return true
}
}
return false
}

func (t Auth) Login(skipBrowser bool) (*LoginTokens, error) {
authFunc := defaultAuthFunc
if skipBrowser {
Expand Down
Loading