Merge pull request #85 from AbegaM/fix_cors_error

Fix cors origin error in the CLI
thevahidal · Jun 30, 2023 · 6036d0a · 6036d0a
2 parents 3dd1d76 + 0fff753
commit 6036d0a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/core/package-lock.json b/core/package-lock.json
diff --git a/core/package.json b/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "soul-cli",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "A SQLite REST and Realtime server",
   "main": "src/server.js",
   "bin": {

diff --git a/core/src/config/index.js b/core/src/config/index.js
@@ -75,7 +75,8 @@ module.exports = {
     filename: argv.database || envVars.DB || ':memory:',
   },
   cors: {
-    origin: argv.cors.split(',') || envVars.CORS_ORIGIN_WHITELIST.split(','),
+    origin: argv.cors?.split(',') ||
+      envVars.CORS_ORIGIN_WHITELIST?.split(',') || ['*'],
   },
   rateLimit: {
     enabled: argv['rate-limit-enabled'] || envVars.RATE_LIMIT_ENABLED,

diff --git a/core/src/index.js b/core/src/index.js
@@ -28,13 +28,19 @@ app.use(bodyParser.json());
 db.pragma('journal_mode = WAL');
 
 // Enable CORS
+let corsOrigin = config.cors.origin;
+
+if (corsOrigin.includes('*')) {
+  corsOrigin = '*';
+}
+
 const corsOptions = {
-  origin: config.cors.origin,
+  origin: corsOrigin,
 };
+
 app.use(cors(corsOptions));
 
 // Log requests
-
 if (config.verbose !== null) {
   app.use(
     expressWinston.logger({