🔐 Authentication Fixes: - Added proper auth headers to collections API calls - Added auth headers to thumbnail API calls - Fixed missing Authorization Bearer token in requests 🔍 Enhanced Debug Logging: - Added server-side logging in collections API - Added debug logging in thumbnails API - Log user authentication data - Log SQL query results - Log final API responses This should fix the userRole: null issue by ensuring proper authentication and help identify any remaining issues with detailed logging.
132 lines
No EOL
4.7 KiB
JavaScript
132 lines
No EOL
4.7 KiB
JavaScript
import { sql } from '@vercel/postgres';
|
|
import { getUserFromRequest, logCollectionActivity } from '../../lib/permission-middleware';
|
|
import { generateUniqueSlug } from '../../lib/slug-utils';
|
|
|
|
export default async function handler(req, res) {
|
|
// Set CORS headers
|
|
res.setHeader('Access-Control-Allow-Origin', '*');
|
|
res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
|
|
res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization');
|
|
|
|
// Handle preflight requests
|
|
if (req.method === 'OPTIONS') {
|
|
res.status(200).end();
|
|
return;
|
|
}
|
|
|
|
if (req.method === 'GET') {
|
|
try {
|
|
// Get authenticated user
|
|
const user = await getUserFromRequest(req);
|
|
if (!user) {
|
|
return res.status(401).json({ error: 'Authentication required' });
|
|
}
|
|
|
|
const currentUserId = user.userId;
|
|
console.log('🔍 Debug - Collections API - Current user:', user);
|
|
|
|
// Get collections based on ownership, collaboration, or public visibility
|
|
const result = await sql`
|
|
SELECT DISTINCT
|
|
c.*,
|
|
u.email as creator_email,
|
|
COUNT(cc.card_id) as card_count,
|
|
COALESCE(SUM(cards.market_price * cc.quantity), 0) as total_value,
|
|
cp.role as user_role,
|
|
CASE
|
|
WHEN c.user_id = ${currentUserId} THEN 'owner'
|
|
WHEN cp.role IS NOT NULL THEN cp.role
|
|
ELSE NULL
|
|
END as effective_role
|
|
FROM collections c
|
|
LEFT JOIN users u ON c.user_id = u.id
|
|
LEFT JOIN collection_cards cc ON c.id = cc.collection_id
|
|
LEFT JOIN cards ON cc.card_id = cards.id
|
|
LEFT JOIN collection_permissions cp ON c.id = cp.collection_id AND cp.user_id = ${currentUserId} AND cp.status = 'active'
|
|
WHERE
|
|
c.user_id = ${currentUserId} OR
|
|
cp.id IS NOT NULL OR
|
|
(c.is_public = true)
|
|
GROUP BY c.id, u.email, cp.role
|
|
ORDER BY c.updated_at DESC
|
|
`;
|
|
|
|
console.log('🔍 Debug - Collections API - Query results:', result.rows.map(r => ({
|
|
name: r.name,
|
|
user_id: r.user_id,
|
|
creator_email: r.creator_email,
|
|
user_role: r.user_role,
|
|
effective_role: r.effective_role
|
|
})));
|
|
|
|
const collections = result.rows.map(collection => ({
|
|
id: collection.id,
|
|
slug: collection.slug,
|
|
name: collection.name,
|
|
description: collection.description,
|
|
tcg: collection.tcg || 'MTG',
|
|
cardCount: parseInt(collection.card_count) || 0,
|
|
value: parseFloat(collection.total_value) || 0,
|
|
lastViewed: collection.updated_at,
|
|
createdAt: collection.created_at,
|
|
isPublic: collection.is_public || false,
|
|
tags: collection.tags ? collection.tags.split(',') : [],
|
|
creator: collection.creator_email,
|
|
userRole: collection.effective_role
|
|
}));
|
|
|
|
console.log('🔍 Debug - Collections API - Final response:', collections.map(c => ({
|
|
name: c.name,
|
|
userRole: c.userRole,
|
|
creator: c.creator
|
|
})));
|
|
|
|
res.status(200).json(collections);
|
|
|
|
} catch (error) {
|
|
console.error('Error fetching collections:', error);
|
|
res.status(500).json({ error: 'Internal server error' });
|
|
}
|
|
} else if (req.method === 'POST') {
|
|
try {
|
|
// Get authenticated user
|
|
const user = await getUserFromRequest(req);
|
|
if (!user) {
|
|
return res.status(401).json({ error: 'Authentication required' });
|
|
}
|
|
|
|
const { name, description, tcg = 'MTG', isPublic = false, image = '', tags = [] } = req.body;
|
|
|
|
if (!name || !description) {
|
|
return res.status(400).json({ error: 'Name and description are required' });
|
|
}
|
|
|
|
const userId = user.userId;
|
|
|
|
// Generate unique slug for the collection
|
|
const existingSlugsResult = await sql`SELECT slug FROM collections WHERE slug IS NOT NULL`;
|
|
const existingSlugs = existingSlugsResult.rows.map(row => row.slug);
|
|
const uniqueSlug = await generateUniqueSlug(name, existingSlugs);
|
|
|
|
const result = await sql`
|
|
INSERT INTO collections (name, description, tcg, is_public, image, tags, user_id, slug)
|
|
VALUES (${name}, ${description}, ${tcg}, ${isPublic}, ${image}, ${tags.join(',')}, ${userId}, ${uniqueSlug})
|
|
RETURNING *
|
|
`;
|
|
|
|
// Create owner permission record
|
|
await sql`
|
|
INSERT INTO collection_permissions (collection_id, user_id, role, status)
|
|
VALUES (${result.rows[0].id}, ${userId}, 'owner', 'active')
|
|
`;
|
|
|
|
res.status(201).json(result.rows[0]);
|
|
|
|
} catch (error) {
|
|
console.error('Error creating collection:', error);
|
|
res.status(500).json({ error: 'Internal server error' });
|
|
}
|
|
} else {
|
|
res.status(405).json({ error: 'Method not allowed' });
|
|
}
|
|
}
|