chore: fix lint errors

inrupt · Sep 27, 2023 · 76edc8f · 76edc8f
1 parent 80d42d1
commit 76edc8f
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 31 deletions.
diff --git a/src/gConsent/constants.ts b/src/gConsent/constants.ts
@@ -76,7 +76,10 @@ export const ACCESS_GRANT_CONTEXT_DEFAULT = [
   instanciateContextVcEssTemplate("vc.inrupt.com"),
 ] as const;
 
-export const MOCK_CONTEXT = [...ACCESS_GRANT_CONTEXT_DEFAULT, ...extraContext];
+export const MOCK_CONTEXT = [
+  ...ACCESS_GRANT_CONTEXT_DEFAULT,
+  ...extraContext,
+] as const;
 
 // When issuing a VC using a given service,"https://schema.inrupt.com/credentials/v1.jsonld" be sure to set the context using the following.
 export const instanciateEssAccessGrantContext = (

diff --git a/src/gConsent/request/cancelAccessRequest.test.ts b/src/gConsent/request/cancelAccessRequest.test.ts
@@ -20,7 +20,6 @@
 //
 
 import { jest, describe, it, expect } from "@jest/globals";
-import type { revokeVerifiableCredential } from "@inrupt/solid-client-vc";
 import { Response } from "@inrupt/universal-fetch";
 import type * as VcLibrary from "@inrupt/solid-client-vc";
 import { cancelAccessRequest } from "./cancelAccessRequest";
@@ -50,7 +49,7 @@ jest.mock("@inrupt/solid-client-vc", () => {
 describe("cancelAccessRequest", () => {
   it("uses the provided fetch if any", async () => {
     const mockedVcModule = jest.requireMock("@inrupt/solid-client-vc") as {
-      revokeVerifiableCredential: typeof revokeVerifiableCredential;
+      revokeVerifiableCredential: typeof VcLibrary.revokeVerifiableCredential;
     };
     const spiedRevoke = jest.spyOn(
       mockedVcModule,
@@ -75,7 +74,7 @@ describe("cancelAccessRequest", () => {
 
   it("looks up the VC if provided as an IRI", async () => {
     const mockedVcModule = jest.requireMock("@inrupt/solid-client-vc") as {
-      revokeVerifiableCredential: typeof revokeVerifiableCredential;
+      revokeVerifiableCredential: typeof VcLibrary.revokeVerifiableCredential;
     };
     const spiedRevoke = jest.spyOn(
       mockedVcModule,
@@ -111,7 +110,7 @@ describe("cancelAccessRequest", () => {
 
   it("gets the VC identifier if provided as a full credential", async () => {
     const mockedVcModule = jest.requireMock("@inrupt/solid-client-vc") as {
-      revokeVerifiableCredential: typeof revokeVerifiableCredential;
+      revokeVerifiableCredential: typeof VcLibrary.revokeVerifiableCredential;
     };
     const spiedRevoke = jest.spyOn(
       mockedVcModule,

diff --git a/src/gConsent/request/issueAccessRequest.test.ts b/src/gConsent/request/issueAccessRequest.test.ts
@@ -20,11 +20,6 @@
 //
 
 import { jest, describe, it, expect, beforeAll } from "@jest/globals";
-import type {
-  issueVerifiableCredential,
-  JsonLd,
-  VerifiableCredential,
-} from "@inrupt/solid-client-vc";
 import type * as CrossFetch from "@inrupt/universal-fetch";
 import type * as VcLibrary from "@inrupt/solid-client-vc";
 
@@ -163,7 +158,7 @@ describe("issueAccessRequest", () => {
     mockAccessApiEndpoint();
     const mockedIssue = jest.spyOn(
       jest.requireMock("@inrupt/solid-client-vc") as {
-        issueVerifiableCredential: typeof issueVerifiableCredential;
+        issueVerifiableCredential: typeof VcLibrary.issueVerifiableCredential;
       },
       "issueVerifiableCredential",
     );
@@ -202,7 +197,7 @@ describe("issueAccessRequest", () => {
     mockAccessApiEndpoint();
     const mockedIssue = jest.spyOn(
       jest.requireMock("@inrupt/solid-client-vc") as {
-        issueVerifiableCredential: typeof issueVerifiableCredential;
+        issueVerifiableCredential: typeof VcLibrary.issueVerifiableCredential;
       },
       "issueVerifiableCredential",
     );
@@ -229,7 +224,7 @@ describe("issueAccessRequest", () => {
     mockAccessApiEndpoint();
     const mockedIssue = jest.spyOn(
       jest.requireMock("@inrupt/solid-client-vc") as {
-        issueVerifiableCredential: typeof issueVerifiableCredential;
+        issueVerifiableCredential: typeof VcLibrary.issueVerifiableCredential;
       },
       "issueVerifiableCredential",
     );
@@ -254,7 +249,7 @@ describe("issueAccessRequest", () => {
     mockAccessApiEndpoint();
     const mockedIssue = jest.spyOn(
       jest.requireMock("@inrupt/solid-client-vc") as {
-        issueVerifiableCredential: typeof issueVerifiableCredential;
+        issueVerifiableCredential: typeof VcLibrary.issueVerifiableCredential;
       },
       "issueVerifiableCredential",
     );
@@ -273,9 +268,10 @@ describe("issueAccessRequest", () => {
     );
 
     // Casting is required because TS picks up the deprecated signature.
-    const subjectClaims = mockedIssue.mock.calls[0][1] as unknown as JsonLd;
+    const subjectClaims = mockedIssue.mock
+      .calls[0][1] as unknown as VcLibrary.JsonLd;
     const credentialClaims = mockedIssue.mock.calls[0][2] as unknown as
-      | JsonLd
+      | VcLibrary.JsonLd
       | undefined;
 
     expect(subjectClaims).toStrictEqual(
@@ -300,7 +296,7 @@ describe("issueAccessRequest", () => {
     mockAccessApiEndpoint();
     const mockedIssue = jest.spyOn(
       jest.requireMock("@inrupt/solid-client-vc") as {
-        issueVerifiableCredential: typeof issueVerifiableCredential;
+        issueVerifiableCredential: typeof VcLibrary.issueVerifiableCredential;
       },
       "issueVerifiableCredential",
     );
@@ -345,7 +341,7 @@ describe("issueAccessRequest", () => {
     mockAccessApiEndpoint();
     const mockedIssue = jest.spyOn(
       jest.requireMock("@inrupt/solid-client-vc") as {
-        issueVerifiableCredential: typeof issueVerifiableCredential;
+        issueVerifiableCredential: typeof VcLibrary.issueVerifiableCredential;
       },
       "issueVerifiableCredential",
     );
@@ -381,7 +377,7 @@ describe("issueAccessRequest", () => {
     mockAccessApiEndpoint();
     const mockedIssue = jest.spyOn(
       jest.requireMock("@inrupt/solid-client-vc") as {
-        issueVerifiableCredential: typeof issueVerifiableCredential;
+        issueVerifiableCredential: typeof VcLibrary.issueVerifiableCredential;
       },
       "issueVerifiableCredential",
     );
@@ -411,7 +407,7 @@ describe("issueAccessRequest", () => {
     mockAccessApiEndpoint();
     const mockedIssue = jest.spyOn(
       jest.requireMock("@inrupt/solid-client-vc") as {
-        issueVerifiableCredential: typeof issueVerifiableCredential;
+        issueVerifiableCredential: typeof VcLibrary.issueVerifiableCredential;
       },
       "issueVerifiableCredential",
     );
@@ -441,7 +437,7 @@ describe("issueAccessRequest", () => {
     mockAccessApiEndpoint();
     const mockedIssue = jest.spyOn(
       jest.requireMock("@inrupt/solid-client-vc") as {
-        issueVerifiableCredential: typeof issueVerifiableCredential;
+        issueVerifiableCredential: typeof VcLibrary.issueVerifiableCredential;
       },
       "issueVerifiableCredential",
     );
@@ -490,7 +486,7 @@ describe("issueAccessRequest", () => {
     mockAccessApiEndpoint();
     const mockedIssue = jest.spyOn(
       jest.requireMock("@inrupt/solid-client-vc") as {
-        issueVerifiableCredential: typeof issueVerifiableCredential;
+        issueVerifiableCredential: typeof VcLibrary.issueVerifiableCredential;
       },
       "issueVerifiableCredential",
     );
@@ -519,7 +515,7 @@ describe("issueAccessRequest", () => {
     mockAccessApiEndpoint();
     const mockedIssue = jest.spyOn(
       jest.requireMock("@inrupt/solid-client-vc") as {
-        issueVerifiableCredential: typeof issueVerifiableCredential;
+        issueVerifiableCredential: typeof VcLibrary.issueVerifiableCredential;
       },
       "issueVerifiableCredential",
     );
@@ -545,7 +541,7 @@ describe("issueAccessRequest", () => {
     ).resolves.toStrictEqual(normalizedAccessRequest);
   });
 
-  const mockCredentialProof = (): VerifiableCredential["proof"] => {
+  const mockCredentialProof = (): VcLibrary.VerifiableCredential["proof"] => {
     return {
       created: "some date",
       proofPurpose: "some purpose",

diff --git a/src/gConsent/util/access.mock.ts b/src/gConsent/util/access.mock.ts
@@ -65,6 +65,8 @@ export const mockAccessRequestVcObject = (options?: RequestVcOptions) => {
     hasConsent.isConsentForDataSubject = options?.resourceOwner;
   }
 
+  // We want to be able to mutate the record so we cannot set as a const
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const asObject: Record<string, any> = {
     "@context": MOCK_CONTEXT,
     id: "https://some.credential",
@@ -113,7 +115,9 @@ export const mockAccessRequestVc = async (
   });
 
   let accessRequest: VerifiableCredential & DatasetCore;
-  let nonNormalizedResponse: any;
+  let nonNormalizedResponse:
+    | Awaited<ReturnType<typeof getVerifiableCredentialFromResponse>>
+    | undefined;
   try {
     nonNormalizedResponse = await getVerifiableCredentialFromResponse(
       asResponse,
@@ -215,11 +219,14 @@ export const mockAccessGrantVc = async (
   }
 
   if (framingOptions?.expandModeUri) {
-    // @ts-ignore
-    accessGrant.credentialSubject?.providedConsent?.mode = // @ts-ignore
-      accessGrant.credentialSubject?.providedConsent?.mode.map(
+    const providedConsent = accessGrant.credentialSubject?.providedConsent as
+      | { mode?: string[] | undefined }
+      | undefined;
+    if (providedConsent) {
+      providedConsent.mode = providedConsent.mode?.map(
         (mode: string) => `http://www.w3.org/ns/auth/acl#${mode}`,
       );
+    }
   }
 
   // FIXME type casting is bad

diff --git a/src/parsing/contexts/index.ts b/src/parsing/contexts/index.ts
@@ -18,17 +18,17 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-import { getVerifiableCredential } from "@inrupt/solid-client-vc";
+
 import vc from "./vc";
 import integrity from "./data-integrity";
 import ed25519 from "./ed25519-2020";
 import revocation from "./revocation-list";
-import status from "./status-list";
+import statusList from "./status-list";
 
 export const data = {
   "https://vc.inrupt.com/credentials/v1": vc,
   "https://w3id.org/security/data-integrity/v1": integrity,
   "https://w3id.org/vc-revocation-list-2020/v1": revocation,
-  "https://w3id.org/vc/status-list/2021/v1": status,
+  "https://w3id.org/vc/status-list/2021/v1": statusList,
   "https://w3id.org/security/suites/ed25519-2020/v1": ed25519,
 };