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

package/Dockerfile

@@ -20,4 +20,4 @@ HEALTHCHECK --interval=10s --retries=10 CMD curl -f 'http://localhost:8111' || e
 ENV NODE_OPTIONS=--max_old_space_size=2048
 
 # start server
-CMD ["yarn", "node", "/srv/packages/openneuro-server/dist/server.js"]
+CMD ["node", "-r", "/srv/.pnp.cjs", "/srv/packages/openneuro-server/dist/server.js"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.3.0-alpha.0",
+  "version": "4.3.0-alpha.5",
   "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": "6ce7aecd560416297947a40014fe246df40a92f5"
 }

package/src/__mocks__/mongoose.js

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

package/src/app.js

@@ -5,7 +5,6 @@
  * Express app setup
  */
 import express from 'express'
-import * as Sentry from '@sentry/node'
 import passport from 'passport'
 import config from './config'
 import routes from './routes'
@@ -28,9 +27,6 @@ export default test => {
 
   setupPassportAuth()
 
-  // Sentry must be first to work
-  test || app.use(Sentry.Handlers.requestHandler())
-
   app.use(passport.initialize())
 
   app.use((req, res, next) => {
@@ -48,8 +44,6 @@ export default test => {
   app.use(config.apiPrefix, routes)
 
   // error handling --------------------------------------------------\
-  // Sentry reporting passes to the next step
-  test || app.use(Sentry.Handlers.errorHandler())
 
   // Apollo engine setup
   const engineConfig = {

package/src/datalad/snapshots.js

@@ -1,7 +1,6 @@
 /**
  * Get snapshots from datalad-service tags
  */
-import * as Sentry from '@sentry/node'
 import request from 'superagent'
 import { redis, redlock } from '../libs/redis'
 import CacheItem, { CacheType } from '../cache/item'
@@ -61,7 +60,6 @@ const createIfNotExistsDoi = async (
       if (snapshotDoi)
         descriptionFieldUpdates['DatasetDOI'] = `doi:${snapshotDoi}`
     } catch (err) {
-      Sentry.captureException(err)
       console.error(err)
       throw new Error('DOI minting failed.')
     }
@@ -177,7 +175,6 @@ export const createSnapshot = async (
     // this avoids inconsistent cache state after failures
     snapshotCache.drop()
     snapshotLock.unlock()
-    Sentry.captureException(err)
     return err
   }
 }

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/dataset.js

@@ -17,7 +17,6 @@ import * as dataladAnalytics from '../../datalad/analytics.js'
 import DatasetModel from '../../models/dataset'
 import Deletion from '../../models/deletion'
 import fetch from 'node-fetch'
-import * as Sentry from '@sentry/node'
 import { reviewers } from './reviewer'
 import { UpdatedFile } from '../utils/file.js'
 import { getDatasetWorker } from '../../libs/datalad-service.js'
@@ -165,7 +164,6 @@ export const deleteFiles = async (
 
     return true
   } catch (err) {
-    Sentry.captureException(err)
     return false
   }
 }
@@ -187,7 +185,6 @@ export const removeAnnexObject = async (
     )
     return true
   } catch (err) {
-    Sentry.captureException(err)
     return false
   }
 }
@@ -208,7 +205,6 @@ export const flagAnnexObject = async (
     )
     return true
   } catch (err) {
-    Sentry.captureException(err)
     return false
   }
 }

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/libs/orcid.js

@@ -1,7 +1,6 @@
 // Camel case rule is disabled since ORCID API uses snake case variables
 import request from 'request'
 import xmldoc from 'xmldoc'
-import * as Sentry from '@sentry/node'
 import config from '../config'
 
 export default {
@@ -21,7 +20,6 @@ export default {
         },
         (err, res) => {
           if (err) {
-            Sentry.captureException(err)
             reject({
               message:
                 'An unexpected ORCID login failure occurred, please try again later.',

package/src/server.js

@@ -4,7 +4,6 @@ apm.start({
   serviceName: 'openneuro-server',
 })
 
-import * as Sentry from '@sentry/node'
 import { createServer } from 'http'
 import mongoose from 'mongoose'
 import subscriptionServerFactory from './libs/subscription-server.js'
@@ -26,12 +25,6 @@ const redisConnectionSetup = async () => {
   }
 }
 
-Sentry.init({
-  dsn: 'https://ba0c58863b3e40a2a412132bfd2711ea@sentry.io/251076',
-  release: version,
-  environment: config.sentry.ENVIRONMENT,
-})
-
 mongoose.connect(config.mongo.url, {
   useNewUrlParser: true,
   dbName: config.mongo.dbName,

package/src/__mocks__/mongodb.js

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