webhook fix

Author: dominikschroeder

src/app/api/strava/[slug]/route.ts

@@ -52,11 +52,18 @@ export async function POST(
     }
 
     if (data.aspect_type === 'create' || data.aspect_type === 'update') {
-      const { activity, photos } = await handleWebhookActivity({
+      const {
+        activities: [activity],
+        photos,
+      } = await handleWebhookActivity({
         activityId: data.object_id,
         athleteId: data.owner_id,
       });
 
+      if (!activity) {
+        throw new Error('No activity returned from Strava');
+      }
+
       return new Response(
         `${data.aspect_type === 'create' ? 'Created' : 'Updated'} activity ${
           activity.id

src/components/sidebar/user.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { ChevronsUpDown, LogOut, CircleArrowLeft, Loader2 } from 'lucide-react';
+import { ChevronsUpDown, LogOut, CircleArrowLeft, Loader2, CircleCheck } from 'lucide-react';
 
 import Link from 'next/link';
 import { signIn, signOut } from 'next-auth/react';
@@ -18,13 +18,12 @@ import {
 } from '~/components/ui/dropdown-menu';
 
 import { Avatar, AvatarFallback, AvatarImage } from '~/components/ui/avatar';
-import { useToast } from '~/hooks/use-toast';
 
 import * as React from 'react';
 import Image from 'next/image';
 import { cn } from '~/lib/utils';
-import { useState } from 'react';
 import { User2 } from 'lucide-react';
+import { manageWebhook } from '~/server/strava/actions';
 
 export function UserSettings() {
   const { user, loading, account, loadFromStrava } = useShallowStore(
@@ -38,6 +37,9 @@ export function UserSettings() {
     },
   );
 
+  const checkWebhook = async () => {
+    manageWebhook
+
   const handleLoadActivities = async () => {
     try {
       console.log('Starting load activities, current loading state:', loading);
@@ -118,6 +120,12 @@ export function UserSettings() {
               <CircleArrowLeft />
               {loading ? 'Loading...' : 'Get Activities'}
             </DropdownMenuItem>
+            <DropdownMenuItem onClick={()=>{
+              checkWebhook();
+            }}>
+              <CircleCheck />
+              Check Webhook
+            </DropdownMenuItem>
             <DropdownMenuSeparator />
             <DropdownMenuItem onClick={() => signOut()}>
               <LogOut />

src/server/db/actions.ts

@@ -10,6 +10,20 @@ import type { AdapterAccount } from 'next-auth/adapters';
 // Use the AdapterAccount type from next-auth
 export type Account = AdapterAccount;
 
+export const getUserByStravaId = async (stravaId: string) => {
+  const account = await db.query.accounts.findFirst({
+    where: (accounts, { eq }) => eq(accounts.providerAccountId, stravaId),
+  });
+  if (!account) throw new Error('Account not found');
+
+  const user = await db.query.users.findFirst({
+    where: (users, { eq }) => eq(users.id, account.userId),
+  });
+  if (!user) throw new Error('User not found');
+
+  return user;
+};
+
 export const getUser = async (id?: string) => {
   if (!id) {
     const session = await auth();
@@ -32,16 +46,24 @@ export const getAccount = async ({
   userId?: string;
   forceRefresh?: boolean;
 }) => {
-  const resolvedUserId = userId ?? (await getUser()).id;
-
-  let account = providerAccountId
-    ? await db.query.accounts.findFirst({
-        where: (accounts, { eq }) =>
-          eq(accounts.providerAccountId, providerAccountId),
-      })
-    : await db.query.accounts.findFirst({
-        where: (accounts, { eq }) => eq(accounts.userId, resolvedUserId),
-      });
+  let account;
+
+  if (providerAccountId) {
+    account = await db.query.accounts.findFirst({
+      where: (accounts, { eq }) =>
+        eq(accounts.providerAccountId, providerAccountId),
+    });
+  } else if (userId) {
+    account = await db.query.accounts.findFirst({
+      where: (accounts, { eq }) => eq(accounts.userId, userId),
+    });
+  } else {
+    // Only try to resolve through session if no IDs provided
+    const resolvedUserId = await getUser().then((user) => user.id);
+    account = await db.query.accounts.findFirst({
+      where: (accounts, { eq }) => eq(accounts.userId, resolvedUserId),
+    });
+  }
 
   if (!account) throw new Error('Account not found');
 

src/server/strava/actions.ts

@@ -365,6 +365,7 @@ export async function manageWebhook(url: string) {
   try {
     // Get existing subscriptions
     const subscriptions = await client.getSubscriptions();
+    console.log('Subscriptions:', subscriptions);
 
     // Delete existing subscriptions with different URLs
     await Promise.all(
@@ -390,7 +391,13 @@ export async function handleWebhookActivity({
   activityId: number;
   athleteId: number;
 }) {
-  const account = await getAccount({ providerAccountId: athleteId.toString() });
+  console.log('Handling webhook activity:', { activityId, athleteId });
+
+  // Get account directly using Strava athlete ID
+  const account = await getAccount({
+    providerAccountId: athleteId.toString(),
+  });
+
   if (!account.access_token) {
     throw new Error('No Strava access token found');
   }