Skip to content

Fix replicate auth login subcommand #51

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

Merged
mattt merged 2 commits into from
Dec 18, 2023
Merged

Fix replicate auth login subcommand #51

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f17216c
Don't attempt to create client with stored credentials in auth login
mattt Dec 18, 2023
8b4d5ed
Validate blank token when creating client for default base URL
mattt Dec 18, 2023
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
15 changes: 11 additions & 4 deletions internal/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,23 @@ import (
)

func NewClient(opts ...replicate.ClientOption) (*replicate.Client, error) {
baseURL := config.GetAPIBaseURL()

token, err := config.GetAPIToken()
if err != nil {
return nil, fmt.Errorf("failed to get API token: %w", err)
}
if token == "" {

// Validate token when connecting to api.replicate.com.
// Alternate API hosts proxying Replicate may not require a token.
if token == "" && config.GetAPIBaseURL() == config.DefaultBaseURL {
return nil, fmt.Errorf("please authenticate with `replicate auth login`")
}

return NewClientWithAPIToken(token, opts...)
}

func NewClientWithAPIToken(token string, opts ...replicate.ClientOption) (*replicate.Client, error) {
baseURL := config.GetAPIBaseURL()

userAgent := fmt.Sprintf("replicate-cli/%s", internal.Version())

opts = append([]replicate.ClientOption{
Expand All @@ -37,7 +44,7 @@ func NewClient(opts ...replicate.ClientOption) (*replicate.Client, error) {
}

func VerifyToken(ctx context.Context, token string) (bool, error) {
r8, err := NewClient(replicate.WithToken(token))
r8, err := NewClientWithAPIToken(token)
if err != nil {
return false, err
}
Expand Down