From d8348386f3c9b050577bc6c52d27caa7a90e2a74 Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Thu, 3 Oct 2024 04:42:08 +0530 Subject: [PATCH] feat: del api key w rawtrye --- server/src/routes/auth.ts | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/server/src/routes/auth.ts b/server/src/routes/auth.ts index f3877f70..230e2a5f 100644 --- a/server/src/routes/auth.ts +++ b/server/src/routes/auth.ts @@ -97,7 +97,6 @@ router.post('/generate-api-key', requireSignIn, async (req: AuthenticatedRequest return res.status(401).json({ ok: false, error: 'Unauthorized' }); } const user = await User.findByPk(req.user.id, { - raw: true, attributes: { exclude: ['password'] }, }); @@ -145,24 +144,23 @@ router.get('/api-key', requireSignIn, async (req: AuthenticatedRequest, res) => } }); -router.delete('/delete-api-key', requireSignIn, async (req: AuthenticatedRequest, res) => { +router.delete('/delete-api-key', requireSignIn, async (req, res) => { try { - if (!req.user) { - return res.status(401).json({ message: 'Unauthorized' }); - } - - const user = await User.findByPk(req.user.id, { - raw: true, - }); - - if (!user || !user.api_key) { - return res.status(404).json({ message: 'API Key not found' }); - } - - await user.update({ api_key: null }); - - return res.status(200).json({ message: 'API Key deleted successfully' }); - } catch (error) { - return res.status(500).json({ message: 'Error deleting API key', error }); + const user = await User.findByPk(req.user.id, { raw: true }); + + if (!user) { + return res.status(404).json({ message: 'User not found' }); + } + + if (!user.api_key) { + return res.status(404).json({ message: 'API Key not found' }); + } + + await User.update({ api_key: null }, { where: { id: req.user.id } }); + + return res.status(200).json({ message: 'API Key deleted successfully' }); + } catch (error: any) { + return res.status(500).json({ message: 'Error deleting API key', error: error.message }); } -}); + }); + \ No newline at end of file