diff --git a/backend/middleware/auth.js b/backend/middleware/auth.js index d7a9396..7653174 100644 --- a/backend/middleware/auth.js +++ b/backend/middleware/auth.js @@ -26,6 +26,7 @@ const verifyToken = async (req, res, next) => { uid: decodedToken.uid, email: decodedToken.email, displayName: decodedToken.name || '', + idToken, }; } else { const apiKey = getEnvValue('FIREBASE_API_KEY'); @@ -62,6 +63,7 @@ const verifyToken = async (req, res, next) => { uid: userInfo.localId, email: userInfo.email, displayName: userInfo.displayName || '', + idToken, }; } diff --git a/backend/package.json b/backend/package.json index 145e0b1..a78f9dc 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,5 +1,5 @@ { - "name": "safeguard-backend", + "name": "abhaya-backend", "version": "1.0.0", "description": "SafeGuard Women Safety App - Backend API", "main": "server.js", diff --git a/backend/routes/auth.js b/backend/routes/auth.js index 441b8c0..85128c8 100644 --- a/backend/routes/auth.js +++ b/backend/routes/auth.js @@ -572,13 +572,12 @@ router.get('/profile', verifyToken, async (req, res) => { }); if (!apiKey) return; - const idToken = req.headers.authorization.split('Bearer ')[1]; const { data } = await firebaseJson( `${IDENTITY_URL}:lookup?key=${apiKey}`, { method: 'POST', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ idToken }), + body: JSON.stringify({ idToken: req.user.idToken }), }, 'profileLookup' ); @@ -676,8 +675,7 @@ router.put('/profile', verifyToken, async (req, res) => { }); if (!apiKey) return; - const idToken = req.headers.authorization.split('Bearer ')[1]; - const updateData = { idToken, returnSecureToken: false }; + const updateData = { idToken: req.user.idToken, returnSecureToken: false }; if (displayName !== undefined) updateData.displayName = displayName; if (photoURL !== undefined) updateData.photoUrl = photoURL; @@ -743,13 +741,12 @@ router.delete('/account', verifyToken, async (req, res) => { }); if (!apiKey) return; - const idToken = req.headers.authorization.split('Bearer ')[1]; const { data } = await firebaseJson( `${IDENTITY_URL}:delete?key=${apiKey}`, { method: 'POST', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ idToken }), + body: JSON.stringify({ idToken: req.user.idToken }), }, 'accountDelete' );