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.

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

feat(core): compatible with multiple subscriptions #6277

Merged
merged 1 commit into from
Apr 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Loading } from '@affine/component/ui/loading';
import { AffineShapeIcon } from '@affine/core/components/page-list';
import { useCredentialsRequirement } from '@affine/core/hooks/affine/use-server-config';
import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
import type { SubscriptionPlan, SubscriptionRecurring } from '@affine/graphql';
import { SubscriptionPlan, type SubscriptionRecurring } from '@affine/graphql';
import {
changePasswordMutation,
createCheckoutSessionMutation,
Expand Down Expand Up @@ -138,7 +138,11 @@ const SubscriptionRedirectWithData = () => {
);
}

if (subscriptionData.currentUser?.subscription) {
if (
subscriptionData.currentUser?.subscriptions?.some(
sub => sub.plan === SubscriptionPlan.Pro
)
) {
return <SubscriptionExisting />;
}

Expand Down
25 changes: 13 additions & 12 deletions packages/frontend/core/src/hooks/use-subscription.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
import type { SubscriptionQuery } from '@affine/graphql';
import { subscriptionQuery } from '@affine/graphql';
import { SubscriptionPlan, subscriptionQuery } from '@affine/graphql';

import { useServerFeatures } from './affine/use-server-config';
import { useQuery } from './use-query';

export type Subscription = NonNullable<
NonNullable<SubscriptionQuery['currentUser']>['subscription']
NonNullable<SubscriptionQuery['currentUser']>['subscriptions'][number]
>;

export type SubscriptionMutator = (update?: Partial<Subscription>) => void;

const selector = (data: SubscriptionQuery) =>
data.currentUser?.subscription ?? null;
const selector = (data: SubscriptionQuery, plan: SubscriptionPlan) =>
(data.currentUser?.subscriptions ?? []).find(p => p.plan === plan);

export const useUserSubscription = () => {
export const useUserSubscription = (
plan: SubscriptionPlan = SubscriptionPlan.Pro
) => {
const { payment: hasPaymentFeature } = useServerFeatures();
const { data, mutate } = useQuery(
hasPaymentFeature ? { query: subscriptionQuery } : undefined
Expand All @@ -23,26 +25,25 @@ export const useUserSubscription = () => {
const set: SubscriptionMutator = useAsyncCallback(
async (update?: Partial<Subscription>) => {
await mutate(prev => {
if (!update || !prev?.currentUser?.subscription) {
if (!update || !prev?.currentUser?.subscriptions?.length) {
return;
}

return {
currentUser: {
subscription: {
...prev.currentUser?.subscription,
...update,
},
subscriptions: (prev.currentUser?.subscriptions ?? []).map(sub =>
sub.plan !== plan ? sub : { ...sub, ...update }
),
},
};
});
},
[mutate]
[mutate, plan]
);

if (!hasPaymentFeature) {
return [null, () => {}] as const;
}

return [selector(data), set] as const;
return [selector(data, plan), set] as const;
};
2 changes: 1 addition & 1 deletion packages/frontend/graphql/src/graphql/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ export const subscriptionQuery = {
query: `
query subscription {
currentUser {
subscription {
subscriptions {
id
status
plan
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/graphql/src/graphql/subscription.gql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
query subscription {
currentUser {
subscription {
subscriptions {
id
status
plan
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/graphql/src/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ export type SubscriptionQuery = {
__typename?: 'Query';
currentUser: {
__typename?: 'UserType';
subscription: {
subscriptions: Array<{
__typename?: 'UserSubscription';
id: string;
status: SubscriptionStatus;
Expand All @@ -753,7 +753,7 @@ export type SubscriptionQuery = {
end: string;
nextBillAt: string | null;
canceledAt: string | null;
} | null;
}>;
} | null;
};

Expand Down
Loading