@openneuro/server 4.9.2 → 4.10.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.9.2",
+  "version": "4.10.0-alpha.0",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@apollo/client": "3.4.17",
     "@elastic/elasticsearch": "7.15.0",
-    "@openneuro/search": "^4.9.2",
+    "@openneuro/search": "^4.10.0-alpha.0",
     "@passport-next/passport-google-oauth2": "^1.0.0",
     "@sentry/node": "^4.5.3",
     "apollo-server": "2.25.3",
@@ -105,5 +105,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "668a421325ed5aabc3f7fae873f80d76b23c4e62"
+  "gitHead": "c6bd334b8d48a3feca971e2c13b91af01c0b3f1b"
 }

package/src/app.js

@@ -62,8 +62,6 @@ export default test => {
         }
       }
     },
-    // Disable engine in test suite
-    engine: test || !process.env.ENGINE_API_KEY ? false : engineConfig,
     // Always allow introspection - our schema is public
     introspection: true,
     // Enable authenticated queries in playground

package/src/graphql/resolvers/snapshots.js

@@ -13,6 +13,7 @@ import DeprecatedSnapshot from '../../models/deprecatedSnapshot'
 import { redis } from '../../libs/redis'
 import CacheItem, { CacheType } from '../../cache/item'
 import { normalizeDOI } from '../../libs/doi/normalize'
+import { getDraftHead } from '../../datalad/dataset'
 
 export const snapshots = obj => {
   return datalad.getSnapshots(obj.id)
@@ -219,8 +220,12 @@ export const latestSnapshot = async (obj, _, context) => {
   if (snapshotTag) {
     return await snapshot(obj, { datasetId: obj.id, tag: snapshotTag }, context)
   } else {
-    // In the case where there are no real snapshots, return HEAD as a snapshot
-    return await snapshot(obj, { datasetId: obj.id, tag: 'HEAD' }, context)
+    // In the case where there are no real snapshots, return most recent commit as snapshot
+    return await snapshot(
+      obj,
+      { datasetId: obj.id, tag: await getDraftHead(obj.id) },
+      context,
+    )
   }
 }
 

package/src/handlers/config.js

@@ -4,62 +4,23 @@
 
 // These are public, take care with secrets
 const config = {
-  url: process.env.CRN_SERVER_URL,
-
-  /**
-   * CRN
-   */
-  crn: {
-    url: process.env.CRN_SERVER_URL + '/crn/',
-  },
-
-  /**
-   * Authentication
-   */
-  auth: {
-    google: {
-      clientID: process.env.GOOGLE_CLIENT_ID,
-    },
-    orcid: {
-      clientID: process.env.ORCID_CLIENT_ID,
-      redirectURI: process.env.ORCID_REDIRECT_URI,
-      URI: process.env.ORCID_URI,
-    },
-    globus: {
-      clientID: process.env.GLOBUS_CLIENT_ID,
-    },
-  },
-
-  elasticsearch: {
-    cloudID: process.env.ELASTICSEARCH_CLOUD_ID,
-  },
-
-  analytics: {
-    trackingIds: process.env.GOOGLE_TRACKING_IDS.split(',').map(id =>
-      id.trim(),
-    ),
-  },
-
-  sentry: {
-    environment: process.env.ENVIRONMENT,
-  },
-
-  support: {
-    url: process.env.FRESH_DESK_URL,
-  },
-
-  analysis: {
-    enabled: process.env.ANALYSIS_ENABLED,
-  },
-
-  github: process.env.DATALAD_GITHUB_ORG,
-
-  publicBucket: process.env.AWS_S3_PUBLIC_BUCKET,
-
-  theme: {},
+  CRN_SERVER_URL: process.env.CRN_SERVER_URL,
+  GRAPHQL_URI: process.env.GRAPHQL_URI,
+  GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
+  GLOBUS_CLIENT_ID: process.env.GLOBUS_CLIENT_ID,
+  ORCID_CLIENT_ID: process.env.ORCID_CLIENT_ID,
+  ORCID_URI: process.env.ORCID_URI,
+  ORCID_REDIRECT_URI: process.env.ORCID_REDIRECT_URI,
+  GOOGLE_TRACKING_IDS: process.env.GOOGLE_TRACKING_IDS,
+  ENVIRONMENT: process.env.ENVIRONMENT,
+  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
 export const clientConfig = (req, res) => {
-  res.send(config)
+  const configScript = `window.OpenNeuroConfig = ${JSON.stringify(config)}`
+  res.type('text/javascript').send(configScript)
 }

package/src/routes.js

@@ -39,7 +39,7 @@ const routes = [
   // React config --------------------------------
   {
     method: 'get',
-    url: '/config.json',
+    url: '/config.js',
     handler: clientConfig,
   },
   // users ---------------------------------------