Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ JWT_SECRET=<your_secret>
PAYPAL_CLIENT_ID=<your_paypal_client_id>
PAYPAL_APP_SECRET=<your_paypal_secret>
PAYPAL_API_URL=https://api-m.sandbox.paypal.com
GOOGLE_CLIENT_ID=1028150357403-5k8mnmss9mil3e8c9rah5un4902v4c71.apps.googleusercontent.com

47 changes: 47 additions & 0 deletions backend/controllers/userController.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import asyncHandler from '../middleware/asyncHandler.js';
import generateToken from '../utils/generateToken.js';
import User from '../models/userModel.js';
import { OAuth2Client } from 'google-auth-library';

const client = new OAuth2Client(process.env.GOOGLE_CLIENT_ID);

// @desc Auth user & get token
// @route POST /api/users/auth
Expand Down Expand Up @@ -59,6 +62,49 @@ const registerUser = asyncHandler(async (req, res) => {
}
});

// @desc Auth user with Google
// @route POST /api/users/google
// @access Public
const authGoogle = asyncHandler(async (req, res) => {
const { idToken } = req.body;

const ticket = await client.verifyIdToken({
idToken,
audience: process.env.GOOGLE_CLIENT_ID,
});

const { name, email, sub: googleId } = ticket.getPayload();

let user = await User.findOne({ email });

if (user) {
if (!user.googleId) {
user.googleId = googleId;
await user.save();
}
} else {
user = await User.create({
name,
email,
googleId,
});
}

if (user) {
generateToken(res, user._id);

res.status(200).json({
_id: user._id,
name: user.name,
email: user.email,
isAdmin: user.isAdmin,
});
} else {
res.status(400);
throw new Error('Invalid user data');
}
});

// @desc Logout user / clear cookie
// @route POST /api/users/logout
// @access Public
Expand Down Expand Up @@ -182,6 +228,7 @@ const updateUser = asyncHandler(async (req, res) => {
export {
authUser,
registerUser,
authGoogle,
logoutUser,
getUserProfile,
updateUserProfile,
Expand Down
4 changes: 3 additions & 1 deletion backend/models/userModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ const userSchema = mongoose.Schema(
},
password: {
type: String,
required: true,
},
googleId: {
type: String,
},
isAdmin: {
type: Boolean,
Expand Down
2 changes: 2 additions & 0 deletions backend/routes/userRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import express from 'express';
import {
authUser,
registerUser,
authGoogle,
logoutUser,
getUserProfile,
updateUserProfile,
Expand All @@ -16,6 +17,7 @@ const router = express.Router();

router.route('/').post(registerUser).get(protect, admin, getUsers);
router.post('/auth', authUser);
router.post('/google', authGoogle);
router.post('/logout', logoutUser);
router
.route('/profile')
Expand Down
Loading