Resolve merge conflicts in events system

- Fixed conflicts in server/api/events/index.get.ts with improved logging and session management
- Fixed conflicts in server/api/events/index.post.ts with better validation and error handling
- Fixed conflicts in server/utils/nocodb-events.ts incorporating admin config integration and token validation
- Events system now uses proper session management and NocoDB v2 API patterns
- Maintains compatibility with existing admin configuration system

server/api/events/[id]/attendees.patch.ts

@@ -1,5 +1,6 @@
 // server/api/events/[id]/attendees.patch.ts
 import { createNocoDBEventsClient } from '~/server/utils/nocodb-events';
+import { createSessionManager } from '~/server/utils/session';
 import type { EventAttendanceRequest } from '~/utils/types';
 
 export default defineEventHandler(async (event) => {
@@ -14,8 +15,11 @@ export default defineEventHandler(async (event) => {
       });
     }
 
-    // Get user session
-    const session = await getUserSession(event);
+    // Get user session using the proper SessionManager
+    const sessionManager = createSessionManager();
+    const cookieHeader = getHeader(event, 'cookie');
+    const session = sessionManager.getSession(cookieHeader);
+    
     if (!session || !session.user) {
       throw createError({
         statusCode: 401,
@@ -63,7 +67,7 @@ export default defineEventHandler(async (event) => {
       message: `Attendance ${body.attended ? 'marked' : 'unmarked'} successfully`
     };
 
-  } catch (error) {
+  } catch (error: any) {
     console.error('Error updating attendance:', error);
     
     if (error.statusCode) {
@@ -76,20 +80,3 @@ export default defineEventHandler(async (event) => {
     });
   }
 });
-
-// Helper function
-async function getUserSession(event: any) {
-  try {
-    const sessionCookie = getCookie(event, 'session') || getHeader(event, 'authorization');
-    if (!sessionCookie) return null;
-    
-    return {
-      user: {
-        id: 'user-id',
-        tier: 'board' // Replace with actual session logic
-      }
-    };
-  } catch {
-    return null;
-  }
-}

server/api/events/[id]/rsvp.post.ts

@@ -1,6 +1,7 @@
 // server/api/events/[id]/rsvp.post.ts
 import { createNocoDBEventsClient } from '~/server/utils/nocodb-events';
 import { getMemberByKeycloakId } from '~/server/utils/nocodb';
+import { createSessionManager } from '~/server/utils/session';
 import type { EventRSVPRequest } from '~/utils/types';
 
 export default defineEventHandler(async (event) => {
@@ -15,8 +16,11 @@ export default defineEventHandler(async (event) => {
       });
     }
 
-    // Get user session
-    const session = await getUserSession(event);
+    // Get user session using the proper SessionManager
+    const sessionManager = createSessionManager();
+    const cookieHeader = getHeader(event, 'cookie');
+    const session = sessionManager.getSession(cookieHeader);
+    
     if (!session || !session.user) {
       throw createError({
         statusCode: 401,
@@ -66,7 +70,7 @@ export default defineEventHandler(async (event) => {
     const paymentReference = generatePaymentReference(member.member_id || member.Id);
 
     // Determine pricing and payment status
-    let paymentStatus = 'not_required';
+    let paymentStatus: 'pending' | 'not_required' | 'paid' | 'overdue' = 'not_required';
     let isMemberPricing = 'false';
     
     if (eventDetails.is_paid === 'true' && body.rsvp_status === 'confirmed') {
@@ -96,7 +100,7 @@ export default defineEventHandler(async (event) => {
       updated_at: new Date().toISOString()
     };
 
-    const newRSVP = await eventsClient.create(rsvpData);
+    const newRSVP = await eventsClient.createRSVP(rsvpData);
 
     // Include payment information in response for paid events
     let responseData: any = newRSVP;
@@ -121,12 +125,12 @@ export default defineEventHandler(async (event) => {
     return {
       success: true,
       data: responseData,
-      message: body.rsvp_status === 'waitlist' ? 
+      message: (body.rsvp_status as string) === 'waitlist' ? 
         'Added to waitlist - event is full' : 
         'RSVP submitted successfully'
     };
 
-  } catch (error) {
+  } catch (error: any) {
     console.error('Error processing RSVP:', error);
     
     if (error.statusCode) {
@@ -141,19 +145,6 @@ export default defineEventHandler(async (event) => {
 });
 
 // Helper functions
-async function getUserSession(event: any) {
-  try {
-    // For now, return a mock session - this should integrate with your actual auth system
-    return {
-      user: {
-        id: 'mock-keycloak-id',
-        tier: 'user'
-      }
-    };
-  } catch {
-    return null;
-  }
-}
 
 function generatePaymentReference(memberId: string): string {
   const date = new Date().toISOString().split('T')[0];

server/api/events/index.post.ts

@@ -24,7 +24,7 @@ export default defineEventHandler(async (event) => {
     const cookieHeader = getHeader(event, 'cookie');
     const session = sessionManager.getSession(cookieHeader);
     
-    if (!session) {
+    if (!session || !session.user) {
       console.log('[api/events.post] ❌ No valid session found');
       throw createError({
         statusCode: 401,
@@ -116,7 +116,7 @@ export default defineEventHandler(async (event) => {
       visibility: body.visibility as 'public' | 'board-only' | 'admin-only',
       status: (body.status || 'active') as 'active' | 'cancelled' | 'completed' | 'draft',
       creator: session.user.id,
-      current_attendees: 0
+      current_attendees: '0'
     };
 
     console.log('[api/events.post] Event data prepared:', Object.keys(eventData));