fix(server): revert 55cad96 (#2633)

* Revert "refactor(server/upload): convert js to ts (#2618)"

This reverts commit e9f7286.

* Revert "feat(logging): pass request logger to core/services/objects (#2599)"

This reverts commit ee3e9af.

* Revert "feat(server): configurable maximum objects POST size and improved logging (#2594)"

This reverts commit 55cad96.

packages/fileimport-service/ifc/api.js

@@ -31,7 +31,7 @@ module.exports = class ServerAPI {
       obj.id = crypto.createHash('md5').update(JSON.stringify(obj)).digest('hex')
     }
 
-    await this.createObject({ streamId: this.streamId, object: obj })
+    await this.createObject(this.streamId, obj)
 
     return obj.id
   }
@@ -40,7 +40,7 @@ module.exports = class ServerAPI {
     return await this.createObjectsBatched(this.streamId, objs)
   }
 
-  async createObject({ streamId, object }) {
+  async createObject(streamId, object) {
     const insertionObject = this.prepInsertionObject(streamId, object)
 
     const closures = []

packages/server/modules/activitystream/tests/activity.spec.js

@@ -129,7 +129,7 @@ describe('Activity @activity', () => {
     streamSecret.id = resStream1.body.data.streamCreate
 
     // create commit (cr2)
-    testObj2.id = await createObject({ streamId: streamSecret.id, object: testObj2 })
+    testObj2.id = await createObject(streamSecret.id, testObj2)
     const resCommit1 = await sendRequest(userCr.token, {
       query: `mutation { commitCreate(commit: {streamId: "${streamSecret.id}", branchName: "main", objectId: "${testObj2.id}", message: "first commit"})}`
     })
@@ -152,7 +152,7 @@ describe('Activity @activity', () => {
     branchPublic.id = resBranch.body.data.branchCreate
 
     // create commit #2 (iz3)
-    testObj.id = await createObject({ streamId: streamPublic.id, object: testObj })
+    testObj.id = await createObject(streamPublic.id, testObj)
     const resCommit2 = await sendRequest(userIz.token, {
       query: `mutation { commitCreate(commit: { streamId: "${streamPublic.id}", branchName: "${branchPublic.name}", objectId: "${testObj.id}", message: "first commit" })}`
     })

packages/server/modules/comments/tests/comments.graph.spec.js

@@ -286,7 +286,7 @@ const queryComments = async ({ apollo, resources, shouldSucceed }) => {
     bar: crs({ length: 5 })
   }
 
-  const objectId = await createObject({ streamId: resources.streamId, object })
+  const objectId = await createObject(resources.streamId, object)
 
   const numberOfComments = 3
   const commentIds = await Promise.all(
@@ -361,12 +361,9 @@ const queryStreamCommentCount = async ({ apollo, resources, shouldSucceed }) =>
 }
 
 const queryObjectCommentCount = async ({ apollo, resources, shouldSucceed }) => {
-  const objectId = await createObject({
-    streamId: resources.streamId,
-    object: {
-      foo: 'bar',
-      noise: crs({ length: 5 })
-    }
+  const objectId = await createObject(resources.streamId, {
+    foo: 'bar',
+    noise: crs({ length: 5 })
   })
   await createComment({
     userId: resources.testActorId,
@@ -397,12 +394,9 @@ const queryObjectCommentCount = async ({ apollo, resources, shouldSucceed }) =>
 }
 
 const queryCommitCommentCount = async ({ apollo, resources, shouldSucceed }) => {
-  const objectId = await createObject({
-    streamId: resources.streamId,
-    object: {
-      foo: 'bar',
-      notSignal: crs({ length: 10 })
-    }
+  const objectId = await createObject(resources.streamId, {
+    foo: 'bar',
+    notSignal: crs({ length: 10 })
   })
   const commitId = await createCommitByBranchName({
     streamId: resources.streamId,
@@ -444,12 +438,9 @@ const queryCommitCollectionCommentCount = async ({
   resources,
   shouldSucceed
 }) => {
-  const objectId = await createObject({
-    streamId: resources.streamId,
-    object: {
-      foo: 'bar',
-      almostMakesSense: crs({ length: 10 })
-    }
+  const objectId = await createObject(resources.streamId, {
+    foo: 'bar',
+    almostMakesSense: crs({ length: 10 })
   })
   const commitId = await createCommitByBranchName({
     streamId: resources.streamId,
@@ -852,10 +843,7 @@ describe('Graphql @comments', () => {
             })
           }
 
-          const objectId = await createObject({
-            streamId: stream.id,
-            object: { test: 'object' }
-          })
+          const objectId = await createObject(stream.id, { test: 'object' })
 
           const { id: commentId } = await createComment({
             userId: myTestActor.id,

packages/server/modules/comments/tests/comments.spec.js

@@ -105,8 +105,8 @@ describe('Comments @comments', () => {
 
     stream.id = await createStream({ ...stream, ownerId: user.id })
 
-    testObject1.id = await createObject({ streamId: stream.id, object: testObject1 })
-    testObject2.id = await createObject({ streamId: stream.id, object: testObject2 })
+    testObject1.id = await createObject(stream.id, testObject1)
+    testObject2.id = await createObject(stream.id, testObject2)
 
     commitId1 = await createCommitByBranchName({
       streamId: stream.id,
@@ -163,7 +163,7 @@ describe('Comments @comments', () => {
     const streamA = { name: 'Stream A' }
     streamA.id = await createStream({ ...streamA, ownerId: user.id })
     const objA = { foo: 'bar' }
-    objA.id = await createObject({ streamId: streamA.id, object: objA })
+    objA.id = await createObject(streamA.id, objA)
     const commA = {}
     commA.id = await createCommitByBranchName({
       streamId: streamA.id,
@@ -177,7 +177,7 @@ describe('Comments @comments', () => {
     const streamB = { name: 'Stream B' }
     streamB.id = await createStream({ ...streamB, ownerId: otherUser.id })
     const objB = { qux: 'mux' }
-    objB.id = await createObject({ streamId: streamB.id, object: objB })
+    objB.id = await createObject(streamB.id, objB)
     const commB = {}
     commB.id = await createCommitByBranchName({
       streamId: streamB.id,
@@ -267,7 +267,7 @@ describe('Comments @comments', () => {
     const stream = { name: 'Bean Counter' }
     stream.id = await createStream({ ...stream, ownerId: user.id })
     const obj = { foo: 'bar' }
-    obj.id = await createObject({ streamId: stream.id, object: obj })
+    obj.id = await createObject(stream.id, obj)
     const commit = {}
     commit.id = await createCommitByBranchName({
       streamId: stream.id,
@@ -358,7 +358,7 @@ describe('Comments @comments', () => {
     const streamOther = { name: 'Bean Counter' }
     streamOther.id = await createStream({ ...streamOther, ownerId: user.id })
     const objOther = { 'are you bored': 'yes' }
-    objOther.id = await createObject({ streamId: streamOther.id, object: objOther })
+    objOther.id = await createObject(streamOther.id, objOther)
     const commitOther = {}
     commitOther.id = await createCommitByBranchName({
       streamId: streamOther.id,
@@ -560,10 +560,7 @@ describe('Comments @comments', () => {
   })
 
   it('Should not return the same comment multiple times for multi resource comments', async () => {
-    const localObjectId = await createObject({
-      streamId: stream.id,
-      object: { testObject: 1 }
-    })
+    const localObjectId = await createObject(stream.id, { testObject: 1 })
 
     const commentCount = 3
     for (let i = 0; i < commentCount; i++) {
@@ -603,11 +600,8 @@ describe('Comments @comments', () => {
   })
 
   it('Should handle cursor and limit for queries', async () => {
-    const localObjectId = await createObject({
-      streamId: stream.id,
-      object: {
-        testObject: 'something completely different'
-      }
+    const localObjectId = await createObject(stream.id, {
+      testObject: 'something completely different'
     })
 
     const createdComments = []
@@ -697,10 +691,7 @@ describe('Comments @comments', () => {
   })
 
   it('Should return all the referenced resources for a comment', async () => {
-    const localObjectId = await createObject({
-      streamId: stream.id,
-      object: { anotherTestObject: 1 }
-    })
+    const localObjectId = await createObject(stream.id, { anotherTestObject: 1 })
     const inputResources = [
       { resourceId: stream.id, resourceType: 'stream' },
       { resourceId: commitId1, resourceType: 'commit' },
@@ -731,10 +722,7 @@ describe('Comments @comments', () => {
   })
 
   it('Should return the same data when querying a single comment vs a list of comments', async () => {
-    const localObjectId = await createObject({
-      streamId: stream.id,
-      object: { anotherTestObject: 42 }
-    })
+    const localObjectId = await createObject(stream.id, { anotherTestObject: 42 })
     await createComment({
       userId: user.id,
       input: {
@@ -765,11 +753,8 @@ describe('Comments @comments', () => {
   })
 
   it('Should be able to edit a comment text', async () => {
-    const localObjectId = await createObject({
-      streamId: stream.id,
-      object: {
-        anotherTestObject: crs({ length: 10 })
-      }
+    const localObjectId = await createObject(stream.id, {
+      anotherTestObject: crs({ length: 10 })
     })
     const { id: commentId } = await createComment({
       userId: user.id,
@@ -804,11 +789,8 @@ describe('Comments @comments', () => {
   })
 
   it('Should not be allowed to edit a comment of another user if its restricted', async () => {
-    const localObjectId = await createObject({
-      streamId: stream.id,
-      object: {
-        anotherTestObject: crs({ length: 10 })
-      }
+    const localObjectId = await createObject(stream.id, {
+      anotherTestObject: crs({ length: 10 })
     })
     const { id: commentId } = await createComment({
       userId: user.id,
@@ -926,11 +908,8 @@ describe('Comments @comments', () => {
   })
 
   it('Should not query archived comments unless asked', async () => {
-    const localObjectId = await createObject({
-      streamId: stream.id,
-      object: {
-        testObject: crs({ length: 10 })
-      }
+    const localObjectId = await createObject(stream.id, {
+      testObject: crs({ length: 10 })
     })
 
     const commentCount = 15

packages/server/modules/core/graph/resolvers/objects.ts

@@ -66,10 +66,10 @@ export = {
         context.resourceAccessRules
       )
 
-      const ids = await createObjects({
-        streamId: args.objectInput.streamId,
-        objects: args.objectInput.objects
-      })
+      const ids = await createObjects(
+        args.objectInput.streamId,
+        args.objectInput.objects
+      )
       return ids
     }
   }