Fixes a ts error in stripe.ts and a minor bug in useIsSubscribed cust…

…om hook
deepsingh132 · Jul 4, 2024 · badbefe · badbefe
1 parent 667b356
commit badbefe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/convex/stripe.ts b/convex/stripe.ts
@@ -89,7 +89,7 @@ export const cancelSubscription = action({
       {
         clerkId: user.subject,
       }
-    );
+    ) as { subscriptionId: string | undefined};
 
     if (!subscriptionId) {
       throw new Error("No subscription found for this user!");
@@ -128,7 +128,11 @@ export const createCustomerPortal = action({
       {
         clerkId: user.subject,
       }
-    );
+    ) as { customerId: string | undefined };
+
+    if (!customerId) {
+      throw new Error("No customer id found for this user!");
+    }
 
     const stripe = new Stripe(process.env.STRIPE_SECRET_KEY!, {
       apiVersion: "2024-04-10",

diff --git a/convex/users.ts b/convex/users.ts
@@ -70,14 +70,14 @@ export const isUserSubscribed = async (ctx: QueryCtx | MutationCtx) => {
 
 export const getSubscriptionByClerkId = query({
   args: { clerkId: v.string() },
-  handler: async (ctx, args) => {
+  handler: async (ctx, args) : Promise<{ subscriptionId: string | undefined, endsOn: number | undefined, plan: string | undefined, customerId: string | undefined} | null | undefined> =>
+  {
     const user = await ctx.db
       .query("users")
       .filter((q) => q.eq(q.field("clerkId"), args.clerkId))
       .first();
 
     if (!user) {
-      // throw new ConvexError("User not found");
       return null;
     }
 

diff --git a/hooks/useIsSubscribed.ts b/hooks/useIsSubscribed.ts
@@ -7,10 +7,10 @@ export function useIsSubscribed(id: string) {
 
   const { setIsFetching } = useIsFetching();
 
-  const user = useQuery(api.users.getSubscriptionByClerkId, { clerkId: id });
+  const user = useQuery(api.users.getSubscriptionByClerkId, { clerkId: id }); // will be undefined if fetching and null if no subscription or user
 
   useEffect(() => {
-    if (!user) return;
+    if (user === undefined) return;
     setIsFetching(false);
   }, [user]);
 
@@ -26,7 +26,7 @@ export function useGetPlan(id: string) {
   const user = useQuery(api.users.getSubscriptionByClerkId, { clerkId: id });
 
   useEffect(() => {
-    if (!user) return;
+    if (user === undefined) return;
     setIsFetching(false);
   }, [user]);