Merge pull request #225 from ita-social-projects/#224FixWhitelist

#224 fix whitelist
ita-social-projects · Sep 25, 2023 · 5ae23f7 · 5ae23f7
2 parents f74dad6 + 6376aa4
commit 5ae23f7
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 /venv
 /.venv
 /.env
+/*/.env
 /.DS_Store
 __pycache__/
 /FrontEnd/node_modules
diff --git a/FrontEnd/package-lock.json b/FrontEnd/package-lock.json
diff --git a/FrontEnd/package.json b/FrontEnd/package.json
@@ -44,5 +44,8 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "devDependencies": {
+    "dotenv": "^16.3.1"
   }
 }
diff --git a/FrontEnd/sample.env b/FrontEnd/sample.env
@@ -0,0 +1 @@
+REACT_APP_API_URL=
diff --git a/FrontEnd/src/App.js b/FrontEnd/src/App.js
@@ -1,9 +1,8 @@
 import React from 'react';
 import './App.css';
 import { BrowserRouter, Routes, Route } from 'react-router-dom';
-import AdminPage from "./components/adminPage/AdminPage";
-import BasicPage from "./components/basicPage/BasicPage";
-
+import AdminPage from './components/adminPage/AdminPage';
+import BasicPage from './components/basicPage/BasicPage';
 
 function App() {
   return (

diff --git a/forum/settings.py b/forum/settings.py
@@ -65,13 +65,14 @@
 CORS_ALLOW_ALL_ORIGINS = False
 
 CORS_ORIGIN_WHITELIST = [
-    'http://localhost:3000',
+    'http://localhost',
     'http://127.0.0.1',
     'http://0.0.0.0',
+    config('CORS_ORIGIN_WHITELIST'),
 ]
 
 CORS_ALLOWED_ORIGINS = [
-    'http://localhost:3000',
+    'http://localhost',
     'http://127.0.0.1',
     'http://0.0.0.0',
 ]

diff --git a/sample.env b/sample.env
@@ -1,13 +1,18 @@
+#db details
 SECRET_KEY=
 PG_DB=
 PG_USER=
 PG_PASSWORD=
 DB_HOST=
 DB_PORT=
 
+#SMTP
 EMAIL_BACKEND=django.core.mail.backends.smtp.EmailBackend
 EMAIL_HOST=
 EMAIL_PORT=
 EMAIL_USE_TLS=
 EMAIL_HOST_USER=
 EMAIL_HOST_PASSWORD=
+
+#origin hostnames allowed to make cross-site HTTP requests
+CORS_ORIGIN_WHITELIST=