CoEDL
diff --git a/‎api/package-lock.json
+111 b/‎api/package-lock.json
+111
diff --git a/‎api/package.json
+1 b/‎api/package.json
+1
diff --git a/‎api/src/common/index.js
+1 b/‎api/src/common/index.js
+1
diff --git a/‎api/src/common/middleware.js
+17 b/‎api/src/common/middleware.js
+17
diff --git a/‎api/src/lib/admin.js
+67-8 b/‎api/src/lib/admin.js
+67-8
@@ -39,6 +39,7 @@
         "@paradisec-platform/fastify-tus-s3-plugin": "^1.0.0",
         "cross-fetch": "^3.1.6",
         "date-fns": "^2.30.0",
+        "elastic-builder": "^2.19.0",
         "fastify": "^4.17.0",
         "fastify-socket.io": "^4.0.0",
         "foo-foo-mq": "^8.0.1",
 
@@ -5,6 +5,7 @@ export { getS3Handle, getStoreHandle } from "./getS3Handle.js";
 export {
     demandAuthenticatedUser,
     demandAdministrator,
+    isUserAuthenticated,
     requireCollectionAccess,
     requireItemAccess,
 } from "./middleware.js";
 
@@ -24,6 +24,23 @@ export async function demandAuthenticatedUser(req, res) {
     }
 }
 
+export async function isUserAuthenticated(req) {
+    if (!req.headers.authorization) return false;
+    try {
+        let user = await verifyToken({
+            token: req.headers.authorization.split("Bearer ")[1],
+            configuration: req.session.configuration,
+        });
+        user = await getUser({ userId: user.id });
+        if (!user) {
+            return false;
+        }
+        return user;
+    } catch (error) {
+        return false;
+    }
+}
+
 export async function demandAdministrator(req, res) {
     if (!req.session.user.administrator) {
         return res.forbidden();
 
@@ -4,6 +4,7 @@ import {
     getS3Handle,
     authorisedUsersFile,
     indexItem,
+    getLogger,
 } from "../common/index.js";
 import { lookupItemByIdentifier, linkItemToUser, getItems } from "../lib/item.js";
 import {
@@ -17,6 +18,7 @@ const { groupBy } = lodashPkg;
 import { ROCrate } from "ro-crate";
 import { getContext } from "../lib/crate-tools.js";
 import path from "path";
+const log = getLogger();
 
 export async function getAdminItems({ user, prefix, offset = 0 }) {
     if (!user.administrator) {
@@ -180,6 +182,11 @@ export async function publishObject({ user, type, identifier, configuration }) {
         console.log(error);
         throw new Error(`Error getting / handling RO Crate file`);
     }
+    // cleanup the crate file
+    crate.deleteEntity("http://purl.archive.org/language-data-commons/terms#OpenAccess");
+    crate.deleteEntity("http://purl.archive.org/language-data-commons/terms#AgreeToTerms");
+    crate.deleteEntity("http://purl.archive.org/language-data-commons/terms#AuthorizedAccess");
+    crate.deleteEntity("http://purl.archive.org/language-data-commons/terms#AccessControlList");
 
     // try indexing the content and fail early if the metadata is bad
     try {
@@ -200,7 +207,7 @@ export async function publishObject({ user, type, identifier, configuration }) {
         licence = {
             "@id": configuration.api.licence,
             "@type": ["File", "DataReuselicence"],
-            name: "Open (subject to agreeing to PDSC access conditions)",
+            name: "Open (subject to agreeing to Nyingarn access conditions)",
             access: {
                 "@id": "http://purl.archive.org/language-data-commons/terms#OpenAccess",
             },
@@ -216,17 +223,18 @@ export async function publishObject({ user, type, identifier, configuration }) {
         licence = {
             "@id": configuration.api.licence,
             "@type": ["File", "DataReuselicence"],
-            name: "Open (subject to agreeing to PDSC access conditions)",
+            name: "Open (subject to agreeing to Nyingarn access conditions)",
             access: {
                 "@id": "http://purl.archive.org/language-data-commons/terms#OpenAccess",
             },
             authorizationWorkflow: [
                 { "@id": "http://purl.archive.org/language-data-commons/terms#AgreeToTerms" },
             ],
         };
-        if (item.accessType === "restricted") {
-            licence.description = item.accessNarrative.text;
-            licence.reviewDate = item.accessNarrative?.reviewDate;
+        if (item.publicationMetadata.accessType === "restricted") {
+            licence.name = "Restricted";
+            licence.description = item.publicationMetadata.accessNarrative.text;
+            licence.reviewDate = item.publicationMetadata.accessNarrative?.reviewDate;
             licence.access = {
                 "@id": "http://purl.archive.org/language-data-commons/terms#AuthorizedAccess",
             };
@@ -243,6 +251,7 @@ export async function publishObject({ user, type, identifier, configuration }) {
     crate.rootDataset.identifier = identifier;
     crate = crate.toJSON();
     crate["@context"] = getContext();
+
     await store.put({ target: "ro-crate-metadata.json", json: crate });
     await store.put({
         target: configuration.api.licence,
@@ -334,9 +343,15 @@ export async function depositObjectIntoRepository({
     });
     await objectWorkspace.removeObject();
 
-    // index the item in data in the repository
-    let crate = await objectRepository.getJSON({ target: "ro-crate-metadata.json" });
-    await indexItem({ item: { identifier, type }, crate });
+    // register the repository item in the database
+    let item = await models.repoitem.findOrCreate({
+        where: { identifier, type },
+        default: { identifier, type },
+    });
+    item = item[0];
+
+    // setup the metadata in the db
+    await setRepositoryItemMetadata({ item, store: objectRepository });
 }
 
 export async function restoreObjectIntoWorkspace({ type, identifier, io = { emit: () => {} } }) {
@@ -389,3 +404,47 @@ export async function restoreObjectIntoWorkspace({ type, identifier, io = { emit
     });
     await objectWorkspace.copy({ batch: resources });
 }
+
+export async function setRepositoryItemMetadata({ item, store }) {
+    const { identifier, type } = item;
+
+    let crate;
+    try {
+        crate = await store.getJSON({ target: "ro-crate-metadata.json" });
+        crate = new ROCrate(crate, { array: true });
+    } catch (error) {
+        console.log(error);
+        throw new Error(`Error getting / handling RO Crate file`);
+    }
+
+    try {
+        let licence = crate.getEntity("LICENCE.md");
+        if (!licence) throw new Error(`no licence found - setting to closed`);
+        let openAccess = false;
+        let accessControlList = null;
+        let accessNarrative = null;
+        let reviewDate = null;
+        if (licence?.access?.[0]?.["@id"]?.match(/OpenAccess/)) {
+            openAccess = true;
+        } else {
+            accessNarrative = licence.description.join("\n");
+            reviewDate = licence?.reviewDate?.[0];
+            accessControlList = await store.getJSON({ target: authorisedUsersFile });
+        }
+
+        item.openAccess = openAccess;
+        item.accessNarrative = accessNarrative ?? null;
+        item.reviewDate = reviewDate ?? null;
+        item.accessControlList = accessControlList ?? null;
+        await item.save();
+
+        // index the item data in the repository
+        await indexItem({ item: { identifier, type }, crate: crate.toJSON() });
+    } catch (error) {
+        log.error(`There was an issue depositing '${type}:${identifier}: ${error.message}`);
+        item.openAccess = false;
+        item.accessNarrative = "Error depositing item. Automatically set to restricted.";
+        item.accessControlList = [];
+        await item.save();
+    }
+}