From 60ef08b775dc8f2a229ed0594a7b898c671c7bff Mon Sep 17 00:00:00 2001
From: SithuSoe04 <63730799+SithuSoe04@users.noreply.github.com>
Date: Wed, 30 Oct 2024 19:20:37 -0700
Subject: [PATCH 1/2] Added csesucsd.com to cors list

---
 backend/index.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/backend/index.js b/backend/index.js
index 3472954d..2339e90b 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -5,7 +5,7 @@ import dotenv from 'dotenv';
 import connectDB from './database/connect-db.js';
 // import testDatabaseConnection from './database/db-test.js';
 import connectMailchimp from './mailchimp/connect-mailchimp.js';
-import { addContacts, getContacts } from './mailchimp/contacts.js';
+// import { addContacts, getContacts } from './mailchimp/contacts.js';
 
 // import routes
 import eventRoutes from './routes/event.js';
@@ -20,7 +20,20 @@ dotenv.config();
 
 app.use(bodyParser.json({ limit: '30mb', extended: true }));
 app.use(bodyParser.urlencoded({ limit: '30mb', extended: true }));
-app.use(cors());
+const allowedOrigins = ['http://localhost:3000', 'https://csesucsd.com'];
+app.use(cors({
+  origin: (origin, callback) => {
+    if (allowedOrigins.includes(origin) || !origin) {
+      callback(null, true);
+    } else {
+      callback(new Error('Not allowed by CORS'));
+    }
+  },
+  methods: 'GET,POST,PUT,DELETE,OPTIONS',
+  credentials: true
+}));
+
+// app.use(cors());
 
 const PORT = process.env.PORT || 5000;
 const baseApi = '/api/v1';

From 4c2cb6165c351653306a514cb0de9a6a5d94e9ae Mon Sep 17 00:00:00 2001
From: SithuSoe04 <63730799+SithuSoe04@users.noreply.github.com>
Date: Tue, 12 Nov 2024 21:07:54 -0800
Subject: [PATCH 2/2] Updated Mailchimp API Key

---
 backend/controllers/emailSubscription.js |  2 +-
 backend/index.js                         | 16 ++--------------
 backend/mailchimp/connect-mailchimp.js   |  2 +-
 backend/mailchimp/contacts.js            |  2 +-
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/backend/controllers/emailSubscription.js b/backend/controllers/emailSubscription.js
index 2c2105a6..24a7e316 100644
--- a/backend/controllers/emailSubscription.js
+++ b/backend/controllers/emailSubscription.js
@@ -6,7 +6,7 @@ const apikey = process.env.MAILCHIMP_API_KEY;
 
 mailchimp.setConfig({
   apiKey: apikey,
-  server: "us13",
+  server: "us12",
 });
 
 // Audience ID: 968cfc7373
diff --git a/backend/index.js b/backend/index.js
index 2339e90b..8ca7619c 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -20,20 +20,8 @@ dotenv.config();
 
 app.use(bodyParser.json({ limit: '30mb', extended: true }));
 app.use(bodyParser.urlencoded({ limit: '30mb', extended: true }));
-const allowedOrigins = ['http://localhost:3000', 'https://csesucsd.com'];
-app.use(cors({
-  origin: (origin, callback) => {
-    if (allowedOrigins.includes(origin) || !origin) {
-      callback(null, true);
-    } else {
-      callback(new Error('Not allowed by CORS'));
-    }
-  },
-  methods: 'GET,POST,PUT,DELETE,OPTIONS',
-  credentials: true
-}));
-
-// app.use(cors());
+
+app.use(cors());
 
 const PORT = process.env.PORT || 5000;
 const baseApi = '/api/v1';
diff --git a/backend/mailchimp/connect-mailchimp.js b/backend/mailchimp/connect-mailchimp.js
index dbf966ae..3aa23715 100644
--- a/backend/mailchimp/connect-mailchimp.js
+++ b/backend/mailchimp/connect-mailchimp.js
@@ -5,7 +5,7 @@ const apikey = process.env.MAILCHIMP_API_KEY;
 
 mailchimp.setConfig({
   apiKey: apikey,
-  server: "us13",
+  server: "us12",
 });
 
 async function connectMailchimp() {
diff --git a/backend/mailchimp/contacts.js b/backend/mailchimp/contacts.js
index 195a1462..325f0e70 100644
--- a/backend/mailchimp/contacts.js
+++ b/backend/mailchimp/contacts.js
@@ -6,7 +6,7 @@ const apikey = process.env.MAILCHIMP_API_KEY;
 
 mailchimp.setConfig({
   apiKey: apikey,
-  server: "us13",
+  server: "us12",
 });
 
 // Audience ID: 968cfc7373