chnaged findAclDocument parameter type

Author: timea-solid

src/acl/aclLogic.ts

@@ -11,10 +11,9 @@ export function createAclLogic(store): AclLogic {
 
     const ns = namespace
 
-    async function findAclDocUrl(url: string) {
-        const doc = store.sym(url);
-        await store.fetcher.load(doc);
-        const docNode = store.any(doc, ACL_LINK);
+    async function findAclDocUrl(url: NamedNode) {
+        await store.fetcher.load(url);
+        const docNode = store.any(url, ACL_LINK);
         if (!docNode) {
             throw new Error(`No ACL link discovered for ${url}`);
         }

src/inbox/inboxLogic.ts

@@ -1,4 +1,4 @@
-import { NamedNode } from "rdflib";
+import { NamedNode, sym } from "rdflib";
 import { InboxLogic } from "../types";
 import { getArchiveUrl } from "../util/utils";
 
@@ -9,7 +9,7 @@ export function createInboxLogic(store, profileLogic, utilityLogic, containerLog
       const podRoot: NamedNode = await profileLogic.getPodRoot(myWebId);
       const ourInbox = `${podRoot.value}p2p-inboxes/${encodeURIComponent(nick)}/`;
       await containerLogic.createContainer(ourInbox);
-      const aclDocUrl = await aclLogic.findAclDocUrl(ourInbox);
+      const aclDocUrl = await aclLogic.findAclDocUrl(sym(ourInbox));
       await utilityLogic.setSinglePeerAccess({
         ownerWebId: myWebId.value,
         peerWebId,

src/types.ts

@@ -72,7 +72,7 @@ export interface ProfileLogic {
 }
 
 export interface AclLogic {
-    findAclDocUrl: (url: string) => Promise<any>,
+    findAclDocUrl: (url: NamedNode) => Promise<any>,
     setACLUserPublic: (docURI: string, me: NamedNode,
         options: {
             defaultForNew?: boolean,

src/util/utilityLogic.ts

@@ -1,4 +1,4 @@
-import { NamedNode, st } from "rdflib";
+import { NamedNode, st, sym } from "rdflib";
 import { CrossOriginForbiddenError, FetchError, NotEditableError, SameOriginForbiddenError, UnauthorizedError, WebOperationError } from "../logic/CustomError";
 import * as debug from '../util/debug';
 import { differentOrigin } from "./utils";
@@ -8,7 +8,7 @@ export function createUtilityLogic(store, aclLogic, containerLogic) {
   async function recursiveDelete(url: string) {
       try {
         if (containerLogic.isContainer(url)) {
-          const aclDocUrl = await aclLogic.findAclDocUrl(url);
+          const aclDocUrl = await aclLogic.findAclDocUrl(sym(url));
           await store.fetcher._fetch(aclDocUrl, { method: "DELETE" });
           const containerMembers = await containerLogic.getContainerMembers(url);
           await Promise.all(
@@ -126,7 +126,7 @@ export function createUtilityLogic(store, aclLogic, containerLogic) {
         ''
       ].join('\n')
     }
-    const aclDocUrl = await aclLogic.findAclDocUrl(options.target);
+    const aclDocUrl = await aclLogic.findAclDocUrl(sym(options.target));
     return store.fetcher._fetch(aclDocUrl, {
       method: 'PUT',
       body: str,