chore: upgrade to

package.json

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

src/common/getters.test.ts

@@ -44,6 +44,7 @@ import {
 } from "./getters";
 import type { AccessGrant, AccessRequest } from "../gConsent";
 import { TYPE, gc } from "./constants";
+
 const { quad, namedNode, literal, blankNode } = DataFactory;
 
 describe("getters", () => {
@@ -362,12 +363,12 @@ describe("getters", () => {
 
       store.addQuad(
         namedNode(getId(mockedGConsentGrant)),
-        namedNode('https://www.w3.org/2018/credentials#expirationDate'),
+        namedNode("https://www.w3.org/2018/credentials#expirationDate"),
         namedNode("http://example.org/this/is/a/date"),
       );
 
       expect(() => getExpirationDate(store as any)).toThrow(
-        "Expected expiration date to be a Literal. Found [http://example.org/this/is/a/date] of type [NamedNode]."
+        "Expected expiration date to be a Literal. Found [http://example.org/this/is/a/date] of type [NamedNode].",
       );
     });
 
@@ -376,7 +377,7 @@ describe("getters", () => {
 
       store.addQuad(
         namedNode(getId(mockedGConsentGrant)),
-        namedNode('https://www.w3.org/2018/credentials#expirationDate'),
+        namedNode("https://www.w3.org/2018/credentials#expirationDate"),
         literal("boo"),
       );
 

src/common/getters.ts

@@ -31,7 +31,7 @@ import {
   getCredentialSubject,
   getIssuer,
   getIssuanceDate,
-  getExpirationDate
+  getExpirationDate,
 } from "@inrupt/solid-client-vc";
 import type { AccessGrantGConsent } from "../gConsent/type/AccessGrant";
 import type { AccessRequestGConsent } from "../gConsent/type/AccessRequest";
@@ -116,7 +116,13 @@ function getSingleObject(
 
   return object;
 }
-export { getId, getIssuer, getIssuanceDate, getCredentialSubject, getExpirationDate };
+export {
+  getId,
+  getIssuer,
+  getIssuanceDate,
+  getCredentialSubject,
+  getExpirationDate,
+};
 
 /**
  * @internal

src/common/verify/isValidAccessGrant.test.ts

@@ -90,9 +90,13 @@ describe("isValidAccessGrant", () => {
     const { verifiableCredentialToDataset } = jest.requireActual<
       typeof VcLibrary
     >("@inrupt/solid-client-vc");
-    MOCK_ACCESS_GRANT = await verifiableCredentialToDataset(
-      MOCK_ACCESS_GRANT_BASE,
-    );
+    MOCK_ACCESS_GRANT =
+      await verifiableCredentialToDataset<VcLibrary.VerifiableCredentialBase>(
+        MOCK_ACCESS_GRANT_BASE,
+        {
+          includeVcProperties: true,
+        },
+      );
   });
 
   it("uses the provided fetch if any", async () => {

src/fetch/index.test.ts

@@ -21,7 +21,10 @@
 
 import { jest, describe, it, expect, beforeAll } from "@jest/globals";
 import { fetch as crossFetch, Response } from "@inrupt/universal-fetch";
-import type { VerifiableCredential } from "@inrupt/solid-client-vc";
+import type {
+  VerifiableCredential,
+  VerifiableCredentialBase,
+} from "@inrupt/solid-client-vc";
 import { verifiableCredentialToDataset } from "@inrupt/solid-client-vc";
 
 import base64url from "base64url";
@@ -138,9 +141,13 @@ describe("getUmaConfiguration", () => {
 describe("exchangeTicketForAccessToken", () => {
   let MOCK_VC: VerifiableCredential;
   beforeAll(async () => {
-    MOCK_VC = await verifiableCredentialToDataset(MOCK_VC_BASE, {
-      baseIRI: MOCK_VC_BASE.id,
-    });
+    MOCK_VC = await verifiableCredentialToDataset<VerifiableCredentialBase>(
+      MOCK_VC_BASE,
+      {
+        baseIRI: MOCK_VC_BASE.id,
+        includeVcProperties: true,
+      },
+    );
   });
 
   it("posts to the token endpoint and parses the resulting access token", async () => {
@@ -261,9 +268,13 @@ describe("boundFetch", () => {
 describe("fetchWithVc", () => {
   let MOCK_VC: VerifiableCredential;
   beforeAll(async () => {
-    MOCK_VC = await verifiableCredentialToDataset(MOCK_VC_BASE, {
-      baseIRI: MOCK_VC_BASE.id,
-    });
+    MOCK_VC = await verifiableCredentialToDataset<VerifiableCredentialBase>(
+      MOCK_VC_BASE,
+      {
+        baseIRI: MOCK_VC_BASE.id,
+        includeVcProperties: true,
+      },
+    );
   });
 
   // These tests may be fairly brittle due to the nature of the mocked calls.

src/gConsent/guard/isAccessGrant.ts

@@ -32,6 +32,7 @@ export const GC_CONSENT_STATUS_EXPLICITLY_GIVEN =
 export const GC_CONSENT_STATUS_REQUESTED =
   "https://w3id.org/GConsent#ConsentStatusRequested";
 
+// Implemented as isGConsentAccessGrant in src/common/getters
 export function isAccessGrant<T extends BaseAccessVcBody>(
   vc: T,
 ): vc is T & AccessGrantBody {