Skip to content
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

Jump to bottom

Skip keyring for auth check #7169

Merged
merged 11 commits into from Mar 17, 2023
Merged

Skip keyring for auth check #7169

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3f08f1c
fix: skip keyring for auth check
benjlevesque Mar 14, 2023
efaac68
fix test
benjlevesque Mar 14, 2023
debc231
fix ineffassign
benjlevesque Mar 14, 2023
85ada83
address review comment
benjlevesque Mar 15, 2023
d9bf65c
re-use TokenFromEnvOrConfig
benjlevesque Mar 15, 2023
c2fcb69
HasEnterpriseEnvToken
benjlevesque Mar 16, 2023
c347d2e
comment
benjlevesque Mar 16, 2023
0f78a88
format
benjlevesque Mar 16, 2023
70a6acc
revert Enterprise only condition
benjlevesque Mar 16, 2023
c5ac6fe
Update internal/config/config.go
benjlevesque Mar 17, 2023
f91f1db
rename
benjlevesque Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions internal/config/config.go
View file
Open in desktop
Expand Up @@ -234,6 +234,20 @@ func (c *AuthConfig) Logout(hostname string) error {
return ghConfig.Write(c.cfg)
}

// IsEnterprise checks if there are any environment variable authentication
// tokens set for enterprise hosts.
func (c *AuthConfig) IsEnterprise() bool {
// Any non-github.com hostname is fine here
dummyHostname := "example.com"
var token string
if c.tokenOverride != nil {
token, _ = c.tokenOverride(dummyHostname)
} else {
token, _ = ghAuth.TokenFromEnvOrConfig(dummyHostname)
}
return token != ""
}
benjlevesque marked this conversation as resolved.
Show resolved Hide resolved

func keyringServiceName(hostname string) string {
return "gh:" + hostname
}
Expand Down
7 changes: 1 addition & 6 deletions pkg/cmdutil/auth_check.go
View file
Open in desktop
Expand Up @@ -14,12 +14,7 @@ func DisableAuthCheck(cmd *cobra.Command) {
}

func CheckAuth(cfg config.Config) bool {
// This will check if there are any environment variable
// authentication tokens set for enterprise hosts.
// Any non-github.com hostname is fine here
dummyHostname := "example.com"
token, _ := cfg.Authentication().Token(dummyHostname)
if token != "" {
if cfg.Authentication().IsEnterprise() {
return true
}

Expand Down