apache

docker-compose.yml

@@ -65,8 +65,8 @@ services:
 #   container_name: apache_"${ENV}"    
     build:  
       context: ./
-      dockerfile: build/docker/httpd/Dockerfile
-      #: build/docker/apache/Dockerfile
+      #dockerfile: build/docker/httpd/Dockerfile
+      dockerfile: build/docker/apache/Dockerfile
     ports:
       - "8080:80"
     networks:

express-server/index.js

@@ -1,11 +1,15 @@
 const express = require('express');
 const bodyparser = require('body-parser');
+const passport = require('passport');
 const mongoose = require('mongoose');
-// const cors = require('cors');
+//const cors = require('cors');
 // const config = require('./config/db.config');
+
+
 const userRoutes = require('./routes/user');
 const employeeRoutes = require('./routes/employee');
 const authRoutes = require('./routes/auth');
+//const oauthRoutes = require('./routes/oauth');
 const ticketRoutes = require('./routes/ticket');
 const emailsRoutes = require('./routes/emailing');
 const authGoogle = require('./routes/google');
@@ -33,23 +37,26 @@ app.use(metricsMiddleware);
 
 //metrics
 app.use(makeApiMiddleware()); 
+//app.use(cors());
 
 app.get("/api", (req, res) => {
     res.status(200).send("Api Works.");
   });
 
-// var corsOptions = {
-//     origin: 'http://example.com',
-//     optionsSuccessStatus: 200 
-//   }
+  // var corsOptions = {
+  //   origin: 'https://localhost:4200',
+  //   optionsSuccessStatus: 200 
+  // }
 
 //Définition des CORS Middleware 
 app.use(function(req, res, next) {
+  
+    //res.header("Access-Control-Allow-Origin", "*");
+    res.setHeader("Access-Control-Allow-Origin", "*");
     res.setHeader(
       "Access-Control-Allow-Headers",
       "X-Requested-With,content-type, Accept,Authorization,Origin"
     );
-    res.setHeader("Access-Control-Allow-Origin", "https://angular-preprod.foodgame.fr");
     res.setHeader(
       "Access-Control-Allow-Methods",
       "GET, POST, OPTIONS, PUT, PATCH, DELETE"
@@ -59,16 +66,18 @@ app.use(function(req, res, next) {
   });
 
 
-
 // parse requests  body params
 app.use(bodyparser.json());
 app.use(bodyparser.urlencoded({extended: true}));
+app.use(passport.initialize());
 
 //simple route
 app.use('/api/users', userRoutes );
 app.use('/api/employees', employeeRoutes );
 app.use('/api/tickets', ticketRoutes );
 app.use('/api/auth',  authRoutes );
+//app.use('/api/auth', oauthRoutes );
+//app.use('/api/auth',  authGoogle );
 app.use('/api/emails',  emailsRoutes );
 app.use('/api/auth/google',  authGoogle );
 app.use('/api/auth/facebook',  authFacebook );
@@ -86,4 +95,4 @@ require('./lib/db');
 const PORT = process.env.PORT || 4000;
 app.listen(PORT, () => {
     console.log(`Api listen on port ${PORT}.`);
-});
+});