merge

6 years ago · 9cebd859f8
2 changed files with 8 additions and 8 deletions
--- a/packages/server/src/db/client.js
+++ b/packages/server/src/db/client.js
@ -15,13 +15,13 @@ let POUCH_DB_DEFAULTS = {
  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)
--- a/packages/worker/src/api/controllers/auth.js
+++ b/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 () => {