MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

This commit is contained in:
Martin McKeaveney 2021-04-15 16:49:35 +01:00
parent 2edb559fcf
commit 212a1217c5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/server/src/db/client.js
View File

@ -15,13 +15,13 @@ let POUCH_DB_DEFAULTS = {
skip_setup: env.isProd(), skip_setup: env.isProd(),
} }
if (env.isTest()) { // if (env.isTest()) {
PouchDB.plugin(require("pouchdb-adapter-memory")) // PouchDB.plugin(require("pouchdb-adapter-memory"))
POUCH_DB_DEFAULTS = { // POUCH_DB_DEFAULTS = {
prefix: undefined, // prefix: undefined,
adapter: "memory", // adapter: "memory",
} // }
} // }
const Pouch = PouchDB.defaults(POUCH_DB_DEFAULTS) const Pouch = PouchDB.defaults(POUCH_DB_DEFAULTS)

2
packages/worker/src/api/controllers/auth.js
View File

@ -28,7 +28,7 @@ exports.authenticate = async (ctx, next) => {
exports.logout = async ctx => { exports.logout = async ctx => {
clearCookie(ctx, Cookies.Auth) clearCookie(ctx, Cookies.Auth)
ctx.body = { messaged: "User logged out" } ctx.body = { message: "User logged out" }
} }
exports.googleAuth = async () => { exports.googleAuth = async () => {