Merge remote-tracking branch 'origin/main' into separate-frontend-bac…

…kend
uselotus · Oct 10, 2022 · a9b4c01 · a9b4c01
2 parents 9a4c274 + 587566e
commit a9b4c01
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/backend/lotus/settings.py b/backend/lotus/settings.py
@@ -98,6 +98,7 @@
     "django.contrib.staticfiles",
     "rest_framework",
     "metering_billing",
+    "corsheaders",
     "social_django",
     "djmoney",
     "django_extensions",
@@ -351,9 +352,30 @@
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
-CORS_ORIGIN_ALLOW_ALL = True
+if DEBUG:
+    CORS_ALLOW_ALL_ORIGINS = True
+else:
+    CORS_ALLOWED_ORIGINS = [
+        "https://app.uselotus.io",
+        "https://www.uselotus.app",
+        "https://staging.uselotus.io",
+    ]
 CORS_ALLOW_CREDENTIALS = True
 
+CORS_ALLOW_HEADERS = [
+    "accept",
+    "accept-encoding",
+    "authorization",
+    "content-type",
+    "dnt",
+    "origin",
+    "user-agent",
+    "x-csrftoken",
+    "x-requested-with",
+    "x-api-key",
+    "X-API-KEY",
+]
+
 CSRF_COOKIE_SAMESITE = "Lax"
 SESSION_COOKIE_SAMESITE = "Lax"
 CSRF_COOKIE_HTTPONLY = False

diff --git a/frontend/src/.env.prod b/frontend/src/.env.prod
@@ -1,4 +1,4 @@
 NODE_ENV=production
 VITE_APP_NAME=Lotus-Frontend
-VITE_API_URL="https://uselotus.app/"
+VITE_API_URL="https://api.uselotus.io/"
 VITE_STRIPE_CLIENT="ca_MFoUGxeAu02Kb2P1p252evCcWnroWl7S"
diff --git a/frontend/src/api/api.ts b/frontend/src/api/api.ts
@@ -17,6 +17,7 @@ import { CreateOrgAccountType } from "../types/account-type";
 import { cancelSubscriptionType } from "../components/Customers/CustomerSubscriptionView";
 import { FeatureType } from "../types/feature-type";
 
+axios.defaults.baseURL = import.meta.env.VITE_API_URL;
 axios.defaults.xsrfCookieName = "csrftoken";
 axios.defaults.xsrfHeaderName = "X-CSRFToken";