Skip to content

fix: align Jira token pre-check with actual token resolution #981

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

fix: align Jira token pre-check with actual token resolution #981

Show file tree
Hide file tree
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
33 changes: 20 additions & 13 deletions api/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,7 @@ func Client(config jira.Config) *jira.Client {
if config.Login == "" {
config.Login = viper.GetString("login")
}
if config.APIToken == "" {
config.APIToken = viper.GetString("api_token")
}
if config.APIToken == "" {
netrcConfig, _ := netrc.Read(config.Server, config.Login)
if netrcConfig != nil {
config.APIToken = netrcConfig.Password
}
}
if config.APIToken == "" {
secret, _ := keyring.Get("jira-cli", config.Login)
config.APIToken = secret
}
config.APIToken = GetAPIToken(config)
if config.AuthType == nil {
authType := jira.AuthType(viper.GetString("auth_type"))
config.AuthType = &authType
Expand Down Expand Up @@ -70,6 +58,25 @@ func Client(config jira.Config) *jira.Client {
return jiraClient
}

func GetAPIToken(config jira.Config) string {
if config.APIToken != "" {
return config.APIToken
}
if apiToken := viper.GetString("api_token"); apiToken != "" {
return apiToken
}

if netrcConfig, _ := netrc.Read(config.Server, config.Login); netrcConfig != nil && netrcConfig.Password != "" {
return netrcConfig.Password
}

if secret, _ := keyring.Get("jira-cli", config.Login); secret != "" {
return secret
}

return ""
}

// DefaultClient returns default jira client.
func DefaultClient(debug bool) *jira.Client {
return Client(jira.Config{Debug: debug})
Expand Down
19 changes: 5 additions & 14 deletions internal/cmd/root/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/ankitpokhrel/jira-cli/api"
"github.com/ankitpokhrel/jira-cli/internal/cmd/board"
"github.com/ankitpokhrel/jira-cli/internal/cmd/completion"
"github.com/ankitpokhrel/jira-cli/internal/cmd/epic"
Expand All @@ -24,9 +25,6 @@ import (
"github.com/ankitpokhrel/jira-cli/internal/cmdutil"
jiraConfig "github.com/ankitpokhrel/jira-cli/internal/config"
"github.com/ankitpokhrel/jira-cli/pkg/jira"
"github.com/ankitpokhrel/jira-cli/pkg/netrc"

"github.com/zalando/go-keyring"
)

const (
Expand Down Expand Up @@ -157,17 +155,10 @@ func cmdRequireToken(cmd string) bool {
}

func checkForJiraToken(server string, login string) {
if os.Getenv("JIRA_API_TOKEN") != "" {
return
}

netrcConfig, _ := netrc.Read(server, login)
if netrcConfig != nil {
return
}

secret, _ := keyring.Get("jira-cli", login)
if secret != "" {
if api.GetAPIToken(jira.Config{
Server: server,
Login: login,
}) != "" {
return
}

Expand Down
Loading