Updated Dockerfile to run with prod and cors

Arquisoft · May 4, 2023 · 13df532 · 13df532
1 parent 852fca1
commit 13df532
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/restapi/Dockerfile b/restapi/Dockerfile
@@ -4,4 +4,5 @@ COPY . /app
 WORKDIR /app
 #Install the dependencies
 RUN npm install
-CMD [ "npm", "start" ]
+CMD [ "npm", "run", "prod" ]
+#CMD [ "npm", "start" ]
diff --git a/restapi/api.ts b/restapi/api.ts
@@ -11,7 +11,7 @@ api.use(
         credentials: true,
         origin: ["https://20.168.251.141", "https://lomapen3a.cloudns.ph", "https://localhost",
             "https://20.168.251.141:443", "https://lomapen3a.cloudns.ph:443", "https://localhost:443"],
-        allowedHeaders: ["Content-Type", "Authorization", "Access-Control-Allow-Origin"],
+        allowedHeaders: ["Content-Type", "Authorization"],
         preflightContinue: true,
     })
 );

diff --git a/restapi/server.ts b/restapi/server.ts
@@ -21,7 +21,6 @@ mongoose.connect(uri, options).then(
 const metricsMiddleware:RequestHandler = promBundle({includeMethod: true});
 app.use(metricsMiddleware);
 
-app.use(cors());
 app.use(bp.json());
 
 app.use("/api", api)
@@ -35,7 +34,7 @@ try {
         if (req.secure) {
             return next();
         }
-        res.redirect('https://'+req.hostname + req.url);
+        res.redirect('https://'+ "lomapen3a.cloudns.ph" + ":" + portHttps + req.url);
     });
 
     createServer(credentials, app)

diff --git a/restapi/src/controllers/places/PlacesController.ts b/restapi/src/controllers/places/PlacesController.ts
@@ -5,6 +5,7 @@ import {validationResult} from "express-validator";
 
 const getPlaces = async (req: Request, res: Response): Promise<Response> => {
     try {
+        res.header('Access-Control-Allow-Origin', '*');
         const places: Array<PlaceType> = await Promise.resolve(Place.find());
         return res.status(200).send(places);
     }
@@ -15,6 +16,7 @@ const getPlaces = async (req: Request, res: Response): Promise<Response> => {
 
 const addPlace = async (req: Request, res: Response): Promise<Response> => {
     try {
+        res.header('Access-Control-Allow-Origin', '*');
         const errors = validationResult(req);
         if (!errors.isEmpty()) {
             return res.status(400).json({errors: errors.array()})
@@ -34,6 +36,7 @@ const addPlace = async (req: Request, res: Response): Promise<Response> => {
 
 const deletePlace = async (req: Request, res: Response): Promise<Response> => {
     try {
+        res.header('Access-Control-Allow-Origin', '*');
         const errors = validationResult(req);
         if (!errors.isEmpty()) {
             return res.status(400).json({errors: errors.array()})
@@ -50,6 +53,7 @@ const deletePlace = async (req: Request, res: Response): Promise<Response> => {
 
 const updatePlace = async (req: Request, res: Response): Promise<Response> => {
     try {
+        res.header('Access-Control-Allow-Origin', '*');
         const errors = validationResult(req);
         if (!errors.isEmpty()) {
             return res.status(400).json({errors: errors.array()})
@@ -71,6 +75,7 @@ const updatePlace = async (req: Request, res: Response): Promise<Response> => {
 
 const findPlaceByTitle = async (req: Request, res: Response): Promise<Response> => {
     try {
+        res.header('Access-Control-Allow-Origin', '*');
         const errors = validationResult(req);
         if (!errors.isEmpty()) {
             return res.status(400).json({errors: errors.array()})