CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-10-02 18:16:29 +13:00
Code Issues Projects Releases Wiki Activity

couchdb direct auth

Browse source
This commit is contained in:
Martin McKeaveney 2021-08-16 15:58:04 +01:00
parent c664e13023
commit 8718488aee
7 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/auth/src/db/utils.js
View file

@ -168,7 +168,13 @@ exports.getAllDbs = async () => {
if (env.isTest()) {
return getCouch().allDbs()
}
const response = await fetch(`${env.COUCH_DB_URL}/_all_dbs`)
const response = await fetch(`${env.COUCH_DB_URL}/_all_dbs`, {
method: "POST",
body: JSON.stringify({
name: env.COUCH_DB_USERNAME,
password: env.COUCH_DB_PASSWORD,
}),
})
if (response.status === 200) {
return response.json()
} else {

2
packages/server/scripts/dev/manage.js
View file

@ -36,7 +36,7 @@ async function init() {
const envFileJson = {
PORT: 4001,
MINIO_URL: "http://localhost:10000/",
COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/",
COUCH_DB_URL: "http://localhost:10000/db/",
REDIS_URL: "localhost:6379",
WORKER_URL: "http://localhost:4002",
INTERNAL_API_KEY: "budibase",

4
packages/server/src/db/client.js
View file

@ -12,6 +12,10 @@ PouchDB.adapter("writableStream", replicationStream.adapters.writableStream)
let POUCH_DB_DEFAULTS = {
prefix: COUCH_DB_URL,
auth: {
username: env.COUCH_DB_USERNAME,
password: env.COUCH_DB_PASSWORD,
}
}
if (env.isTest()) {

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

@ -23,6 +23,8 @@ module.exports = {
// important
PORT: process.env.PORT,
JWT_SECRET: process.env.JWT_SECRET,
COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
COUCH_DB_URL: process.env.COUCH_DB_URL,
MINIO_URL: process.env.MINIO_URL,
WORKER_URL: process.env.WORKER_URL,

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

@ -17,7 +17,7 @@ async function init() {
REDIS_URL: "localhost:6379",
REDIS_PASSWORD: "budibase",
MINIO_URL: "http://localhost:10000/",
COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/",
COUCH_DB_URL: "http://localhost:10000/db/",
}
let envFile = ""
Object.keys(envFileJson).forEach(key => {

4
packages/worker/src/db/index.js
View file

@ -7,6 +7,10 @@ const COUCH_DB_URL = env.COUCH_DB_URL || "http://localhost:10000/db/"
let POUCH_DB_DEFAULTS = {
prefix: COUCH_DB_URL,
auth: {
username: env.COUCH_DB_USERNAME,
password: env.COUCH_DB_PASSWORD,
}
}
if (env.isTest()) {

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

@ -23,7 +23,6 @@ module.exports = {
MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
MINIO_URL: process.env.MINIO_URL,
COUCH_DB_URL: process.env.COUCH_DB_URL,
LOG_LEVEL: process.env.LOG_LEVEL,
JWT_SECRET: process.env.JWT_SECRET,
SALT_ROUNDS: process.env.SALT_ROUNDS,
@ -31,7 +30,7 @@ module.exports = {
REDIS_PASSWORD: process.env.REDIS_PASSWORD,
INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
/* TODO: to remove - once deployment removed */
COUCH_DB_USERNAME: process.env.COUCH_DB_USERNAME,
COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
_set(key, value) {
process.env[key] = value