Skip to content

Refactor Pro subscription check for third-party support #955

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
richiemcilroy merged 1 commit into from
Aug 26, 2025
Merged

Refactor Pro subscription check for third-party support #955

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
4 changes: 0 additions & 4 deletions apps/web/app/api/desktop/[...route]/root.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,6 @@ app.get("/plan", async (c) => {

let isSubscribed = userIsPro(user);

if (user.thirdPartyStripeSubscriptionId) {
isSubscribed = true;
}

if (!isSubscribed && !user.stripeSubscriptionId && user.stripeCustomerId) {
try {
const subscriptions = await stripe().subscriptions.list({
Expand Down
10 changes: 9 additions & 1 deletion packages/utils/src/constants/plans.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,21 @@ export const getProPlanId = (billingCycle: "yearly" | "monthly") => {
export const userIsPro = (
user?: {
stripeSubscriptionStatus?: string | null;
thirdPartyStripeSubscriptionId?: string | null;
} | null,
) => {
if (!buildEnv.NEXT_PUBLIC_IS_CAP) return true;

if (!user) return false;

const { stripeSubscriptionStatus } = user;
const { stripeSubscriptionStatus, thirdPartyStripeSubscriptionId } = user;

// Check for third-party subscription first
if (thirdPartyStripeSubscriptionId) {
return true;
}

// Then check regular subscription status
return (
stripeSubscriptionStatus === "active" ||
stripeSubscriptionStatus === "trialing" ||
Expand Down
Loading