From e506be871621da9bfaea79f121e0a5d7644760f1 Mon Sep 17 00:00:00 2001
From: bob <bcz@cs.brown.edu>
Date: Mon, 6 Jan 2020 11:20:33 -0500
Subject: compile fixes and playing with Cors

---
 src/server/server_Initialization.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/server/server_Initialization.ts')

diff --git a/src/server/server_Initialization.ts b/src/server/server_Initialization.ts
index 4cb1fca47..943988fdf 100644
--- a/src/server/server_Initialization.ts
+++ b/src/server/server_Initialization.ts
@@ -22,6 +22,7 @@ import { publicDirectory } from '.';
 import { logPort, } from './ActionUtilities';
 import { timeMap } from './ApiManagers/UserManager';
 import { blue, yellow } from 'colors';
+var cors = require('cors');
 
 /* RouteSetter is a wrapper around the server that prevents the server
    from being exposed. */
@@ -33,7 +34,12 @@ export default async function InitializeServer(routeSetter: RouteSetter) {
 
     app.use(express.static(publicDirectory));
     app.use("/images", express.static(publicDirectory));
-
+    const corsOptions = {
+        origin: function (origin: any, callback: any) {
+            callback(null, true);
+        }
+    };
+    app.use(cors(corsOptions));
     app.use("*", ({ user, originalUrl }, res, next) => {
         if (user && !originalUrl.includes("Heartbeat")) {
             const userEmail = (user as any).email;
-- 
cgit v1.2.3-70-g09d2


From fbd6ba9017ce07eb4afd71e036577754d4df1877 Mon Sep 17 00:00:00 2001
From: bob <bcz@cs.brown.edu>
Date: Mon, 6 Jan 2020 12:26:51 -0500
Subject: trying to allow cross origin requests for files

---
 src/server/server_Initialization.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/server/server_Initialization.ts')

diff --git a/src/server/server_Initialization.ts b/src/server/server_Initialization.ts
index 943988fdf..de0e32580 100644
--- a/src/server/server_Initialization.ts
+++ b/src/server/server_Initialization.ts
@@ -32,7 +32,11 @@ export let disconnect: Function;
 export default async function InitializeServer(routeSetter: RouteSetter) {
     const app = buildWithMiddleware(express());
 
-    app.use(express.static(publicDirectory));
+    app.use(express.static(publicDirectory, {
+        setHeaders: (res, path) => {
+            res.setHeader("Access-Control-Allow-Origin", "true");
+        }
+    }));
     app.use("/images", express.static(publicDirectory));
     const corsOptions = {
         origin: function (origin: any, callback: any) {
-- 
cgit v1.2.3-70-g09d2


From dba3788e4c32478c3bcfb7b5c481aa0b7d03587e Mon Sep 17 00:00:00 2001
From: bob <bcz@cs.brown.edu>
Date: Mon, 6 Jan 2020 12:39:54 -0500
Subject: from last

---
 src/server/server_Initialization.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server/server_Initialization.ts')

diff --git a/src/server/server_Initialization.ts b/src/server/server_Initialization.ts
index de0e32580..0f502e8fb 100644
--- a/src/server/server_Initialization.ts
+++ b/src/server/server_Initialization.ts
@@ -34,7 +34,7 @@ export default async function InitializeServer(routeSetter: RouteSetter) {
 
     app.use(express.static(publicDirectory, {
         setHeaders: (res, path) => {
-            res.setHeader("Access-Control-Allow-Origin", "true");
+            res.setHeader("Access-Control-Allow-Origin", "*");
         }
     }));
     app.use("/images", express.static(publicDirectory));
-- 
cgit v1.2.3-70-g09d2