Update ODRL-evaluator dependency to v0.5.0

This allows us to correctly define collections

Author: joachimvh

packages/uma/package.json

@@ -72,7 +72,7 @@
     "jose": "^5.2.2",
     "logform": "^2.6.0",
     "n3": "^1.17.2",
-    "odrl-evaluator": "^0.4.0",
+    "odrl-evaluator": "^0.5.0",
     "rdf-vocabulary": "^1.0.1",
     "uri-template-lite": "^23.4.0",
     "winston": "^3.11.0"

packages/uma/src/policies/authorizers/OdrlAuthorizer.ts

@@ -1,7 +1,7 @@
 import { BadRequestHttpError, DC, NotImplementedHttpError, RDF } from '@solid/community-server';
 import { basicPolicy, ODRL, UCPPolicy, UCRulesStorage } from '@solidlab/ucp';
 import { getLoggerFor } from 'global-logger-factory';
-import { DataFactory, Literal, NamedNode, Quad_Subject, Store } from 'n3';
+import { DataFactory, Literal, NamedNode, Quad_Subject, Store, Writer } from 'n3';
 import { EyeReasoner, ODRLEngineMultipleSteps, ODRLEvaluator } from 'odrl-evaluator'
 import { createVocabulary } from 'rdf-vocabulary';
 import { WEBID } from '../../credentials/Claims';

packages/uma/src/routes/ResourceRegistration.ts

@@ -352,12 +352,9 @@ export class ResourceRegistrationRequestHandler extends HttpHandler {
           entry.source.value} while there is no matching collection.`);
       }
 
-      // for (const collectionId of collectionIds) {
-      //   quads.push(DF.quad(part, ODRL.terms.partOf, collectionId));
-      // }
-      // TODO: the above code is correct, but the code below is currently needed because of a bug in the ODRL evaluator
-      //       https://github.com/SolidLabResearch/ODRL-Evaluator/issues/8
-      quads.push(DF.quad(part, ODRL.terms.partOf, entry.source));
+      for (const collectionId of collectionIds) {
+        quads.push(DF.quad(part, ODRL.terms.partOf, collectionId));
+      }
     }
     return quads;
   }
@@ -371,10 +368,11 @@ export class ResourceRegistrationRequestHandler extends HttpHandler {
   protected findCollectionIds(entry: CollectionMetadata, data: Store): Quad_Subject[] {
     const sourceMatches = data.getSubjects(ODRL.terms.source, entry.source, null);
     if (entry.reverse) {
-      const blanks = sourceMatches.flatMap((subject): Quad_Object[] =>
-        data.getObjects(subject, ODRL_P.terms.relation, null)) as Quad_Subject[];
-      return blanks.filter((subject): boolean =>
-        data.has(DF.quad(subject, OWL.terms.inverseOf, entry.relation)));
+      const blankQuads = sourceMatches.flatMap((subject): Quad[] =>
+        data.getQuads(subject, ODRL_P.terms.relation, null, null));
+      const matchedBlankQuads = blankQuads.filter((quad): boolean =>
+        data.has(DF.quad(quad.object as Quad_Subject, OWL.terms.inverseOf, entry.relation)));
+      return matchedBlankQuads.map((quad) => quad.subject);
     } else {
       return sourceMatches.filter((subject): boolean =>
         data.has(DF.quad(subject, ODRL_P.terms.relation, entry.relation)));

packages/uma/test/unit/routes/ResourceRegistration.test.ts

@@ -153,10 +153,8 @@ describe('ResourceRegistration', (): void => {
       expect(policies.addRule).toHaveBeenCalledTimes(1);
       const newStore = policies.addRule.mock.calls[0][0];
       expect(newStore).toBeRdfIsomorphic([
-        // TODO: because of issue in ODRL evaluator
-        // DF.quad(DF.namedNode('entry'), ODRL.terms.partOf, DF.namedNode('collection:1')),
-        // DF.quad(DF.namedNode('entry'), ODRL.terms.partOf, DF.namedNode('collection:2')),
-        DF.quad(DF.namedNode('entry'), ODRL.terms.partOf, DF.namedNode('name')),
+        DF.quad(DF.namedNode('entry'), ODRL.terms.partOf, DF.namedNode('collection:1')),
+        DF.quad(DF.namedNode('entry'), ODRL.terms.partOf, DF.namedNode('collection:2')),
       ]);
     });
   });
@@ -241,10 +239,8 @@ describe('ResourceRegistration', (): void => {
       expect(policies.addRule).toHaveBeenCalledTimes(1);
       const newStore = policies.addRule.mock.calls[0][0];
       expect(newStore).toBeRdfIsomorphic([
-        // TODO: because of issue in ODRL evaluator
-        // DF.quad(DF.namedNode('entry'), ODRL.terms.partOf, DF.namedNode('collection:1')),
-        // DF.quad(DF.namedNode('entry'), ODRL.terms.partOf, DF.namedNode('collection:2')),
-        DF.quad(DF.namedNode('entry'), ODRL.terms.partOf, DF.namedNode('name')),
+        DF.quad(DF.namedNode('entry'), ODRL.terms.partOf, DF.namedNode('collection:1')),
+        DF.quad(DF.namedNode('entry'), ODRL.terms.partOf, DF.namedNode('collection:2')),
       ]);
     });
   });