@openneuro/server 4.3.0-alpha.0 → 4.3.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.3.0-alpha.0",
+  "version": "4.3.0-alpha.1",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -89,7 +89,6 @@
     "ioredis-mock": "^3.8.1",
     "jest": "^26.6.3",
     "mockingoose": "2.11.0",
-    "mongo-mock": "3.7.1",
     "nodemon": "^2.0.7",
     "supertest": "^3.0.0",
     "ts-node-dev": "1.1.6",
@@ -104,5 +103,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "966931efa8d06bbf0b9540038ab3decab086d745"
+  "gitHead": "7bddf78a87c14fc36561344bf7170ee01582aa4e"
 }

package/src/__mocks__/mongoose.js

@@ -1,4 +1,3 @@
-jest.unmock('mongodb')
 import mongoose from 'mongoose'
 
 export default mongoose

package/src/graphql/resolvers/__tests__/user.spec.js

@@ -3,24 +3,13 @@ import { users } from '../user.js'
 describe('user resolvers', () => {
   describe('users()', () => {
     it('throws an error for non-admins', () => {
-      expect(() =>
+      expect(
         users(
           null,
           { id: '3311cfe8-9764-434d-b80e-1b1ee72c686d' },
           { userInfo: {} },
         ),
-      ).toThrowError()
-    })
-    it('admins should be able to override restrictions', () => {
-      expect(() =>
-        users(
-          null,
-          { id: '3311cfe8-9764-434d-b80e-1b1ee72c686d' },
-          {
-            userInfo: { admin: true },
-          },
-        ),
-      ).not.toThrowError()
+      ).rejects.toEqual(new Error('You must be a site admin to retrieve users'))
     })
   })
 })

package/src/graphql/resolvers/user.js

@@ -13,7 +13,9 @@ export const users = (obj, args, { userInfo }) => {
   if (userInfo.admin) {
     return User.find().exec()
   } else {
-    throw new Error('You must be a site admin to retrieve users')
+    return Promise.reject(
+      new Error('You must be a site admin to retrieve users'),
+    )
   }
 }
 
@@ -21,7 +23,7 @@ export const removeUser = (obj, { id }, { userInfo }) => {
   if (userInfo.admin) {
     return User.findByIdAndRemove(id).exec()
   } else {
-    throw new Error('You must be a site admin to remove users')
+    return Promise.reject(new Error('You must be a site admin to remove users'))
   }
 }
 
@@ -29,7 +31,9 @@ export const setAdmin = (obj, { id, admin }, { userInfo }) => {
   if (userInfo.admin) {
     return User.findOneAndUpdate({ id }, { admin }).exec()
   } else {
-    throw new Error('You must be a site admin to modify this value')
+    return Promise.reject(
+      new Error('You must be a site admin to modify this value'),
+    )
   }
 }
 
@@ -37,7 +41,7 @@ export const setBlocked = (obj, { id, blocked }, { userInfo }) => {
   if (userInfo.admin) {
     return User.findOneAndUpdate({ id }, { blocked }).exec()
   } else {
-    throw new Error('You must be a site admin to block a user')
+    return Promise.reject(new Error('You must be a site admin to block a user'))
   }
 }
 

package/src/__mocks__/mongodb.js

@@ -1,5 +0,0 @@
-import mongodb from 'mongo-mock'
-
-mongodb.max_delay = 0
-
-module.exports = mongodb