Skip to content

fix(auth): suppress browser output during login #25 #98

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
huda-code wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(auth): suppress browser output during login #25 #98

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
20 changes: 15 additions & 5 deletions cmd/auth/login/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bufio"
"errors"
"fmt"
"io"
"os"
"strings"
"time"
Expand Down Expand Up @@ -81,6 +82,15 @@ func loginWithWeb(hostname string) (string, error) {
_, err := reader.ReadString('\n')
if err == nil {
// User pressed Enter, open browser
oldStdout := browser.Stdout
oldStderr := browser.Stderr
browser.Stdout = io.Discard
browser.Stderr = io.Discard
defer func() {
browser.Stdout = oldStdout
browser.Stderr = oldStderr
}()

if err := browser.OpenURL(loginURL); err != nil {
// Don't fail if browser can't be opened, just warn
logger.Warning("Failed to open browser automatically")
Expand Down Expand Up @@ -328,11 +338,11 @@ func loginMain(cmd *cobra.Command, opts *LoginCmdOpts) error {
} else if apiServerInfo != nil {
// Convert api.ServerInfo to config.ServerInfo
serverInfo := &config.ServerInfo{
Version: apiServerInfo.Version,
SupporterStatusValid: apiServerInfo.SupporterStatusValid,
Build: apiServerInfo.Build,
EnterpriseLicenseValid: apiServerInfo.EnterpriseLicenseValid,
EnterpriseLicenseType: apiServerInfo.EnterpriseLicenseType,
Version: apiServerInfo.Version,
SupporterStatusValid: apiServerInfo.SupporterStatusValid,
Build: apiServerInfo.Build,
EnterpriseLicenseValid: apiServerInfo.EnterpriseLicenseValid,
EnterpriseLicenseType: apiServerInfo.EnterpriseLicenseType,
}
// Update account with server info
account := accountStore.Accounts[user.UserID]
Expand Down
Loading