Skip to content

Commit

Permalink
cors policy updated
Browse files Browse the repository at this point in the history
  • Loading branch information
suyash-patil committed Dec 11, 2022
1 parent ba4147e commit 58768d0
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 4 deletions.
10 changes: 10 additions & 0 deletions backend/routes/orderRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import Order from '../models/orderModel.js'
router.post('/',expressAsyncHandler(async (req,res) => {
const {orderItems, shippingAddress, paymentMethod, itemPrice, taxPrice, shippingPrice, totalPrice,_id} = req.body
if(orderItems && orderItems.length === 0){
res.header("Access-Control-Allow-Origin", "*");
res.status(400)
throw new Error('No items')
return
Expand All @@ -23,6 +24,7 @@ router.post('/',expressAsyncHandler(async (req,res) => {
totalPrice
})
const createdOrder = await order.save()
res.header("Access-Control-Allow-Origin", "*");
res.status(201).json(createdOrder)
}
}))
Expand All @@ -31,9 +33,11 @@ router.get('/:id', expressAsyncHandler(async (req, res) => {
const order = await Order.findById(req.params.id).populate('user','name email')

if(order) {
res.header("Access-Control-Allow-Origin", "*");
res.json(order)
}
else {
res.header("Access-Control-Allow-Origin", "*");
res.status(404)
throw new Error('Not found')
}
Expand All @@ -53,9 +57,11 @@ router.put('/:id/pay', expressAsyncHandler(async (req, res) => {
email_address: req.body.payer.email_address
}
const updatedOrder = await order.save()
res.header("Access-Control-Allow-Origin", "*");
res.json(updatedOrder)
}
else {
res.header("Access-Control-Allow-Origin", "*");
res.status(404)
throw new Error('Not found')
}
Expand All @@ -65,6 +71,7 @@ router.put('/:id/pay', expressAsyncHandler(async (req, res) => {
router.get('/getorders/:id',expressAsyncHandler(async(req,res) =>{
const orders = await Order.find({user:req.params.id})
if(orders) {
res.header("Access-Control-Allow-Origin", "*");
res.json(orders)
}
else {
Expand All @@ -76,6 +83,7 @@ router.get('/getorders/:id',expressAsyncHandler(async(req,res) =>{
router.post('/getallorders', expressAsyncHandler(async (req, res) => {
const orders = await Order.find({}).populate('user','id name')
if(orders) {
res.header("Access-Control-Allow-Origin", "*");
res.json(orders)
}
else {
Expand All @@ -91,9 +99,11 @@ router.put('/:id/delivered', expressAsyncHandler(async (req, res) => {
order.isDelivered = true
order.deliveredAt = Date.now()
const updatedOrder = await order.save()
res.header("Access-Control-Allow-Origin", "*");
res.json(updatedOrder)
}
else {
res.header("Access-Control-Allow-Origin", "*");
res.status(404)
throw new Error('Not found')
}
Expand Down
9 changes: 9 additions & 0 deletions backend/routes/productRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Product from '../models/productModel.js'
router.get('/', expressAsyncHandler(async (req, res) => {
const products = await Product.find({})
if(products) {
res.header("Access-Control-Allow-Origin", "*");
res.json(products)
}
else {
Expand All @@ -17,6 +18,7 @@ router.get('/', expressAsyncHandler(async (req, res) => {
router.get('/:id', expressAsyncHandler(async (req, res) => {
const product = await Product.findById(req.params.id)
if(product) {
res.header("Access-Control-Allow-Origin", "*");
res.json(product)
}
else {
Expand All @@ -38,9 +40,11 @@ router.route('/:id/review').post(expressAsyncHandler(async(req,res) => {
product.numReviews = product.reviews.length
product.rating = Number(product.reviews.reduce((acc, item) => item.rating + acc, 0) / product.reviews.length).toFixed(1)
await product.save()
res.header("Access-Control-Allow-Origin", "*");
res.status(201).json(product)

} else {
res.header("Access-Control-Allow-Origin", "*");
res.status(404)
throw new Error('Product not found')
}
Expand All @@ -50,9 +54,11 @@ router.route('/delete/:id').delete(expressAsyncHandler(async(req,res) => {
const product = await Product.findById(req.params.id)
if(product){
await product.remove()
res.header("Access-Control-Allow-Origin", "*");
res.json({message:'Product removed'})
}
else {
res.header("Access-Control-Allow-Origin", "*");
res.status(404)
throw new Error('Product not found')
}
Expand All @@ -71,6 +77,7 @@ router.route('/create').post(expressAsyncHandler(async (req, res) => {
description: description
})
const createdProduct = await product.save()
res.header("Access-Control-Allow-Origin", "*");
res.status(201).json(createdProduct)

}))
Expand All @@ -88,9 +95,11 @@ router.route('/update/:id').put(expressAsyncHandler(async (req, res) => {
product.countInStock = countInStock

const updatedProduct = await product.save()
res.header("Access-Control-Allow-Origin", "*");
res.json(updatedProduct)
}
else {
res.header("Access-Control-Allow-Origin", "*");
res.status(404)
throw new Error('Product not found')
}
Expand Down
14 changes: 14 additions & 0 deletions backend/routes/userRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ router.post('/login', expressAsyncHandler(async (req,res) => {
const {email, password} = req.body
const user = await User.findOne({email: email})
if(user && await user.matchPass(password)){
res.header("Access-Control-Allow-Origin", "*");
res.json({
_id: user._id,
name: user.name,
Expand All @@ -20,6 +21,7 @@ router.post('/login', expressAsyncHandler(async (req,res) => {
})
}
else {
res.header("Access-Control-Allow-Origin", "*");
res.status(404)
throw new Error('Invalid email or password')
}
Expand All @@ -29,6 +31,7 @@ router.route('/profile').post(expressAsyncHandler(async (req, res) => {
const {email} = req.body
const user = await User.findOne({email:email})
if(user) {
res.header("Access-Control-Allow-Origin", "*");
res.json({
_id: user._id,
name: user.name,
Expand Down Expand Up @@ -58,6 +61,7 @@ router.route('/profile/update').put( expressAsyncHandler(async (req, res) => {
user.password = newpass
}
const updatedUser = await user.save()
res.header("Access-Control-Allow-Origin", "*");
res.json({
_id: updatedUser._id,
name: updatedUser.name,
Expand All @@ -70,6 +74,7 @@ router.route('/profile/update').put( expressAsyncHandler(async (req, res) => {

}
else {
res.header("Access-Control-Allow-Origin", "*");
res.status(404)
throw new Error('User not found')
}
Expand All @@ -81,6 +86,7 @@ router.route('/register').post( expressAsyncHandler(async (req, res) => {
const userExist = await User.findOne({email:email})

if(userExist) {
res.header("Access-Control-Allow-Origin", "*");
res.status(401)
throw new Error('User already exist')
}
Expand All @@ -91,6 +97,7 @@ router.route('/register').post( expressAsyncHandler(async (req, res) => {
password
})
if (user) {
res.header("Access-Control-Allow-Origin", "*");
res.status(201).json({
_id: user._id,
name: user.name,
Expand All @@ -102,6 +109,7 @@ router.route('/register').post( expressAsyncHandler(async (req, res) => {
})
}
else {
res.header("Access-Control-Allow-Origin", "*");
res.json(401)
throw new Error('Invalid Email and Password')

Expand All @@ -111,23 +119,27 @@ router.route('/register').post( expressAsyncHandler(async (req, res) => {

router.route('/').post(admin, expressAsyncHandler(async (req, res) => {
const users = await User.find({})
res.header("Access-Control-Allow-Origin", "*");
res.json(users)
}))

router.route('/delete/:id').delete(expressAsyncHandler(async (req, res) => {
const user = await User.findById(req.params.id)
if(user) {
await user.remove()
res.header("Access-Control-Allow-Origin", "*");
res.json({message: 'User removed'})
}
else {
res.header("Access-Control-Allow-Origin", "*");
res.status(404)
throw new Error('User not found')
}
}))

router.route('/getuser/:id').get(expressAsyncHandler(async(req,res) => {
const user = await User.findById(req.params.id)
res.header("Access-Control-Allow-Origin", "*");
res.json({
_id: user._id,
name: user.name,
Expand All @@ -147,6 +159,7 @@ router.route('/edituser/:id').put(expressAsyncHandler(async(req,res) => {
user.isAdmin = isAdmin

const updatedUser = await user.save()
res.header("Access-Control-Allow-Origin", "*");
res.json({
_id: updatedUser._id,
name: updatedUser.name,
Expand All @@ -158,6 +171,7 @@ router.route('/edituser/:id').put(expressAsyncHandler(async(req,res) => {
})
}
else {
res.header("Access-Control-Allow-Origin", "*");
res.status(404)
throw new Error('User not found')
}
Expand Down
8 changes: 7 additions & 1 deletion backend/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ app.use('/api/users',userRoutes)

app.use('/api/order',orderRoutes)

app.get('/api/config/paypal',(req,res) => res.send(process.env.PAYPAL_CLIENT_ID))
app.get('/api/config/paypal',(req,res) => {
res.header("Access-Control-Allow-Origin", "*");
res.send(process.env.PAYPAL_CLIENT_ID)
})


app.use(bodyParser.urlencoded({extended:true}))
Expand All @@ -46,17 +49,20 @@ app.post('/api/create-pdf',(req,res) => {
})
})
app.get('/api/fetch-pdf',(req,res) => {
res.header("Access-Control-Allow-Origin", "*");
res.sendFile('result.pdf',{root: '.'})
})

const __dirname = path.resolve()
if(process.env.NODE_ENV === 'production') {
app.use(express.static(path.join(__dirname, '/client/build')))
app.get('*',(req,res) => {
res.header("Access-Control-Allow-Origin", "*");
res.sendFile(path.resolve(__dirname,'client','build','index.html'))
})
} else {
app.get('/', (req,res) => {
res.header("Access-Control-Allow-Origin", "*");
res.send('API is running...')
})
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/screens/HomeScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const HomeScreen = () => {

useEffect(() => {
const fetchProducts = async () => {
const { data } = await axios.get('http://localhost:5000/api/products')
const { data } = await axios.get('https://covercove-oa4q.vercel.app/api/products')
setProducts(data)
setLoading(false)
}
Expand Down
4 changes: 2 additions & 2 deletions client/src/screens/ProductScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const ProductScreen = ({history, match,setCartItems,cartItems}) => {
const [name,setName] = useState('')
useEffect(() => {
const fetchProduct = async () => {
const {data} = await axios.get(`http://localhost:5000/api/products/${match.params.id}`)
const {data} = await axios.get(`https://covercove-oa4q.vercel.app/api/products/${match.params.id}`)
setProduct(data)
setLoading(false)
if(localStorage.getItem('userInfo')){
Expand All @@ -41,7 +41,7 @@ const ProductScreen = ({history, match,setCartItems,cartItems}) => {
}
try {
const { _id, name } = JSON.parse(localStorage.getItem('userInfo'))
const { data } = await axios.post(`http://localhost:5000/api/products/${match.params.id}/review`, { rating, comment, name, _id })
const { data } = await axios.post(`https://covercove-oa4q.vercel.app/api/products/${match.params.id}/review`, { rating, comment, name, _id })
setReviewModal(false)
message.success("Review submitted successfully")
} catch (error) {
Expand Down

2 comments on commit 58768d0

@vercel
Copy link

@vercel vercel bot commented on 58768d0 Dec 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on 58768d0 Dec 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.