From 5b3f7676b2ca5a366889586b4ee2c186b21bd724 Mon Sep 17 00:00:00 2001
From: Piyush Pareek <piyush24000@gmail.com>
Date: Sat, 3 Oct 2020 16:52:56 +0530
Subject: [PATCH] corsbackend-updated

---
 api/routes/facts.js       |  5 +++--
 api/routes/models/fact.js |  2 +-
 app.js                    |  8 +++-----
 package-lock.json         | 14 ++++++++++++++
 package.json              |  3 ++-
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/api/routes/facts.js b/api/routes/facts.js
index 7a65dee..73dba28 100644
--- a/api/routes/facts.js
+++ b/api/routes/facts.js
@@ -1,5 +1,4 @@
 const express = require('express');
-
 const router = express.Router();
 const mongoose = require('mongoose')
 const Fact = require('./models/fact')
@@ -26,7 +25,7 @@ router.get('/', (req, res, next) => {
                     res.status(500).json(err)
                 })
         })
-
+    next();
     // GET ALL THE FACTS
 
     // Fact.find()
@@ -66,6 +65,7 @@ router.post('/', (req, res, next) => {
                 error: err
             })
         })
+    next();
 })
 
 
@@ -83,6 +83,7 @@ router.delete('/:factsId', (req, res, next) => {
                 error: err
             })
         })
+    next();
 })
 
 module.exports = router
\ No newline at end of file
diff --git a/api/routes/models/fact.js b/api/routes/models/fact.js
index 73b9475..8e6961a 100644
--- a/api/routes/models/fact.js
+++ b/api/routes/models/fact.js
@@ -8,4 +8,4 @@ const factSchema = mongoose.Schema({
     author: String
 })
 
-module.exports = mongoose.model('Fact', factSchema)
\ No newline at end of file
+module.exports = mongoose.model('Fact', factSchema);
\ No newline at end of file
diff --git a/app.js b/app.js
index e5ec047..05d024a 100644
--- a/app.js
+++ b/app.js
@@ -3,7 +3,7 @@ const app = express();
 const morgan = require('morgan')
 const bodyParser = require('body-parser')
 const mongoose = require('mongoose')
-
+const cors = require('cors')
 const factRoutes = require('./api/routes/facts')
 
 
@@ -18,15 +18,13 @@ app.use(morgan('dev'))
 
 app.use(bodyParser.urlencoded({ extended: false }))
 app.use(bodyParser.json())
-
+app.use(cors())
 
 
 //CORS error removal
 app.use((req, res, next) => {
-    res.header('Access-Control-Allow-Origin', '*')
-    res.header('Access-Control-Allow-Headers', '*')
     if (req.method === 'OPTIONS') {
-        res.header('Access-Control-Allow-Methods', 'PUT,POST,PATCH,DELETE,GET')
+        res.header('Access-Control-Allow-Methods', '*')
         return res.status(200).json({})
     }
     next();
diff --git a/package-lock.json b/package-lock.json
index 7fe414f..a381912 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -354,6 +354,15 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
+    "cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "requires": {
+        "object-assign": "^4",
+        "vary": "^1"
+      }
+    },
     "crypto-random-string": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
@@ -1023,6 +1032,11 @@
       "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
       "dev": true
     },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
     "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
diff --git a/package.json b/package.json
index 13d8e1d..7515c06 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
   "homepage": "https://github.com/MLSA-SRM/GET-some-REST#readme",
   "dependencies": {
     "body-parser": "^1.19.0",
+    "cors": "^2.8.5",
     "express": "^4.17.1",
     "mongoose": "^5.10.3",
     "morgan": "^1.10.0"
@@ -26,4 +27,4 @@
   "devDependencies": {
     "nodemon": "^2.0.4"
   }
-}
\ No newline at end of file
+}