Merge commit '49f05eac5f6a8af2ae71d9ef650bab2e5c995b9d' into matteo/gql

# Conflicts:
#	readme.md

modules/core/graph/resolvers/streams.js

@@ -1,92 +1,92 @@
 'use strict'
-const { AuthorizationError, ApolloError } = require('apollo-server-express')
-const appRoot = require('app-root-path')
+const { AuthorizationError, ApolloError } = require( 'apollo-server-express' )
+const appRoot = require( 'app-root-path' )
 const {
-    createStream,
-    getStream,
-    updateStream,
-    deleteStream,
-    getUserStreams,
-    getUserStreamsCount,
-    getStreamUsers,
-    grantPermissionsStream,
-    revokePermissionsStream
-} = require('../../services/streams')
-const { validateServerRole, validateScopes, authorizeResolver } = require(`${appRoot}/modules/shared`)
+  createStream,
+  getStream,
+  updateStream,
+  deleteStream,
+  getUserStreams,
+  getUserStreamsCount,
+  getStreamUsers,
+  grantPermissionsStream,
+  revokePermissionsStream
+} = require( '../../services/streams' )
+const { validateServerRole, validateScopes, authorizeResolver } = require( `${appRoot}/modules/shared` )
 
 module.exports = {
-    Query: {
-        async stream(parent, args, context, info) {
-            await validateScopes(context.scopes, 'streams:read')
-            await authorizeResolver(context.userId, args.id, 'stream:reviewer')
+  Query: {
+    async stream( parent, args, context, info ) {
+      await validateScopes( context.scopes, 'streams:read' )
+      await authorizeResolver( context.userId, args.id, 'stream:reviewer' )
 
-            let stream = await getStream({ streamId: args.id })
-            return stream
-        }
-    },
-    Stream: {
-
-        async collaborators(parent, args, context, info) {
-            let users = await getStreamUsers({ streamId: parent.id })
-            return users
-        }
-
-    },
-    User: {
-
-        async streams(parent, args, context, info) {
-            // Return only the user's public streams if parent.id !== context.userId
-            let publicOnly = parent.id !== context.userId
-            let totalCount = await getUserStreamsCount({ userId: parent.id, publicOnly })
-
-            let { cursor, streams } = await getUserStreams({ userId: parent.id, limit: args.limit, cursor: args.cursor, publicOnly: publicOnly })
-            return { totalCount, cursor: cursor, items: streams }
-        }
-
-    },
-    Mutation: {
-        async streamCreate(parent, args, context, info) {
-            await validateServerRole(context, 'server:user')
-            await validateScopes(context.scopes, 'streams:write')
-
-            let id = await createStream({...args.stream, ownerId: context.userId })
-            return id
-        },
-
-        async streamUpdate(parent, args, context, info) {
-            await validateServerRole(context, 'server:user')
-            await validateScopes(context.scopes, 'streams:write')
-            await authorizeResolver(context.userId, args.stream.id, 'stream:owner')
-
-            await updateStream({ streamId: args.stream.id, name: args.stream.name, description: args.stream.description })
-            return true
-        },
-
-        async streamDelete(parent, args, context, info) {
-            await validateServerRole(context, 'server:user')
-            await validateScopes(context.scopes, 'streams:write')
-            await authorizeResolver(context.userId, args.id, 'stream:owner')
-
-            await deleteStream({ streamId: args.id })
-            return true
-        },
-
-        async streamGrantPermission(parent, args, context, info) {
-            await validateServerRole(context, 'server:user')
-            await validateScopes(context.scopes, 'streams:write')
-            await authorizeResolver(context.userId, args.streamId, 'stream:owner')
-
-            if (context.userId === args.userId) throw new Error('You cannot set roles for yourself.')
-
-            return await grantPermissionsStream({ streamId: args.streamId, userId: args.userId, role: args.role.toLowerCase() || 'read' })
-        },
-
-        async streamRevokePermission(parent, args, context, info) {
-            await validateServerRole(context, 'server:user')
-            await validateScopes(context.scopes, 'streams:write')
-            await authorizeResolver(context.userId, args.streamId, 'stream:owner')
-
-            return await revokePermissionsStream({...args })
-        }
+      let stream = await getStream( { streamId: args.id } )
+      return stream
     }
-}
+  },
+  Stream: {
+
+    async collaborators( parent, args, context, info ) {
+      let users = await getStreamUsers( { streamId: parent.id } )
+      return users
+    }
+
+  },
+  User: {
+
+    async streams( parent, args, context, info ) {
+      // Return only the user's public streams if parent.id !== context.userId
+      let publicOnly = parent.id !== context.userId
+      let totalCount = await getUserStreamsCount( { userId: parent.id, publicOnly } )
+
+      let { cursor, streams } = await getUserStreams( { userId: parent.id, limit: args.limit, cursor: args.cursor, publicOnly: publicOnly } )
+      return { totalCount, cursor: cursor, items: streams }
+    }
+
+  },
+  Mutation: {
+    async streamCreate( parent, args, context, info ) {
+      await validateServerRole( context, 'server:user' )
+      await validateScopes( context.scopes, 'streams:write' )
+
+      let id = await createStream( { ...args.stream, ownerId: context.userId } )
+      return id
+    },
+
+    async streamUpdate( parent, args, context, info ) {
+      await validateServerRole( context, 'server:user' )
+      await validateScopes( context.scopes, 'streams:write' )
+      await authorizeResolver( context.userId, args.stream.id, 'stream:owner' )
+
+      await updateStream( { streamId: args.stream.id, name: args.stream.name, description: args.stream.description } )
+      return true
+    },
+
+    async streamDelete( parent, args, context, info ) {
+      await validateServerRole( context, 'server:user' )
+      await validateScopes( context.scopes, 'streams:write' )
+      await authorizeResolver( context.userId, args.id, 'stream:owner' )
+
+      await deleteStream( { streamId: args.id } )
+      return true
+    },
+
+    async streamGrantPermission( parent, args, context, info ) {
+      await validateServerRole( context, 'server:user' )
+      await validateScopes( context.scopes, 'streams:write' )
+      await authorizeResolver( context.userId, args.streamId, 'stream:owner' )
+
+      if ( context.userId === args.userId ) throw new Error( 'You cannot set roles for yourself.' )
+
+      return await grantPermissionsStream( { streamId: args.streamId, userId: args.userId, role: args.role.toLowerCase( ) || 'read' } )
+    },
+
+    async streamRevokePermission( parent, args, context, info ) {
+      await validateServerRole( context, 'server:user' )
+      await validateScopes( context.scopes, 'streams:write' )
+      await authorizeResolver( context.userId, args.streamId, 'stream:owner' )
+
+      return await revokePermissionsStream( { ...args } )
+    }
+  }
+}

modules/core/rest/upload.js

@@ -49,10 +49,10 @@ module.exports = ( app ) => {
 
     busboy.on( 'finish', ( ) => {
       debug( 'speckle:upload-endpoint' )( 'Done parsing ' + totalProcessed + ' objs ' + process.memoryUsage( ).heapUsed / 1024 / 1024 + ' mb mem' )
-      res.writeHead( 303, { Connection: 'close', Location: '/' } )
-      res.end( )
+
+      res.status( 201 ).end( )
     } )
 
     req.pipe( busboy )
   } )
-}
+}

modules/core/tests/rest.spec.js

@@ -35,7 +35,7 @@ describe( `Upload/Download Routes`, ( ) => {
     expressApp = app
 
     userA.id = await createUser( userA )
-    userA.token = `Bearer ${(await createPersonalAccessToken( userA.id, 'test token user A', [ 'streams:read', 'streams:write', 'users:read', 'users:email', 'tokens:write', 'tokens:read', 'profile:read', 'profile:email' ] ))}`
+    userA.token = `Bearer ${( await createPersonalAccessToken( userA.id, 'test token user A', [ 'streams:read', 'streams:write', 'users:read', 'users:email', 'tokens:write', 'tokens:read', 'profile:read', 'profile:email' ] ) )}`
 
     testStream.id = await createStream( { ...testStream, ownerId: userA.id } )
   } )
@@ -89,11 +89,11 @@ describe( `Upload/Download Routes`, ( ) => {
       .attach( 'batch2', Buffer.from( JSON.stringify( objBatches[ 1 ] ), 'utf8' ) )
       .attach( 'batch3', Buffer.from( JSON.stringify( objBatches[ 2 ] ), 'utf8' ) )
 
-    expect( res ).to.have.status( 303 )
+    expect( res ).to.have.status( 201 )
   } )
 
   it( 'Should properly download an object, with all its children, into a application/json response', ( done ) => {
-    new Promise( resolve => setTimeout( resolve, 1000 ) ) // avoids race condition
+    new Promise( resolve => setTimeout( resolve, 1500 ) ) // avoids race condition
       .then( ( ) => {
         let res = request( expressApp )
           .get( `/objects/${testStream.id}/${parentId}` )
@@ -177,4 +177,4 @@ function createManyObjects( amount, noise ) {
 
 function getId( obj ) {
   obj.id = obj.id || crypto.createHash( 'md5' ).update( JSON.stringify( obj ) ).digest( 'hex' )
-}
+}

modules/core/tests/users.spec.js

@@ -92,7 +92,7 @@ describe( 'Actors & Tokens', ( ) => {
 
       let match = await validatePasssword( { email: actor.email, password: 'super-test-200' } )
       expect( match ).to.equal( true )
-      let match_wrong = await validatePasssword( { email: actor.email, password: 'super-test-2000' })
+      let match_wrong = await validatePasssword( { email: actor.email, password: 'super-test-2000' } )
       expect( match_wrong ).to.equal( false )
 
     } )

modules/index.js

@@ -24,7 +24,7 @@ exports.init = async ( app ) => {
   } )
 
   // Other modules preflight
-  moduleDirs.forEach(async dir => {
+  moduleDirs.forEach( async dir => {
     await require( dir ).init( app )
   } )