CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-04 14:01:27 +12:00
Code Issues Projects Releases Wiki Activity

Remove cors configuration

Browse source
This commit is contained in:
Rory Powell 2021-09-08 12:13:57 +01:00
parent fcf5aac7e6
commit bc50bf56db
5 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hosting/docker-compose.yaml
View file

@ -51,8 +51,6 @@ services:
INTERNAL_API_KEY: ${INTERNAL_API_KEY} INTERNAL_API_KEY: ${INTERNAL_API_KEY}
REDIS_URL: redis-service:6379 REDIS_URL: redis-service:6379
REDIS_PASSWORD: ${REDIS_PASSWORD} REDIS_PASSWORD: ${REDIS_PASSWORD}
CORS_ORIGIN: ${CORS_ORIGIN}
CORS_CREDENTIALS: ${CORS_CREDENTIALS}
volumes: volumes:
- ./logs:/logs - ./logs:/logs
depends_on: depends_on:

1
packages/worker/package.json
View file

@ -34,7 +34,6 @@
"joi": "^17.4.0", "joi": "^17.4.0",
"koa": "^2.7.0", "koa": "^2.7.0",
"koa-body": "^4.2.0", "koa-body": "^4.2.0",
"@koa/cors": "^3.1.0",
"koa-compress": "^4.0.1", "koa-compress": "^4.0.1",
"koa-passport": "^4.1.4", "koa-passport": "^4.1.4",
"koa-pino-logger": "^3.0.0", "koa-pino-logger": "^3.0.0",

3
packages/worker/scripts/dev/manage.js
View file

@ -21,9 +21,6 @@ async function init() {
COUCH_DB_PASSWORD: "budibase", COUCH_DB_PASSWORD: "budibase",
// empty string is false // empty string is false
MULTI_TENANCY: "", MULTI_TENANCY: "",
// account portal cors configuration
CORS_ORIGIN: "http://localhost:3001",
CORS_CREDENTIALS: true,
} }
let envFile = "" let envFile = ""
Object.keys(envFileJson).forEach(key => { Object.keys(envFileJson).forEach(key => {

2
packages/worker/src/environment.js
View file

@ -33,8 +33,6 @@ module.exports = {
INTERNAL_API_KEY: process.env.INTERNAL_API_KEY, INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
MULTI_TENANCY: process.env.MULTI_TENANCY, MULTI_TENANCY: process.env.MULTI_TENANCY,
SANDBOX: process.env.SANDBOX, SANDBOX: process.env.SANDBOX,
CORS_ORIGIN: process.env.CORS_ORIGIN,
CORS_CREDENTIALS: process.env.CORS_CREDENTIALS,
_set(key, value) { _set(key, value) {
process.env[key] = value process.env[key] = value
module.exports[key] = value module.exports[key] = value

11
packages/worker/src/index.js
View file

@ -6,7 +6,6 @@ const Koa = require("koa")
const destroyable = require("server-destroy") const destroyable = require("server-destroy")
const koaBody = require("koa-body") const koaBody = require("koa-body")
const koaSession = require("koa-session") const koaSession = require("koa-session")
const cors = require("@koa/cors")
const { passport } = require("@budibase/auth").auth const { passport } = require("@budibase/auth").auth
const logger = require("koa-pino-logger") const logger = require("koa-pino-logger")
const http = require("http") const http = require("http")
@ -15,16 +14,6 @@ const redis = require("./utilities/redis")
const app = new Koa() const app = new Koa()
// TODO: Remove this when using envoy / nginx
if (env.CORS_ORIGIN) {
const corsConfig = {
origin: env.CORS_ORIGIN,
credentials: !!env.CORS_CREDENTIALS,
}
app.use(cors(corsConfig))
}
app.keys = ["secret", "key"] app.keys = ["secret", "key"]
// set up top level koa middleware // set up top level koa middleware