WIP: testing against VC library doing parsing but no serialization

package.json

@@ -136,7 +136,7 @@
   },
   "dependencies": {
     "@inrupt/solid-client": "^1.25.1",
-    "@inrupt/solid-client-vc": "^0.8.0-alpha.0",
+    "@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.test.ts

@@ -143,7 +143,7 @@ describe("getAccessModes", () => {
       const gConsentGrant = await mockGConsentGrant();
       expect(
         gConsentGrant.credentialSubject.providedConsent.mode,
-      ).toStrictEqual(["Read"]);
+      ).toStrictEqual(["http://www.w3.org/ns/auth/acl#Read"]);
       expect(getAccessModes(gConsentGrant)).toStrictEqual({
         read: true,
         append: false,

src/common/verify/isValidAccessGrant.test.ts

@@ -19,12 +19,13 @@
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import { jest, describe, it, expect } from "@jest/globals";
+import { jest, describe, it, expect, beforeAll } from "@jest/globals";
 import { Response } from "@inrupt/universal-fetch";
 import type * as CrossFetch from "@inrupt/universal-fetch";
 import {
   isVerifiableCredential,
   getVerifiableCredentialApiConfiguration,
+  verifiableCredentialToDataset
 } from "@inrupt/solid-client-vc";
 
 import type * as VcLibrary from "@inrupt/solid-client-vc";
@@ -40,11 +41,11 @@ jest.mock("@inrupt/solid-client", () => {
 });
 
 jest.mock("@inrupt/solid-client-vc", () => {
-  const { getVerifiableCredentialFromResponse } = jest.requireActual(
+  const { verifiableCredentialToDataset } = jest.requireActual(
     "@inrupt/solid-client-vc",
   ) as jest.Mocked<typeof VcLibrary>;
   return {
-    getVerifiableCredentialFromResponse,
+    verifiableCredentialToDataset,
     isVerifiableCredential: jest.fn(),
     issueVerifiableCredential: jest.fn(),
     getVerifiableCredentialApiConfiguration: jest.fn(),
@@ -62,7 +63,7 @@ jest.mock("@inrupt/universal-fetch", () => {
 });
 
 describe("isValidAccessGrant", () => {
-  const MOCK_ACCESS_GRANT = {
+  const MOCK_ACCESS_GRANT_BASE = {
     "@context": [
       "https://www.w3.org/2018/credentials/v1",
       "https://vc.inrupt.com/credentials/v1",
@@ -93,6 +94,12 @@ describe("isValidAccessGrant", () => {
   const MOCK_ACCESS_ENDPOINT = "https://consent.example.com";
   const MOCK_VERIFY_RESPONSE = { checks: [], warning: [], errors: [] };
 
+  let MOCK_ACCESS_GRANT: VcLibrary.VerifiableCredential
+
+  beforeAll(async () => {
+    MOCK_ACCESS_GRANT = await verifiableCredentialToDataset(MOCK_ACCESS_GRANT_BASE)
+  });
+
   it("uses the provided fetch if any", async () => {
     jest.mocked(isVerifiableCredential).mockReturnValueOnce(true);
     const mockedFetch = jest

src/gConsent/manage/approveAccessRequest.test.ts

@@ -62,11 +62,11 @@ jest.mock("@inrupt/solid-client", () => {
 });
 
 jest.mock("@inrupt/solid-client-vc", () => {
-  const { getVerifiableCredentialFromResponse } = jest.requireActual(
+  const { verifiableCredentialToDataset } = jest.requireActual(
     "@inrupt/solid-client-vc",
   ) as jest.Mocked<typeof VcClient>;
   return {
-    getVerifiableCredentialFromResponse,
+    verifiableCredentialToDataset,
     issueVerifiableCredential: jest.fn(),
   };
 });
@@ -760,8 +760,6 @@ describe("approveAccessRequest", () => {
   });
 
   it("issues a proper access grant from a request VC using the deprecated signature", async () => {
-    // console.log('calling issue request with', accessRequestVc)
-
     mockAcpClient();
     mockAccessApiEndpoint();
     const mockedVcModule = jest.requireMock(

src/gConsent/manage/denyAccessRequest.test.ts

@@ -42,12 +42,12 @@ jest.mock("@inrupt/solid-client", () => {
 });
 
 jest.mock("@inrupt/solid-client-vc", () => {
-  const { getVerifiableCredentialFromResponse, isVerifiableCredential } =
+  const { verifiableCredentialToDataset, isVerifiableCredential } =
     jest.requireActual("@inrupt/solid-client-vc") as jest.Mocked<
       typeof VcLibrary
     >;
   return {
-    getVerifiableCredentialFromResponse,
+    verifiableCredentialToDataset,
     isVerifiableCredential,
     issueVerifiableCredential: jest.fn(),
   };

src/gConsent/manage/getAccessGrant.test.ts

@@ -37,14 +37,7 @@ import { getAccessGrant } from "./getAccessGrant";
  * problems
  */
 function withoutDataset(data: any) {
-  return {
-    ...data,
-    add: undefined,
-    match: undefined,
-    has: undefined,
-    [Symbol.iterator]: undefined,
-    delete: undefined,
-  };
+  return JSON.parse(JSON.stringify(data));
 }
 
 jest.mock("@inrupt/universal-fetch", () => {
@@ -140,16 +133,7 @@ describe("getAccessGrant", () => {
     const accessGrant = await getAccessGrant("https://some.vc.url", {
       fetch: mockedFetch,
     });
-    expect(withoutDataset(accessGrant)).toEqual({
-      ...withoutDataset(mockAccessGrant),
-      credentialSubject: {
-        ...withoutDataset(mockAccessGrant).credentialSubject,
-        providedConsent: {
-          ...withoutDataset(mockAccessGrant).credentialSubject.providedConsent,
-          hasStatus: "Consent:StatusDenied",
-        },
-      },
-    });
+    expect(withoutDataset(accessGrant)).toEqual(withoutDataset(mockedAccessGrant));
   });
 
   it("returns the access grant with the given IRI", async () => {

src/gConsent/manage/getAccessGrant.ts

@@ -61,7 +61,6 @@ export async function getAccessGrant(
     data = await getVerifiableCredentialFromResponse(
       response,
       accessGrantVcUrl.toString(),
-      { fetch: sessionFetch, baseIRI: accessGrantVcUrl.toString() },
     );
   } catch (e) {
     throw new Error(

src/gConsent/manage/getAccessGrantAll.test.ts

@@ -35,11 +35,11 @@ import { mockAccessGrantVc } from "../util/access.mock";
 const otherFetch = jest.fn(global.fetch);
 
 jest.mock("@inrupt/solid-client-vc", () => {
-  const { getVerifiableCredentialFromResponse } = jest.requireActual(
+  const { verifiableCredentialToDataset } = jest.requireActual(
     "@inrupt/solid-client-vc",
   ) as jest.Mocked<typeof VcLibrary>;
   return {
-    getVerifiableCredentialFromResponse,
+    verifiableCredentialToDataset,
     issueVerifiableCredential: jest.fn(),
     getVerifiableCredentialAllFromShape: jest.fn(() =>
       mockAccessGrantVc().then((res) => [res]),

src/gConsent/manage/revokeAccessGrant.test.ts

@@ -28,11 +28,11 @@ import { MOCKED_CREDENTIAL_ID } from "../request/request.mock";
 import { mockAccessGrantVc, mockAccessRequestVc } from "../util/access.mock";
 
 jest.mock("@inrupt/solid-client-vc", () => {
-  const { getVerifiableCredentialFromResponse } = jest.requireActual(
+  const { verifiableCredentialToDataset } = jest.requireActual(
     "@inrupt/solid-client-vc",
   ) as jest.Mocked<typeof VcLibrary>;
   return {
-    getVerifiableCredentialFromResponse,
+    verifiableCredentialToDataset,
     issueVerifiableCredential: jest.fn(),
     revokeVerifiableCredential: jest.fn(),
   };

src/gConsent/request/cancelAccessRequest.test.ts

@@ -36,11 +36,11 @@ jest.mock("@inrupt/solid-client", () => {
 });
 
 jest.mock("@inrupt/solid-client-vc", () => {
-  const { getVerifiableCredentialFromResponse } = jest.requireActual(
+  const { verifiableCredentialToDataset } = jest.requireActual(
     "@inrupt/solid-client-vc",
   ) as jest.Mocked<typeof VcLibrary>;
   return {
-    getVerifiableCredentialFromResponse,
+    verifiableCredentialToDataset,
     issueVerifiableCredential: jest.fn(),
     revokeVerifiableCredential: jest.fn(),
   };

src/gConsent/request/issueAccessRequest.test.ts

@@ -52,11 +52,11 @@ jest.mock("@inrupt/solid-client", () => {
   return solidClientModule;
 });
 jest.mock("@inrupt/solid-client-vc", () => {
-  const { getVerifiableCredentialFromResponse } = jest.requireActual(
+  const { verifiableCredentialToDataset } = jest.requireActual(
     "@inrupt/solid-client-vc",
   ) as jest.Mocked<typeof VcLibrary>;
   return {
-    getVerifiableCredentialFromResponse,
+    verifiableCredentialToDataset,
     issueVerifiableCredential: jest.fn(),
   };
 });