fix: Swapped object and target/origin in Notifications

Swapped the `object` and `target`/`origin` properties in case of `Add`/`Delete` notifications respectively.

Author: CxRes

lib/handlers/notify.js

@@ -75,14 +75,17 @@ function handler (req, res, next) {
         ) {
           const mediaType = negotiatedFields['content-type']
           const activity = getActivity(method, path)
-          const target = activity === 'Add'
+          const object = activity === 'Add'
             ? res.getHeader('location')
+            : String(fullUrl)
+          const target = activity === 'Add'
+            ? String(fullUrl)
             : undefined
           if (ALLOWED_RDF_MIME_TYPES.includes(mediaType?.[0])) {
             return `${headerTemplate(negotiatedFields)}\r\n${solidRDFTemplate({
               activity,
               eventID,
-              object: String(fullUrl),
+              object,
               target,
               date: eventDate,
               // We use eTag as a proxy for state for now
@@ -117,13 +120,14 @@ function handler (req, res, next) {
         ) {
           const mediaType = negotiatedFields['content-type']
           const activity = getParentActivity(method, statusCode)
-          const target = activity !== 'Update' ? String(fullUrl) : undefined
+          const object = activity === 'Update' ? String(parentUrl) : String(fullUrl)
+          const target = activity === 'Update' ? undefined : String(parentUrl)
           if (ALLOWED_RDF_MIME_TYPES.includes(mediaType?.[0])) {
             return `${headerTemplate(negotiatedFields)}\r\n${solidRDFTemplate({
               activity,
               eventID: parentID,
               date: eventDate,
-              object: String(parentUrl),
+              object,
               target,
               eTag: undefined,
               mediaType

test/integration/prep-test.js

@@ -97,8 +97,8 @@ describe('Per Resource Events Protocol', function () {
         expect(notification.published).to.match(dateTimeRegex)
         expect(isNaN((new Date(notification.published)).valueOf())).to.equal(false)
         expect(notification.type).to.equal('Add')
-        expect(notification.target).to.match(/sampleContainer\/example-prep\.ttl$/)
-        expect(notification.object).to.match(/sampleContainer\/$/)
+        expect(notification.target).to.match(/sampleContainer\/$/)
+        expect(notification.object).to.match(/sampleContainer\/example-prep\.ttl$/)
       })
 
       it('when contained resource is modified', async function () {
@@ -131,8 +131,8 @@ solid:inserts { <u> <v> <z>. }.`
           expect(notification.published).to.match(dateTimeRegex)
           expect(isNaN((new Date(notification.published)).valueOf())).to.equal(false)
           expect(notification.type).to.equal('Remove')
-          expect(notification.object).to.match(/sampleContainer\/$/)
-          expect(notification.origin).to.match(/sampleContainer\/.*example-prep.ttl$/)
+          expect(notification.origin).to.match(/sampleContainer\/$/)
+          expect(notification.object).to.match(/sampleContainer\/.*example-prep.ttl$/)
         })
 
       it('when a contained container is created', async function () {
@@ -148,8 +148,8 @@ solid:inserts { <u> <v> <z>. }.`
         expect(notification.published).to.match(dateTimeRegex)
         expect(isNaN((new Date(notification.published)).valueOf())).to.equal(false)
         expect(notification.type).to.equal('Add')
-        expect(notification.target).to.match(/sampleContainer\/example-prep\/$/)
-        expect(notification.object).to.match(/sampleContainer\/$/)
+        expect(notification.target).to.match(/sampleContainer\/$/)
+        expect(notification.object).to.match(/sampleContainer\/example-prep\/$/)
       })
 
       it('when a contained container is deleted', async function () {
@@ -162,8 +162,8 @@ solid:inserts { <u> <v> <z>. }.`
         expect(notification.published).to.match(dateTimeRegex)
         expect(isNaN((new Date(notification.published)).valueOf())).to.equal(false)
         expect(notification.type).to.equal('Remove')
-        expect(notification.origin).to.match(/sampleContainer\/example-prep\/$/)
-        expect(notification.object).to.match(/sampleContainer\/$/)
+        expect(notification.origin).to.match(/sampleContainer\/$/)
+        expect(notification.object).to.match(/sampleContainer\/example-prep\/$/)
       })
 
       it('when a container is created by POST',
@@ -182,8 +182,8 @@ solid:inserts { <u> <v> <z>. }.`
           expect(notification.published).to.match(dateTimeRegex)
           expect(isNaN((new Date(notification.published)).valueOf())).to.equal(false)
           expect(notification.type).to.equal('Add')
-          expect(notification.object).to.match(/sampleContainer\/$/)
-          expect(notification.target).to.match(/sampleContainer\/.*example-post\/$/)
+          expect(notification.target).to.match(/sampleContainer\/$/)
+          expect(notification.object).to.match(/sampleContainer\/.*example-post\/$/)
         })
 
       it('when resource is created by POST',
@@ -202,8 +202,8 @@ solid:inserts { <u> <v> <z>. }.`
           expect(notification.published).to.match(dateTimeRegex)
           expect(isNaN((new Date(notification.published)).valueOf())).to.equal(false)
           expect(notification.type).to.equal('Add')
-          expect(notification.object).to.match(/sampleContainer\/$/)
-          expect(notification.target).to.match(/sampleContainer\/.*example-prep.ttl$/)
+          expect(notification.target).to.match(/sampleContainer\/$/)
+          expect(notification.object).to.match(/sampleContainer\/.*example-prep.ttl$/)
           controller.abort()
         })
     })