Merge 31b3d2d into 0723eb2

andela · Aug 6, 2019 · e99b974 · e99b974
2 parents 0723eb2 + 31b3d2d
commit e99b974
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 254 deletions.
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: NODE_ENV=staging yarn start  
+web: NODE_ENV=staging yarn start 
diff --git a/src/api/controllers/articlesController.js b/src/api/controllers/articlesController.js
@@ -96,7 +96,7 @@ class articlesController {
     const allArticle = await articles.getAllArticle();
 
     if (!allArticle[0]) {
-      return res.status(404).send({ error: 'Whoops! No Articles found!' });
+      return res.status(200).send({ message: 'Whoops! No Articles found!' });
     }
     res.status(200).send({
       articles: allArticle

diff --git a/src/middleware/globalMiddleware.js b/src/middleware/globalMiddleware.js
@@ -9,6 +9,13 @@ export default (app) => {
     .use(bodyParser.urlencoded({ extended: true }))
     // Allow cross origin requests
     .use(cors());
+  app.use((req, res, next) => {
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    res.header('Access-Control-Allow-Methods', 'GET, OPTIONS, POST, PUT, PATCH, DELETE');
+    res.header('Access-Control-Allow-Headers', 'Content-Type, token');
+    res.header('Access-Control-Allow-Credentials', true);
+    return next();
+  });
   if (process.env.NODE_ENV !== 'test') {
     app.use(morgan('dev'));
   }