Merge pull request #54 from osoc24/34-permission-sidebar

Permission sidebar
osoc24 · Jul 24, 2024 · c8a6add · c8a6add
2 parents 33c00cf + 30bba57
commit c8a6add
Show file tree

Hide file tree

Showing 14 changed files with 2,119 additions and 2,206 deletions.
diff --git a/controller/src/index-file.ts b/controller/src/index-file.ts
@@ -6,7 +6,14 @@ import {
   saveFileInContainer,
 } from "@inrupt/solid-client";
 import { Session } from "@inrupt/solid-client-authn-browser";
-import { Index, IndexItem, Permission, url, UserTypeObject } from "./types";
+import {
+  Index,
+  IndexItem,
+  Permission,
+  Type,
+  url,
+  UserTypeObject,
+} from "./types";
 import {
   setAgentAccess,
   setPublicAccess,
@@ -102,7 +109,7 @@ export async function editPermissions(
   const itemIndex = index.items.findIndex(({ id }) => id === itemId);
 
   if (itemIndex === -1) {
-    throw new Error("Element not found");
+    throw new Error("Item is not found, is it present in the index file?");
   }
 
   const item = index.items[itemIndex];
@@ -130,6 +137,24 @@ export async function editPermissions(
   return index;
 }
 
+export function getItemId(index: Index, resource: url, user: string) {
+  if (user === "public") {
+    return index.items.find(
+      (indexItem) =>
+        indexItem.resources.includes(resource) &&
+        indexItem.userType === undefined
+    )?.id;
+  }
+
+  return index.items.find(
+    (indexItem) =>
+      indexItem.resources.includes(resource) &&
+      indexItem.userType &&
+      indexItem.userType.type === Type.WebID &&
+      indexItem.userType.url === user
+  )?.id;
+}
+
 async function updateACL(
   session: Session,
   resources: url[],

diff --git a/controller/src/pod.ts b/controller/src/pod.ts
@@ -46,11 +46,14 @@ async function listThings(
 ): Promise<FormattedThing[]> {
   const dataset = await getSolidDataset(url, { fetch: session.fetch });
   return Promise.all(
-    getThingAll(dataset).map(async (t) => ({
-      url: t.url,
-      properties: getPropertyAll(t),
-      accessModes: await getAccessModes(session, t.url),
-    }))
+    getThingAll(dataset)
+      // For some reason the appointments container is utterly borked permissions-wise
+      .filter((t) => !t.url.includes("appointments"))
+      .map(async (t) => ({
+        url: t.url,
+        properties: getPropertyAll(t),
+        accessModes: await getAccessModes(session, t.url),
+      }))
   );
 }
 
@@ -80,8 +83,8 @@ async function getAccessModes(
 function accessModesToPermissions(
   record: Record<url, AccessModes>
 ): Record<url, Permission[]> {
-  const result: { 
-    [agent: string]: Permission[]
+  const result: {
+    [agent: string]: Permission[];
   } = {};
   // List -> Set -> List is done to filter out possible duplicate Permission.Control's
   const mapToPermission = (accessModes: [string, boolean][]) => [
@@ -210,5 +213,6 @@ export async function getAppointments(
     };
   };
 
-  return fetchResources(session, `${url}/appointments/`, mapAppointment);
+  // As the appointments folder is borked, cooltoinments is used as a back-up.
+  return fetchResources(session, `${url}/cooltoinments/`, mapAppointment);
 }