@openneuro/server 4.29.5 → 4.29.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.29.5",
+  "version": "4.29.7",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -21,7 +21,7 @@
     "@elastic/elasticsearch": "8.13.1",
     "@graphql-tools/schema": "^10.0.0",
     "@keyv/redis": "^2.7.0",
-    "@openneuro/search": "^4.29.5",
+    "@openneuro/search": "^4.29.7",
     "@sentry/node": "^8.25.0",
     "@sentry/profiling-node": "^8.25.0",
     "base64url": "^3.0.0",
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9063c9a63cc0736730a4a8271dd83ff5077010fe"
+  "gitHead": "a11e8c6dfe702377946a26e9d86234593465cd04"
 }

package/src/cache/__tests__/item.spec.ts

@@ -0,0 +1,32 @@
+import CacheItem from "../item"
+import { CacheType } from "../types"
+
+const redisMock = vi.fn(() => ({
+  getBuffer: vi.fn(),
+  setex: vi.fn(),
+  set: vi.fn(),
+}))
+
+describe("CacheItem", () => {
+  it("should succeed when the cache miss sets doNotCache but throws an exception", async () => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const item = new CacheItem(redisMock() as any, CacheType.commitFiles, [
+      "ds000001",
+      "12345678",
+    ])
+    let fail = true
+    expect(
+      await item.get(async (doNotCache) => {
+        // On the first try
+        if (fail) {
+          fail = false
+          doNotCache(true)
+          throw new Error("expected failure")
+        } else {
+          doNotCache(false)
+          return true
+        }
+      }),
+    ).toBe(true)
+  })
+})

package/src/cache/item.ts

@@ -2,6 +2,7 @@ import type { Redis } from "ioredis"
 import * as zlib from "zlib"
 import { promisify } from "util"
 import type { CacheType } from "./types"
+import * as Sentry from "@sentry/node"
 export { CacheType } from "./types"
 
 const compress = promisify(zlib.gzip)
@@ -77,9 +78,10 @@ class CacheItem {
         }
         return data
       }
-    } catch {
+    } catch (err) {
+      Sentry.captureException(err)
       // Keep going as though we had a cache miss if there is a problem but don't cache it
-      return miss()
+      return miss((_doNotCache: boolean) => {})
     }
   }
   /**

package/src/graphql/resolvers/validation.ts

@@ -36,7 +36,6 @@ export const snapshotValidation = async (snapshot) => {
     datasetId,
   })
     .exec()
-    .then((data) => (data ? data.issues : null))
 }
 
 /**

package/src/libs/authentication/orcid.ts

@@ -1,6 +1,7 @@
 import passport from "passport"
 import User from "../../models/user"
 import { parsedJwtFromRequest } from "./jwt"
+import * as Sentry from "@sentry/node"
 
 export const requestAuth = passport.authenticate("orcid", {
   session: false,
@@ -9,6 +10,7 @@ export const requestAuth = passport.authenticate("orcid", {
 export const authCallback = (req, res, next) =>
   passport.authenticate("orcid", (err, user) => {
     if (err) {
+      Sentry.captureException(err)
       if (err.type) {
         return res.redirect(`/error/orcid/${err.type}`)
       } else {

package/src/libs/orcid.ts

@@ -2,6 +2,7 @@
 import request from "request"
 import xmldoc from "xmldoc"
 import config from "../config"
+import * as Sentry from "@sentry/node"
 
 export default {
   getProfile(token) {
@@ -20,6 +21,7 @@ export default {
         },
         (err, res) => {
           if (err) {
+            Sentry.captureException(err)
             reject({
               message:
                 "An unexpected ORCID login failure occurred, please try again later.",