WIP: allow skipping of normalization

package.json

@@ -135,7 +135,7 @@
   },
   "dependencies": {
     "@inrupt/solid-client": "^1.25.1",
-    "@inrupt/solid-client-vc": "^0.8.0-beta.2",
+    "@inrupt/solid-client-vc": "file:../solid-client-vc-js",
     "@inrupt/universal-fetch": "^1.0.1",
     "@types/rdfjs__dataset": "^1.0.5",
     "auth-header": "^1.0.0",

src/common/getters.ts

@@ -43,51 +43,51 @@ const { namedNode, defaultGraph, quad, literal } = DataFactory;
 /**
  * @internal
  */
-function getSingleObject(
+export function getSingleObject(
   vc: DatasetCore,
   subject: Term,
   predicate: Term,
   type: "NamedNode",
 ): NamedNode;
-function getSingleObject(
+export function getSingleObject(
   vc: DatasetCore,
   subject: Term,
   predicate: Term,
   type: "NamedNode",
   required: false,
 ): NamedNode | undefined;
-function getSingleObject(
+export function getSingleObject(
   vc: DatasetCore,
   subject: Term,
   predicate: Term,
   type: "Literal",
   required: false,
 ): Literal | undefined;
-function getSingleObject(
+export function getSingleObject(
   vc: DatasetCore,
   subject: Term,
   predicate: Term,
   type: "BlankNode",
 ): BlankNode;
-function getSingleObject(
+export function getSingleObject(
   vc: DatasetCore,
   subject: Term,
   predicate: Term,
   type: "Literal",
 ): Literal;
-function getSingleObject(
+export function getSingleObject(
   vc: DatasetCore,
   subject: Term,
   predicate: Term,
 ): NamedNode | BlankNode;
-function getSingleObject(
+export function getSingleObject(
   vc: DatasetCore,
   subject: Term,
   predicate: Term,
   type: undefined,
   required: false,
 ): NamedNode | BlankNode | undefined;
-function getSingleObject(
+export function getSingleObject(
   vc: DatasetCore,
   subject: Term,
   predicate: Term,

src/gConsent/guard/isAccessRequest.ts

@@ -19,9 +19,19 @@
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+import type { DatasetWithId } from "@inrupt/solid-client-vc";
+import { getCredentialSubject, getIssuanceDate } from "@inrupt/solid-client-vc";
+import type { BlankNode, NamedNode } from "@rdfjs/types";
+import { DataFactory } from "n3";
 import { ACCESS_REQUEST_STATUS } from "../constants";
 import type { AccessRequestBody } from "../type/AccessVerifiableCredential";
+import { isRdfjsBaseAccessGrantVerifiableCredential } from "./isBaseAccessGrantVerifiableCredential";
 import { isBaseAccessRequestVerifiableCredential } from "./isBaseAccessRequestVerifiableCredential";
+import { gc } from "../../common/constants";
+import { getResourceOwner, getSingleObject } from "../../common/getters";
+import { isRdfjsGConsentAttributes } from "./isGConsentAttributes";
+
+const { quad, defaultGraph, namedNode } = DataFactory;
 
 export function isAccessRequest(
   x: unknown,
@@ -33,3 +43,29 @@ export function isAccessRequest(
     typeof x.issuanceDate === "string"
   );
 }
+
+export function isRdfjsAccessRequest(dataset: DatasetWithId) {
+  let consent: NamedNode | BlankNode;
+  try {
+    // There must be an issuance date
+    getIssuanceDate(dataset);
+    consent = getSingleObject(
+      dataset,
+      getCredentialSubject(dataset),
+      gc.hasConsent,
+    );
+  } catch {
+    return false;
+  }
+
+  return (
+    isRdfjsGConsentAttributes(dataset, consent) &&
+    dataset.has(quad(consent, gc.hasStatus, gc.ConsentStatusRequested)) &&
+    dataset.match(consent, gc.isConsentForDataSubject, null, defaultGraph())
+      .size === 1
+  );
+
+  // return isRdfjsBaseAccessGrantVerifiableCredential(dataset)
+  //   && dataset.has(quad(consent, gc.hasStatus, gc.ConsentStatusRequested))
+  //   && dataset.match(consent, gc.isConsentForDataSubject, null, defaultGraph()).size === 1
+}

src/gConsent/manage/getAccessGrantAll.test.ts

@@ -31,6 +31,7 @@ import type {
 import { getAccessGrantAll } from "./getAccessGrantAll";
 import { getAccessApiEndpoint } from "../discover/getAccessApiEndpoint";
 import { mockAccessGrantVc } from "../util/access.mock";
+import { normalizeAccessGrant } from "./approveAccessRequest";
 
 const otherFetch = jest.fn(global.fetch);
 
@@ -187,6 +188,7 @@ describe("getAccessGrantAll", () => {
       expect.objectContaining(expectedVcShape),
       {
         fetch: otherFetch,
+        normalize: normalizeAccessGrant,
       },
     );
   });
@@ -221,6 +223,7 @@ describe("getAccessGrantAll", () => {
       expect.objectContaining(expectedVcShape),
       {
         fetch: otherFetch,
+        normalize: normalizeAccessGrant,
       },
     );
   });
@@ -255,6 +258,7 @@ describe("getAccessGrantAll", () => {
       expect.objectContaining(expectedVcShape),
       {
         fetch: otherFetch,
+        normalize: normalizeAccessGrant,
       },
     );
   });
@@ -289,6 +293,7 @@ describe("getAccessGrantAll", () => {
       expect.objectContaining(expectedVcShapeOpen),
       {
         fetch: otherFetch,
+        normalize: normalizeAccessGrant,
       },
     );
   });
@@ -326,6 +331,7 @@ describe("getAccessGrantAll", () => {
       expect.objectContaining(expectedVcShape),
       {
         fetch: otherFetch,
+        normalize: normalizeAccessGrant,
       },
     );
   });
@@ -363,6 +369,7 @@ describe("getAccessGrantAll", () => {
       expect.objectContaining(expectedVcShape),
       {
         fetch: otherFetch,
+        normalize: normalizeAccessGrant,
       },
     );
   });