diff --git a/server/src/routes/api.ts b/server/src/routes/api.ts index 9dd81595..cc417bfb 100644 --- a/server/src/routes/api.ts +++ b/server/src/routes/api.ts @@ -13,30 +13,28 @@ router.get('/generate-api-key', async (req: AuthenticatedRequest, res) => { if (!req.user) { return res.status(401).json({ ok: false, error: 'Unauthorized' }); } - const user = await User.findByPk(req.user.id, { + const user = await User.findByPk(req.user.id, { attributes: { exclude: ['password'] }, }); - - if (!user) { - return res.status(404).json({ message: 'User not found' }); - } - - // Check if user already has an API key - if (user.api_key) { - return res.status(400).json({ message: 'API key already exists' }); - } - - const apiKey = genAPIKey(); - - user.api_key = apiKey; - await user.save(); - - return res.status(200).json({ - message: 'API key generated successfully', - api_key: apiKey, - }); + + if (!user) { + return res.status(404).json({ message: 'User not found' }); + } + + if (user.api_key) { + return res.status(400).json({ message: 'API key already exists' }); + } + + const apiKey = genAPIKey(); + + user.api_key = apiKey; + await user.save(); + + return res.status(200).json({ + message: 'API key generated successfully', + api_key: apiKey, + }); } catch (error) { - return res.status(500).json({ message: 'Error generating API key', error }); + return res.status(500).json({ message: 'Error generating API key', error }); } - }); - \ No newline at end of file +});