Merge pull request #3648 from LiteFarmOrg/integration

Patch 3.7.4
LiteFarmOrg · Jan 14, 2025 · 8ae8674 · 8ae8674
2 parents 0a6a65e + 0f11ccc
commit 8ae8674
Show file tree

Hide file tree

Showing 28 changed files with 4,935 additions and 4,103 deletions.
diff --git a/.github/workflows/lint_translation_files.yml b/.github/workflows/lint_translation_files.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up pnpm
         uses: pnpm/[email protected]
         with:
-          version: 6.26.1
+          version: latest
 
       - name: Install pnpm dependencies
         run: pnpm install

diff --git a/.github/workflows/webapp_unit_tests.yml b/.github/workflows/webapp_unit_tests.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/[email protected]
         with:
-          version: 6.26.1
+          version: latest
       - name: Install dependencies
         run: pnpm install
       - name: Run unit tests

diff --git a/packages/api/package-lock.json b/packages/api/package-lock.json
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "litefarm-api",
-  "version": "3.7.3",
+  "version": "3.7.4",
   "description": "LiteFarm API server",
   "main": "./api/src/server.js",
   "type": "module",

diff --git a/packages/api/src/server.js b/packages/api/src/server.js
@@ -39,7 +39,7 @@ if (process.env.SENTRY_DSN && environment !== 'development') {
       // Automatically instrument Node.js libraries and frameworks
       ...Sentry.autoDiscoverNodePerformanceMonitoringIntegrations(),
     ],
-    release: '3.7.3',
+    release: '3.7.4',
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production
@@ -252,6 +252,19 @@ const rejectBodyInGetAndDelete = (req, res, next) => {
   next();
 };
 
+const getAllowedOrigin = () => {
+  switch (environment) {
+    case 'development':
+      return 'http://localhost:3000';
+    case 'integration':
+      return 'https://beta.litefarm.org';
+    case 'production':
+      return 'https://app.litefarm.org';
+    default:
+      return 'https://app.litefarm.org';
+  }
+};
+
 app
   .use(applyExpressJSON)
   .use(express.urlencoded({ extended: true }))
@@ -260,7 +273,8 @@ app
   // prevent CORS errors
   .use(cors())
   .use((req, res, next) => {
-    res.header('Access-Control-Allow-Origin', '*');
+    const origin = getAllowedOrigin();
+    res.header('Access-Control-Allow-Origin', origin);
     res.header(
       'Access-Control-Allow-Headers',
       'Origin, X-Requested-With, Content-Type, Accept, Authorization',

diff --git a/packages/webapp/nginx.conf b/packages/webapp/nginx.conf
@@ -93,7 +93,7 @@ http {
 
           proxy_set_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, PUT, DELETE';
           proxy_pass_request_headers      on;
-          proxy_set_header 'Access-Control-Allow-Origin' '*';
+          proxy_set_header 'Access-Control-Allow-Origin' 'https://beta.litefarm.org';
           proxy_pass http://backend:5000/;
         }
         listen 443 ssl; # managed by Certbot

diff --git a/packages/webapp/package.json b/packages/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "litefarm-webapp",
-  "version": "3.7.3",
+  "version": "3.7.4",
   "description": "LiteFarm Web application",
   "type": "module",
   "scripts": {