Browse Source

merge

pull/1383/head
Martin McKeaveney 5 years ago
parent
commit
212a1217c5
  1. 14
      packages/server/src/db/client.js
  2. 2
      packages/worker/src/api/controllers/auth.js

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

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

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

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

Loading…
Cancel
Save