Change index imports and test new endpoint case

Author: lennertdr

packages/uma/config/rules/test/test.ttl

@@ -9,11 +9,17 @@
 
 ex:usagePolicy1 a odrl:Agreement .
 ex:usagePolicy1 odrl:permission ex:permission1 .
+ex:usagePolicy1 odrl:permission ex:permission1b .
 ex:permission1 a odrl:Permission .
 ex:permission1 odrl:action odrl:modify .
 ex:permission1 odrl:target <http://localhost:3000/alice/other/resource.txt> .
 ex:permission1 odrl:assignee <https://woslabbi.pod.knows.idlab.ugent.be/profile/card#me> .
-ex:permission1 odrl:assigner <https://pod.woutslabbinck.com/profile/card#me> .
+ex:permission1 odrl:assigner <https://pod.a.com/profile/card#me> .
+ex:permission1b a odrl:Permission .
+ex:permission1b odrl:action odrl:modify .
+ex:permission1b odrl:target <http://localhost:3000/alice/other/resource.txt> .
+ex:permission1b odrl:assignee <https://woslabbi.pod.knows.idlab.ugent.be/profile/card#me> .
+ex:permission1b odrl:assigner <https://pod.b.com/profile/card#me> .
 
 ex:usagePolicy1a a odrl:Agreement .
 ex:usagePolicy1a odrl:permission ex:permission1a .

packages/uma/src/index.ts

@@ -74,3 +74,5 @@ export * from './util/ConvertUtil';
 export * from './util/HttpMessageSignatures';
 export * from './util/Result';
 export * from './util/ReType';
+export * from './util/routeSpecific/policies/GetPolicies';
+export * from './util/routeSpecific/policies/policyUtil';

packages/uma/src/routes/Policy.ts

@@ -1,7 +1,7 @@
 import { BadRequestHttpError, getLoggerFor, MethodNotAllowedHttpError } from "@solid/community-server";
 import { UCRulesStorage } from "@solidlab/ucp";
 import { HttpHandlerContext, HttpHandlerResponse, HttpHandler, HttpHandlerRequest } from "../util/http/models/HttpHandler";
-import { getPolicies as getPolicies } from "../util/routeSpecific/policies/";
+import { getPolicies as getPolicies } from "../util/routeSpecific/policies/GetPolicies";
 
 /**
  * Endpoint to handle policies, this implementation gives all policies that have the

packages/uma/src/util/routeSpecific/policies/GetPolicies.ts

@@ -1,6 +1,6 @@
 import { HttpHandlerRequest, HttpHandlerResponse } from "../../http/models/HttpHandler";
 import { Quad, Store, Writer } from "n3";
-import { odrlAssigner, relations, namedNode } from "./helpers";
+import { odrlAssigner, relations, namedNode } from "./policyUtil";
 import { MethodNotAllowedHttpError } from "@solid/community-server";
 
 /**

packages/uma/src/util/routeSpecific/policies/index.ts

@@ -4,24 +4,45 @@
  * The purpose of this file is to test the /policies endpoint.
  */
 
+import path from "path";
+import { DirectoryUCRulesStorage } from "../packages/ucp/src/storage/DirectoryUCRulesStorage"
+import { PolicyRequestHandler } from "../packages/uma/src/routes/Policy"
+
 const endpoint = 'http://localhost:4000/uma/policies'
 const client1 = 'https://pod.woutslabbinck.com/profile/card#me';
 const client2 = 'https://pod.example.com/profile/card#me';
 
+// Pathname for the test-policy directory, will probably be changed with the new test structure
+const policyStorePath = path.join(__dirname, '..', 'packages', 'uma', 'config', 'rules', 'test');
 
-async function main() {
-    console.log(`Primitive unit test to check policy access based on the client\n`);
+async function testGetAllPolicies() {
+    console.log("\n\nTest GET all policies endpoint",);
 
-    let response = await fetch(endpoint, { headers: { 'Authorization': client1 } })
+    let response = await fetch(endpoint, { headers: { 'Authorization': client1 } });
 
-    console.log("expecting all five policies and their relations: \n", await response.text())
+    console.log("expecting all five policies and their relations: \n", await response.text());
 
-    response = await fetch(endpoint, { headers: { 'Authorization': client2 } })
+    response = await fetch(endpoint, { headers: { 'Authorization': client2 } });
 
-    console.log("expecting zero policies: ", await response.text())
+    console.log("expecting zero policies: ", await response.text());
 
     response = await fetch(endpoint, {});
 
-    console.log(`expecting 4xx error code (no authorization header provided): ${response.status}`)
+    console.log(`expecting 4xx error code (no authorization header provided): ${response.status}`);
+
+    // Manual test for specific test cases
+    // This test uses the existing test.ttl policy directory as the store, could be any other store
+    const store = new DirectoryUCRulesStorage(policyStorePath);
+    const handler = new PolicyRequestHandler(store);
+
+    let res = await handler.handle({ request: { url: new URL("http://localhost:4000/uma/policies"), method: 'GET', headers: { 'authorization': "https://pod.a.com/profile/card#me" } } });
+    console.log("expecting only policy 1: ", res.body);
+}
+
+async function main() {
+    console.log(`Primitive unit test to check policy access based on the client\n`);
+
+    await testGetAllPolicies();
+
 }
 main()