From c6e02cf7973e8dc811ebd22442c174e85912d7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Y=C3=BBki=20VACHOT?= <git@vachot.fr>
Date: Wed, 29 Dec 2021 18:51:56 +0100
Subject: [PATCH] Update: Move Cors to Routes

---
 config/cors.config.js |  5 ++---
 routes/user.routes.js | 26 +++++++++++++-------------
 server.js             | 10 +++++-----
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/config/cors.config.js b/config/cors.config.js
index e7aac87..8f6b845 100644
--- a/config/cors.config.js
+++ b/config/cors.config.js
@@ -5,8 +5,7 @@ const allowList = [
     'http://127.0.0.1:4200',
     'http://127.0.0.1:4201',
     'https://admin-polynotfound.herokuapp.com',
-    'https://polynotfound.herokuapp.com',
-
+    'https://polynotfound.herokuapp.com'
 ];
 
 const corsOptionsDelegate = function(req, callback) {
@@ -14,7 +13,7 @@ const corsOptionsDelegate = function(req, callback) {
     let corsOptions;
     if (allowList.indexOf(req.header('Origin')) !== -1) {
         corsOptions = {
-            origin: false,
+            origin: true,
             credentials: true
         }
     } else {
diff --git a/routes/user.routes.js b/routes/user.routes.js
index 3e7d2fa..4d62364 100644
--- a/routes/user.routes.js
+++ b/routes/user.routes.js
@@ -1,43 +1,43 @@
 const users = require("../controllers/user.controller");
-//const {cors, options} = require("../config/cors.config");
+const {cors, options} = require("../config/cors.config");
 module.exports = app => {
   let router = require("express").Router();
 
   // Authenticate a User
-  router.post("/user/auth",  users.auth);
+  router.post("/user/auth", cors(options), users.auth);
 
   // Logout a User
-  router.delete("/user/logout",  users.logout);
+  router.delete("/user/logout", cors(options), users.logout);
 
   // Request password reset with email
-  router.post("/user/resetPass",  users.resetPass);
+  router.post("/user/resetPass", cors(options), users.resetPass);
 
   // Create and Save a new User
-  router.post("/user/create",  users.create);
+  router.post("/user/create", cors(options), users.create);
 
   // Retrieve all Users if admin
-  router.get("/user/findAll",  users.findAll);
+  router.get("/user/findAll", cors(options), users.findAll);
 
   // Find single User from id if admin or session id
-  router.get("/user/findOne/:id",  users.findOne);
+  router.get("/user/findOne/:id", cors(options), users.findOne);
 
   // Update a User from id if admin or session id
-  router.put("/user/update/:id",  users.update);
+  router.put("/user/update/:id", cors(options), users.update);
 
   // Delete a User from id if admin or session id
-  router.delete("/user/delete/:id",  users.delete);
+  router.delete("/user/delete/:id", cors(options), users.delete);
 
   // Delete all Users if superAdmin
-  router.delete("/user/deleteAll",  users.deleteAll);
+  router.delete("/user/deleteAll", cors(options), users.deleteAll);
 
   // Get all Roles depending on the User session id
-  router.get("/user/roles",  users.roles);
+  router.get("/user/roles", cors(options), users.roles);
 
   // Get 1 or multiple ad adapted to the User session id
-  router.get("/user/ad",  users.ad);
+  router.get("/user/ad", cors(options), users.ad);
 
   // Get History
-  router.get("/user/history",  users.history);
+  router.get("/user/history", cors(options), users.history);
 
   app.use('/api', router);
 };
diff --git a/server.js b/server.js
index 6c55266..3e99831 100644
--- a/server.js
+++ b/server.js
@@ -2,11 +2,11 @@ const express = require('express');
 const app = express();
 const port = process.env.PORT || 3000;
 
-const cors = require('cors');
-app.use(cors({
-  origin: 'https://admin-polynotfound.herokuapp.com',
-  credentials: true
-}));
+//const cors = require('cors');
+//app.use(cors({
+//  origin: 'https://admin-polynotfound.herokuapp.com',
+//  credentials: true
+//}));
 
 const cookieParser = require('cookie-parser');
 app.use(cookieParser());