Skip to content

chore: dont 500 on missing customer id in webhook payload #1098

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
chase-crumbaugh wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: dont 500 on missing customer id in webhook payload #1098

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3550ca9
chore: dont 500 on missing customer id in webhook payload
chase-crumbaugh Dec 19, 2025
9f83d60
create new logger
chase-crumbaugh Dec 19, 2025
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
21 changes: 12 additions & 9 deletions server/internal/usage/impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,31 +106,34 @@ func (s *Service) HandlePolarWebhook(w http.ResponseWriter, r *http.Request) err
return oops.E(oops.CodeUnexpected, err, "failed to validate and parse webhook event").Log(ctx, s.logger)
}

logger := s.logger.With(attr.SlogEvent(webhookPayload.Type))

if !slices.Contains(acceptedEvents, webhookPayload.Type) {
s.logger.InfoContext(ctx, "skipping unsupported webhook event", attr.SlogEvent(webhookPayload.Type))
logger.InfoContext(ctx, "skipping unsupported webhook event")
return nil
}

if webhookPayload.Data.Customer == nil || webhookPayload.Data.Customer.ExternalID == "" {
return oops.E(oops.CodeUnexpected, errors.New("missing customer external id in webhook payload"), "missing customer external id in webhook payload").Log(ctx, s.logger)
logger.WarnContext(ctx, "skipping webhook: missing customer external id in webhook payload")
return nil
}

existingOrgMetadata, err := s.orgRepo.GetOrganizationMetadata(ctx, webhookPayload.Data.Customer.ExternalID)
if err != nil {
return oops.E(oops.CodeUnexpected, err, "failed to get organization metadata").Log(ctx, s.logger)
return oops.E(oops.CodeUnexpected, err, "failed to get organization metadata").Log(ctx, logger)
}

previousAccountType := existingOrgMetadata.GramAccountType

// we must invalidate the customer tier cache since customer tier may have changed witha subscription update
if err := s.billingRepo.InvalidateBillingCustomerCaches(ctx, webhookPayload.Data.Customer.ExternalID); err != nil {
return oops.E(oops.CodeUnexpected, err, "failed to invalidate customer tier cache").Log(ctx, s.logger)
return oops.E(oops.CodeUnexpected, err, "failed to invalidate customer tier cache").Log(ctx, logger)
}

// we force a refresh of the state of the organization since customer tier may have changed witha subscription update
refreshedOrg, err := mv.DescribeOrganization(ctx, s.logger, s.orgRepo, s.billingRepo, webhookPayload.Data.Customer.ExternalID)
if err != nil {
return oops.E(oops.CodeUnexpected, err, "failed to update organization metadata").Log(ctx, s.logger)
return oops.E(oops.CodeUnexpected, err, "failed to update organization metadata").Log(ctx, logger)
}
updatedAccountType := refreshedOrg.GramAccountType

Expand All @@ -142,19 +145,19 @@ func (s *Service) HandlePolarWebhook(w http.ResponseWriter, r *http.Request) err
ID: refreshedOrg.ID,
})
if err != nil {
return oops.E(oops.CodeUnexpected, err, "failed to set account type").Log(ctx, s.logger)
return oops.E(oops.CodeUnexpected, err, "failed to set account type").Log(ctx, logger)
}
}

if previousAccountType != updatedAccountType {
if _, err := s.openRouter.RefreshAPIKeyLimit(ctx, refreshedOrg.ID, nil); err != nil {
return oops.E(oops.CodeUnexpected, err, "failed to refresh openrouter key limit").Log(ctx, s.logger)
return oops.E(oops.CodeUnexpected, err, "failed to refresh openrouter key limit").Log(ctx, logger)
}
}

// we force a refresh of the period usage since usage may have changed with a subscription update
if _, err = s.billingRepo.GetPeriodUsage(ctx, webhookPayload.Data.Customer.ExternalID); err != nil {
return oops.E(oops.CodeUnexpected, err, "failed to get period usage").Log(ctx, s.logger)
return oops.E(oops.CodeUnexpected, err, "failed to get period usage").Log(ctx, logger)
}

if err = s.posthogClient.CaptureEvent(ctx, "gram_subscription_changed", webhookPayload.Data.Customer.ExternalID, map[string]any{
Expand All @@ -167,7 +170,7 @@ func (s *Service) HandlePolarWebhook(w http.ResponseWriter, r *http.Request) err
"event": webhookPayload.Type,
"email": webhookPayload.Data.Customer.Email,
}); err != nil {
s.logger.ErrorContext(ctx, "failed to capture posthog event", attr.SlogError(err))
logger.ErrorContext(ctx, "failed to capture posthog event", attr.SlogError(err))
}

return nil
Expand Down
Loading