Merge remote-tracking branch 'origin/main' into check-write-on-container-for-delete

Author: bourgeoa

lib/handlers/patch/n3-patch-parser.js

@@ -20,16 +20,26 @@ async function parsePatchDocument (targetURI, patchURI, patchText) {
 
   // Query the N3 document for insertions and deletions
   let firstResult
-  try {
+  try { // solid/protocol v0.9.0
     firstResult = await queryForFirstResult(patchGraph, `${PREFIXES}
     SELECT ?insert ?delete ?where WHERE {
-      ?patch solid:patches <${targetURI}>.
+      ?patch a solid:InsertDeletePatch.
       OPTIONAL { ?patch solid:inserts ?insert. }
       OPTIONAL { ?patch solid:deletes ?delete. }
       OPTIONAL { ?patch solid:where   ?where.  }
     }`)
   } catch (err) {
-    throw error(400, `No patch for ${targetURI} found.`, err)
+    try { // deprecated, kept for compatibility
+      firstResult = await queryForFirstResult(patchGraph, `${PREFIXES}
+      SELECT ?insert ?delete ?where WHERE {
+        ?patch solid:patches <${targetURI}>.
+        OPTIONAL { ?patch solid:inserts ?insert. }
+        OPTIONAL { ?patch solid:deletes ?delete. }
+        OPTIONAL { ?patch solid:where   ?where.  }
+      }`)
+    } catch (err) {
+      throw error(400, 'No n3-patch found.', err)
+    }
   }
 
   // Return the insertions and deletions as an rdflib patch document

lib/header.js

@@ -66,7 +66,8 @@ async function linksHandler (req, res, next) {
     return next(error(404, 'Trying to access metadata file as regular file'))
   }
   const fileMetadata = new metadata.Metadata()
-  if (filename.endsWith('/')) {
+  if (req.path.endsWith('/')) {
+    // do not add storage header in serverUri
     if (req.path === '/') fileMetadata.isStorage = true
     fileMetadata.isContainer = true
     fileMetadata.isBasicContainer = true

package-lock.json

@@ -93,7 +93,7 @@
     "nodemailer": "^6.7.0",
     "oidc-op-express": "^0.0.3",
     "owasp-password-strength-test": "^1.3.0",
-    "rdflib": "^2.2.10",
+    "rdflib": "^2.2.14",
     "recursive-readdir": "^2.2.2",
     "request": "^2.88.2",
     "rimraf": "^3.0.2",

package.json

@@ -167,8 +167,7 @@ describe('HTTP APIs', function () {
         .end(done)
     })
 
-    // This test is probably wrong: it is not a container if there is an index page
-    it.skip('should have set Link as resource on a implicit index page', function (done) {
+    it('should have set Link as Container/BasicContainer on an implicit index page', function (done) {
       server.options('/sampleContainer/')
         .expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#BasicContainer>; rel="type"/)
         .expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel="type"/)