@openneuro/server 4.26.1 → 4.27.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.26.1",
+  "version": "4.27.0-alpha.0",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -21,16 +21,15 @@
     "@elastic/elasticsearch": "8.13.1",
     "@graphql-tools/schema": "^10.0.0",
     "@keyv/redis": "^2.7.0",
-    "@openneuro/search": "^4.26.1",
-    "@passport-next/passport-google-oauth2": "^1.0.0",
-    "@sentry/node": "^4.5.3",
+    "@openneuro/search": "^4.27.0-alpha.0",
+    "@sentry/node": "^8.25.0",
+    "@sentry/profiling-node": "^8.25.0",
     "base64url": "^3.0.0",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "date-fns": "^2.16.1",
     "draft-js": "^0.11.7",
     "draft-js-export-html": "^1.4.1",
-    "elastic-apm-node": "4.5.4",
     "express": "4.19.2",
     "graphql": "16.8.1",
     "graphql-bigint": "^1.0.0",
@@ -48,10 +47,10 @@
     "morgan": "^1.6.1",
     "node-mailjet": "^3.3.5",
     "object-hash": "2.1.1",
-    "passport": "^0.6.0",
-    "passport-google-oauth20": "^1.0.0",
-    "passport-jwt": "^4.0.0",
-    "passport-oauth2-refresh": "^2.0.0",
+    "passport": "0.7.0",
+    "passport-google-oauth20": "2.0.0",
+    "passport-jwt": "4.0.1",
+    "passport-oauth2-refresh": "2.2.0",
     "passport-orcid": "0.0.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -86,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "059df1d714c883d1f5966c0b3968b073bf0120e3"
+  "gitHead": "7577739ccee193d927d81806f0eeffc285a28800"
 }

package/src/handlers/config.ts

@@ -12,10 +12,10 @@ const config = {
   ORCID_API_ENDPOINT: process.env.ORCID_API_ENDPOINT,
   GOOGLE_TRACKING_IDS: process.env.GOOGLE_TRACKING_IDS,
   ENVIRONMENT: process.env.ENVIRONMENT,
+  SENTRY_DSN: process.env.SENTRY_DSN,
   SUPPORT_URL: process.env.FRESH_DESK_URL,
   DATALAD_GITHUB_ORG: process.env.DATALAD_GITHUB_ORG,
   AWS_S3_PUBLIC_BUCKET: process.env.AWS_S3_PUBLIC_BUCKET,
-  ELASTIC_APM_SERVER_URL: process.env.ELASTIC_APM_SERVER_URL,
 }
 
 // Provide some environment variables to the client

package/src/handlers/sitemap.ts

@@ -8,6 +8,8 @@ export const sitemapStaticUrls = () => [
   { url: "/public/datasets", priority: 1.0, changefreq: "daily" },
   { url: "/faq", priority: 0.6, changefreq: "monthly" },
   { url: "/pet", priority: 0.5, changefreq: "monthly" },
+  { url: "/terms", priority: 0.5, changefreq: "monthly" },
+  { url: "/cite", priority: 0.4, changefreq: "monthly" },
   { url: "/public/jobs", priority: 0.5, changefreq: "monthly" },
   { url: "/crn/graphql", priority: 0.3 },
 ]

package/src/libs/authentication/passport.ts

@@ -161,7 +161,7 @@ export const setupPassportAuth = () => {
           config.auth.orcid.apiURI.includes("sandbox"),
         clientID: config.auth.orcid.clientID,
         clientSecret: config.auth.orcid.clientSecret,
-        scope: "/read-limited",
+        scope: "/activities/update",
         callbackURL: `${config.url + config.apiPrefix}auth/orcid/callback`,
       },
       verifyORCIDUser,

package/src/sentry.ts

@@ -0,0 +1,17 @@
+import * as Sentry from "@sentry/node"
+import { nodeProfilingIntegration } from "@sentry/profiling-node"
+import config from "./config"
+import { version } from "./lerna.json"
+
+Sentry.init({
+  dsn: config.sentry.DSN,
+  environment: config.sentry.ENVIRONMENT,
+  integrations: [
+    nodeProfilingIntegration(),
+  ],
+  // Performance Monitoring
+  tracesSampleRate: 1.0, //  Capture 100% of the transactions
+  // Set sampling rate for profiling - this is relative to tracesSampleRate
+  profilesSampleRate: 1.0,
+  release: `openneuro-server@${version}`,
+})

package/src/server.ts

@@ -1,14 +1,5 @@
-import apm from "elastic-apm-node"
+import "./sentry"
 import config from "./config"
-/** Needs to run before the other imports in Node */
-if (config.elasticsearch.apmServerUrl) {
-  apm.start({
-    serverUrl: config.elasticsearch.apmServerUrl,
-    apiKey: config.elasticsearch.apmApiKey,
-    serviceName: "openneuro-server",
-    cloudProvider: "none",
-  })
-}
 import { createServer } from "http"
 import mongoose from "mongoose"
 import { connect as redisConnect } from "./libs/redis"