@openneuro/server 3.36.5 → 3.36.6-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "3.36.5",
+  "version": "3.36.6-alpha.3",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -61,6 +61,7 @@
     "react-dom": "^17.0.1",
     "redlock": "^4.0.0",
     "request": "^2.83.0",
+    "semver": "^5.5.0",
     "sitemap": "^2.1.0",
     "subscriptions-transport-ws": "0.9.18",
     "superagent": "^3.8.2",
@@ -81,6 +82,7 @@
     "@types/ioredis": "^4.17.1",
     "@types/jest": "^26.0.23",
     "@types/nodemailer": "^6.4.1",
+    "@types/semver": "^5",
     "apollo-link-schema": "^1.2.5",
     "babel-eslint": "^10.1.0",
     "core-js": "^3.10.1",
@@ -102,5 +104,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2e33b51d4a281f1bf4442c873b48b297eb2ad883"
+  "gitHead": "6a4df10b0ebd14c63ce0ec4df651153cb353146d"
 }

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

@@ -27,16 +27,20 @@ describe('dataset resolvers', () => {
     })
   })
   describe('snapshotCreationComparison()', () => {
-    it('sorts array of objects by the "created" property', () => {
+    it('sorts array of objects by the "created" and "tag" properties', () => {
       const testArray = [
-        { id: 2, created: new Date('2018-11-20T00:05:43.473Z') },
-        { id: 1, created: new Date('2018-11-19T00:05:43.473Z') },
-        { id: 3, created: new Date('2018-11-23T00:05:43.473Z') },
+        { id: 2, created: new Date('2018-11-20T00:05:43.473Z'), tag: '1.0.0' },
+        { id: 1, created: new Date('2018-11-19T00:05:43.473Z'), tag: '1.0.1' },
+        { id: 3, created: new Date('2018-11-23T00:05:43.473Z'), tag: '1.0.2' },
+        { id: 5, created: new Date('2018-11-23T00:05:43.473Z'), tag: '1.0.10' },
+        { id: 4, created: new Date('2018-11-23T00:05:43.473Z'), tag: '1.0.3' },
       ]
       const sorted = testArray.sort(ds.snapshotCreationComparison)
       expect(sorted[0].id).toBe(1)
       expect(sorted[1].id).toBe(2)
       expect(sorted[2].id).toBe(3)
+      expect(sorted[3].id).toBe(4)
+      expect(sorted[4].id).toBe(5)
     })
     it('sorts array of objects by the "created" property as strings', () => {
       const testArray = [
@@ -60,18 +64,16 @@ describe('dataset resolvers', () => {
       mockingoose.Dataset.toReturn(true, 'count')
       // capture and check datalad delete request
       request.del = url => ({
-          set: (header1, headerValue1) => ({
+        set: (header1, headerValue1) => ({
           set: () => ({
-              send: ({ filenames}) => {
-              expect(url).toEqual(
-                'http://datalad-0/datasets/ds999999/files',
-              )
+            send: ({ filenames }) => {
+              expect(url).toEqual('http://datalad-0/datasets/ds999999/files')
               expect(filenames).toEqual([':sub-99'])
               expect(header1).toEqual('Cookie')
               expect(headerValue1).toMatch(/^accessToken=/)
-            }
-            }),
+            },
           }),
+        }),
       })
 
       ds.deleteFiles(

package/src/graphql/resolvers/dataset-search.js

@@ -194,6 +194,7 @@ const parseQuery = async (query, datasetType, datasetStatus, userId) => {
  * @param {any} obj
  * @param {object} args
  * @param {object} args.query Stringified Query (DSL) argument for ElasticSearch
+ * @param {boolean} args.allDatasets Admin option for returning all datasets (overrides datasetType and datasetStatus, but keeps other search parameters) (default = false)
  * @param {string} args.datasetType Stringified Query (DSL) argument for ElasticSearch
  * @param {string} args.datasetStatus Stringified Query (DSL) argument for ElasticSearch
  * @param {object} args.sortBy Stringified Query (DSL) argument for ElasticSearch
@@ -202,7 +203,7 @@ const parseQuery = async (query, datasetType, datasetStatus, userId) => {
  */
 export const advancedDatasetSearchConnection = async (
   obj,
-  { query, datasetType, datasetStatus, sortBy, after, first = 25 },
+  { query, allDatasets = false, datasetType, datasetStatus, sortBy, after, first = 25 },
   { user, userInfo },
 ) => {
   const searchId = hashObject({
@@ -216,7 +217,9 @@ export const advancedDatasetSearchConnection = async (
   if (sortBy) sort.unshift(sortBy)
   const requestBody = {
     sort,
-    query: await parseQuery(query, datasetType, datasetStatus, user),
+    query: allDatasets
+      ? query
+      : await parseQuery(query, datasetType, datasetStatus, user),
   }
   if (after) {
     try {
@@ -246,6 +249,7 @@ export const advancedDatasetSearch = {
     resolve: advancedDatasetSearchConnection,
     args: {
       query: { type: 'JSON!' },
+      allDatasets: { type: 'Boolean' },
       datasetType: { type: 'String' },
       datasetStatus: { type: 'String' },
       sortBy: { type: 'JSON' },

package/src/graphql/resolvers/dataset.js

@@ -23,6 +23,7 @@ import { UpdatedFile } from '../utils/file.js'
 import { getDatasetWorker } from '../../libs/datalad-service.js'
 import { getDraftHead } from '../../datalad/dataset.js'
 import { getFileName } from '../../datalad/files.js'
+import semver from 'semver'
 
 export const dataset = async (obj, { id }, { user, userInfo }) => {
   await checkDatasetRead(id, user, userInfo)
@@ -41,8 +42,14 @@ export const datasets = (parent, args, { user, userInfo }) => {
   }
 }
 
-export const snapshotCreationComparison = ({ created: a }, { created: b }) => {
-  return new Date(a).getTime() - new Date(b).getTime()
+export const snapshotCreationComparison = (
+  { created: a, tag: a_tag },
+  { created: b, tag: b_tag },
+) => {
+  return (
+    new Date(a).getTime() - new Date(b).getTime() ||
+    semver.compare(a_tag, b_tag)
+  )
 }
 
 /**

package/src/graphql/resolvers/summary.js

@@ -10,9 +10,13 @@ export const summary = async dataset => {
       datasetId: dataset.id,
     }).exec()
   )?.toObject()
-  return {
-    ...datasetSummary,
-    primaryModality: datasetSummary?.modalities[0],
+  if (datasetSummary) {
+    return {
+      ...datasetSummary,
+      primaryModality: datasetSummary?.modalities[0],
+    }
+  } else {
+    return null
   }
 }
 

package/src/libs/authentication/google.js

@@ -1,14 +1,17 @@
 import passport from 'passport'
 
-export const requestAuth = passport.authenticate('google', {
-  scope: [
-    'https://www.googleapis.com/auth/userinfo.email',
-    'https://www.googleapis.com/auth/userinfo.profile',
-  ],
-  session: false,
-  accessType: 'offline',
-  prompt: 'consent',
-})
+export const requestAuth = (req, res, next) => (
+  passport.authenticate('google', {
+    scope: [
+      'https://www.googleapis.com/auth/userinfo.email',
+      'https://www.googleapis.com/auth/userinfo.profile',
+    ],
+    session: false,
+    accessType: 'offline',
+    prompt: 'consent',
+    state: req.query.redirectPath || null
+  })(req, res, next)
+)
 
 export const authCallback = passport.authenticate('google', {
   failureRedirect: '/',

package/src/libs/authentication/jwt.js

@@ -153,10 +153,13 @@ export const authenticate = (req, res, next) => {
 }
 
 export const authSuccessHandler = (req, res, next) => {
+  const redirectPath = req.query.state 
+    ? Buffer.from(req.query.state, 'base64').toString()
+    : '/'
   if (req.user) {
     // Set the JWT associated with this login on a cookie
     res.cookie('accessToken', req.user.token, { sameSite: 'Strict' })
-    res.redirect('/')
+    res.redirect(redirectPath)
   } else {
     res.status(401)
   }

package/src/libs/subscription-server.js

@@ -8,6 +8,7 @@ const subscriptionServerFactory = httpserver =>
       execute,
       subscribe,
       schema,
+      keepAlive: 30000,
     },
     {
       server: httpserver,