Merge pull request #151 from bl4drnnr/web-interface-dev

update allowed headers and cloudflare dns
bl4drnnr · Apr 6, 2024 · 92f7294 · 92f7294
2 parents 26c2770 + 7d6c016
commit 92f7294
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 44 deletions.
diff --git a/mnemosyne-web-interface/mnemosyne-api-proxy/src/main.ts b/mnemosyne-web-interface/mnemosyne-api-proxy/src/main.ts
@@ -38,35 +38,42 @@ import { urlencoded, json } from 'express';
   //   }
   // });
 
-  app.use(cors({
-    allowedHeaders: ['Content-Type', 'Authorization', 'X-Access-Token'],
-    methods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD'],
-    origin: function (origin, callback) {
-      if (whitelist.indexOf(origin) !== -1) {
-        const message = `allowed cors for (API Proxy): ${origin}\n`;
-        fs.appendFile('cors_logs.txt', message, (err) => {
-          if (err) throw err;
-          console.log('Cors log appended to file');
-        });
-        callback(null, true);
-      } else {
-        const message = `blocked cors for (API Proxy): ${origin}\n`;
-        fs.appendFile('cors_logs.txt', message, (err) => {
-          if (err) throw err;
-          console.log('Cors log appended to file');
-        });
-        callback(new Error('Not allowed by CORS'));
-      }
-    },
-    credentials: true,
-  }));
+  // app.use(cors({
+  //   allowedHeaders: ['Content-Type', 'Authorization', 'X-Access-Token'],
+  //   methods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD'],
+  //   origin: function (origin, callback) {
+  //     if (whitelist.indexOf(origin) !== -1) {
+  //       const message = `allowed cors for (API Proxy): ${origin}\n`;
+  //       fs.appendFile('cors_logs.txt', message, (err) => {
+  //         if (err) throw err;
+  //         console.log('Cors log appended to file');
+  //       });
+  //       callback(null, true);
+  //     } else {
+  //       const message = `blocked cors for (API Proxy): ${origin}\n`;
+  //       fs.appendFile('cors_logs.txt', message, (err) => {
+  //         if (err) throw err;
+  //         console.log('Cors log appended to file');
+  //       });
+  //       callback(new Error('Not allowed by CORS'));
+  //     }
+  //   },
+  //   credentials: true,
+  // }));
 
   // app.enableCors({
   //   allowedHeaders: ['content-type'],
   //   origin: 'https://mnemosyne.io',
   //   credentials: true
   // });
 
+  app.enableCors({
+    allowedHeaders: ['Content-Type', 'Authorization', 'X-Access-Token'],
+    methods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD'],
+    origin: whitelist,
+    credentials: true
+  });
+
   // Working in the development mode
   // app.enableCors({
   //   origin: ['http://localhost:4200', 'https://mnemosyne.io'],

diff --git a/mnemosyne-web-interface/mnemosyne-api/src/main.ts b/mnemosyne-web-interface/mnemosyne-api/src/main.ts
@@ -37,34 +37,41 @@ import { urlencoded, json } from 'express';
   //   }
   // });
 
-  app.use(cors({
-    allowedHeaders: ['Content-Type', 'Authorization', 'X-Access-Token'],
-    methods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD'],
-    origin: function (origin, callback) {
-      if (whitelist.indexOf(origin) !== -1) {
-        const message = `allowed cors for (API): ${origin}\n`;
-        fs.appendFile('cors_logs.txt', message, (err) => {
-          if (err) throw err;
-          console.log('Cors log appended to file');
-        });
-        callback(null, true);
-      } else {
-        const message = `blocked cors for (API): ${origin}\n`;
-        fs.appendFile('cors_logs.txt', message, (err) => {
-          if (err) throw err;
-          console.log('Cors log appended to file');
-        });
-        callback(new Error('Not allowed by CORS'));
-      }
-    },
-    credentials: true,
-  }));
+  // app.use(cors({
+  //   allowedHeaders: ['Content-Type', 'Authorization', 'X-Access-Token'],
+  //   methods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD'],
+  //   origin: function (origin, callback) {
+  //     if (whitelist.indexOf(origin) !== -1) {
+  //       const message = `allowed cors for (API): ${origin}\n`;
+  //       fs.appendFile('cors_logs.txt', message, (err) => {
+  //         if (err) throw err;
+  //         console.log('Cors log appended to file');
+  //       });
+  //       callback(null, true);
+  //     } else {
+  //       const message = `blocked cors for (API): ${origin}\n`;
+  //       fs.appendFile('cors_logs.txt', message, (err) => {
+  //         if (err) throw err;
+  //         console.log('Cors log appended to file');
+  //       });
+  //       callback(new Error('Not allowed by CORS'));
+  //     }
+  //   },
+  //   credentials: true,
+  // }));
 
   // app.enableCors({
   //   origin: 'https://proxy.mnemosyne.io',
   //   credentials: true
   // });
 
+  app.enableCors({
+    allowedHeaders: ['Content-Type', 'Authorization', 'X-Access-Token'],
+    methods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD'],
+    origin: whitelist,
+    credentials: true
+  });
+
   // Working in the development mode
   // app.enableCors({
   //   origin: ['http://localhost:4201', 'https://proxy.mnemosyne.io'],