@openneuro/server 4.13.1-alpha.3 → 4.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.13.1-alpha.3",
+  "version": "4.14.0",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -15,19 +15,17 @@
   },
   "author": "Squishymedia",
   "dependencies": {
-    "@apollo/client": "3.4.17",
+    "@apollo/client": "3.7.2",
     "@elastic/elasticsearch": "7.15.0",
-    "@openneuro/search": "^4.13.1-alpha.3",
+    "@openneuro/search": "^4.14.0",
     "@passport-next/passport-google-oauth2": "^1.0.0",
     "@sentry/node": "^4.5.3",
     "apollo-server": "2.25.4",
     "apollo-server-cache-redis": "1.4.0",
     "apollo-server-express": "2.25.3",
-    "async": "^2.4.1",
     "base64url": "^3.0.0",
     "body-parser": "^1.18.2",
     "cookie-parser": "^1.4.3",
-    "crypto": "^1.0.1",
     "date-fns": "^2.16.1",
     "draft-js": "^0.11.7",
     "draft-js-export-html": "^1.4.1",
@@ -51,11 +49,10 @@
     "node-mailjet": "^3.3.5",
     "object-hash": "2.1.1",
     "passport": "^0.6.0",
-    "passport-globus": "^0.0.1",
     "passport-google-oauth20": "^1.0.0",
     "passport-jwt": "^4.0.0",
     "passport-oauth2-refresh": "^2.0.0",
-    "passport-orcid": "0.0.4",
+    "passport-orcid": "^0.0.3",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "redlock": "^4.0.0",
@@ -95,5 +92,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "51c893f25621433410459da03744439de518faa0"
+  "gitHead": "eb5ed9e8c09cd0c87a44b2cbdc95cd1e92282e10"
 }

package/src/graphql/schema.js

@@ -304,6 +304,7 @@ export const typeDefs = `
     id: ID!
     provider: UserProvider
     avatar: String
+    orcid: String
     created: DateTime!
     modified: DateTime
     lastSeen: DateTime
@@ -317,7 +318,6 @@ export const typeDefs = `
   enum UserProvider {
     google
     orcid
-    globus
   }
 
   # Connection for a list of datasets

package/src/libs/authentication/passport.js

@@ -3,7 +3,6 @@ import refresh from 'passport-oauth2-refresh'
 import { Strategy as JwtStrategy } from 'passport-jwt'
 import { Strategy as GoogleStrategy } from 'passport-google-oauth20'
 import { Strategy as ORCIDStrategy } from 'passport-orcid'
-import { Strategy as GlobusStrategy } from 'passport-globus'
 import config from '../../config.js'
 import User from '../../models/user'
 import { encrypt } from './crypto'
@@ -13,7 +12,6 @@ import orcid from '../orcid.js'
 const PROVIDERS = {
   GOOGLE: 'google',
   ORCID: 'orcid',
-  GLOBUS: 'globus',
 }
 
 const loadProfile = profile => {
@@ -34,13 +32,7 @@ const loadProfile = profile => {
       name: profile.info.name,
       provider: profile.provider,
       providerId: profile.orcid,
-    }
-  } else if (profile.provider === PROVIDERS.GLOBUS) {
-    return {
-      email: profile.email,
-      name: profile.name,
-      provider: profile.provider,
-      providerId: profile.sub,
+      orcid: profile.orcid,
     }
   } else {
     // Some unknown profile type
@@ -93,25 +85,6 @@ export const verifyORCIDUser = (
     .catch(err => done(err, null))
 }
 
-export const verifyGlobusUser = (
-  accessToken,
-  refreshToken,
-  profile,
-  params,
-  done,
-) => {
-  const decodedProfile = decodeJWT(profile.id_token)
-  decodedProfile.provider = PROVIDERS.GLOBUS
-  const profileUpdate = loadProfile(decodedProfile)
-  User.findOneAndUpdate(
-    { providerId: decodedProfile.sub, provider: decodedProfile.provider },
-    profileUpdate,
-    { upsert: true, new: true, setDefaultsOnInsert: true },
-  )
-    .then(user => done(null, addJWT(config)(user)))
-    .catch(err => done(err, null))
-}
-
 export const setupPassportAuth = () => {
   // Setup all strategies here
 
@@ -173,24 +146,10 @@ export const setupPassportAuth = () => {
           config.auth.orcid.apiURI.includes('sandbox'),
         clientID: config.auth.orcid.clientID,
         clientSecret: config.auth.orcid.clientSecret,
-        scope: '/read-limited',
         callbackURL: `${config.url + config.apiPrefix}auth/orcid/callback`,
       },
       verifyORCIDUser,
     )
     passport.use(PROVIDERS.ORCID, orcidStrategy)
   }
-
-  // finally globus
-  if (config.auth.globus.clientID && config.auth.globus.clientSecret) {
-    const globusStrategy = new GlobusStrategy(
-      {
-        clientID: config.auth.globus.clientID,
-        clientSecret: config.auth.globus.clientSecret,
-        callbackURL: `${config.url + config.apiPrefix}auth/globus/callback`,
-      },
-      verifyGlobusUser,
-    )
-    passport.use(PROVIDERS.GLOBUS, globusStrategy)
-  }
 }

package/src/models/user.ts

@@ -8,6 +8,7 @@ export interface UserDocument extends Document {
   name: string
   provider: StaticRangeInit
   providerId: string
+  orcid: string
   refresh: string
   admin: boolean
   blocked: boolean
@@ -21,6 +22,7 @@ const userSchema = new Schema({
   name: String,
   provider: String, // Login provider
   providerId: String, // Login provider unique id
+  orcid: String, // ORCID iD regardless of provider id
   refresh: String,
   admin: { type: Boolean, default: false },
   blocked: { type: Boolean, default: false },