Skip to content

fix: polar not found check using errors.As #1785

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

fix: polar not found check using errors.As #1785

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
25 changes: 7 additions & 18 deletions server/internal/thirdparty/polar/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"net/http"
"net/url"
"strconv"
"strings"
"time"

polargo "github.com/polarsource/polar-go"
"github.com/polarsource/polar-go/models/apierrors"
polarComponents "github.com/polarsource/polar-go/models/components"
polarOperations "github.com/polarsource/polar-go/models/operations"
"github.com/redis/go-redis/v9"
Expand Down Expand Up @@ -483,24 +483,13 @@ func (p *Client) getCustomerState(ctx context.Context, orgID string) (*polarComp
polarCustomerState = customerState.CustomerState
} else {
externalCustomerState, err := p.polar.Customers.GetStateExternal(ctx, orgID)
notFoundErrors := []string{
"resourcenotfound",
"not found",
}
containsNotFoundError := func(err error) bool {
for _, notFoundError := range notFoundErrors {
if strings.Contains(strings.ToLower(err.Error()), notFoundError) {
return true
}
}
return false
}

isNotFoundError := externalCustomerState != nil &&
externalCustomerState.HTTPMeta.Response != nil &&
externalCustomerState.HTTPMeta.Response.StatusCode == http.StatusNotFound
var notFound *apierrors.ResourceNotFound
isNotFoundError := errors.As(err, &notFound) ||
(externalCustomerState != nil &&
externalCustomerState.HTTPMeta.Response != nil &&
externalCustomerState.HTTPMeta.Response.StatusCode == http.StatusNotFound)

if err != nil && !isNotFoundError && !containsNotFoundError(err) {
if err != nil && !isNotFoundError {
return nil, fmt.Errorf("query polar customer state: %w", err)
}

Expand Down
Loading