fix: user authentication interface

This commit is contained in:
karishmas6
2024-10-24 22:26:12 +05:30
parent 47e1e717e0
commit 7d37df74fe
10 changed files with 53 additions and 61 deletions

View File

@@ -146,7 +146,12 @@ router.get('/api-key', requireSignIn, async (req: AuthenticatedRequest, res) =>
}
});
router.delete('/delete-api-key', requireSignIn, async (req, res) => {
router.delete('/delete-api-key', requireSignIn, async (req: AuthenticatedRequest, res) => {
if (!req.user) {
return res.status(401).send({ error: 'Unauthorized' });
}
try {
const user = await User.findByPk(req.user.id, { raw: true });
@@ -193,7 +198,7 @@ router.get('/google', (req, res) => {
});
// Step 2: Handle Google OAuth callback
router.get('/google/callback', requireSignIn, async (req, res) => {
router.get('/google/callback', requireSignIn, async (req: AuthenticatedRequest, res) => {
const { code, state } = req.query;
try {
if (!state) {
@@ -217,6 +222,10 @@ router.get('/google/callback', requireSignIn, async (req, res) => {
return res.status(400).json({ message: 'Email not found' });
}
if (!req.user) {
return res.status(401).send({ error: 'Unauthorized' });
}
// Get the currently authenticated user (from `requireSignIn`)
let user = await User.findOne({ where: { id: req.user.id } });
@@ -264,8 +273,11 @@ router.get('/google/callback', requireSignIn, async (req, res) => {
});
// Step 3: Get data from Google Sheets
router.post('/gsheets/data', requireSignIn, async (req, res) => {
router.post('/gsheets/data', requireSignIn, async (req: AuthenticatedRequest, res) => {
const { spreadsheetId, robotId } = req.body;
if (!req.user) {
return res.status(401).send({ error: 'Unauthorized' });
}
const user = await User.findByPk(req.user.id, { raw: true });
if (!user) {