Fix webId profile document's baseIRI during retrieval of trusted issuers

Also fix broken e2e tests.

Fixes #311

Author: mrkvon

src/algorithm/retrieveWebidTrustedOidcIssuers.ts

@@ -6,14 +6,16 @@ import { WebidIriError } from "../error/WebidIriError";
 import { WebidParsingError } from "../error/WebidParsingError";
 import type { RetrieveOidcIssuersFunction } from "../type";
 
-async function dereferenceWebid(webid: string): Promise<string> {
+async function dereferenceWebid(
+  webid: string,
+): Promise<{ rdf: string; baseIRI: string }> {
   try {
     const response = await fetch(webid, {
       headers: {
         accept: "text/turtle",
       },
     });
-    return await response.text();
+    return { rdf: await response.text(), baseIRI: response.url };
   } catch (e: unknown) {
     throw new WebidDereferencingError(webid);
   }
@@ -43,10 +45,8 @@ export async function retrieveWebidTrustedOidcIssuers(
     return getIssuers(webid);
   }
 
-  const store = parseRdf(
-    await dereferenceWebid(webid),
-    Object.assign(new URL(webid), { hash: "" }).href,
-  );
+  const { rdf, baseIRI } = await dereferenceWebid(webid);
+  const store = parseRdf(rdf, baseIRI);
 
   return store
     .getObjects(

test/e2e/retrieveWebidTrustedOidcIssuers.test.ts

@@ -7,7 +7,9 @@ describe("retrieveWebidTrustedOidcIssuers", () => {
     ).toEqual(["https://login.inrupt.com"]);
   });
 
-  it("returns expected issuer set via inrupt.net", async () => {
+  // inrupt.net has been discontinued: https://www.inrupt.com/blog/inrupt-net-service-migration
+  // eslint-disable-next-line jest/no-disabled-tests
+  it.skip("returns expected issuer set via inrupt.net", async () => {
     expect(
       await retrieveWebidTrustedOidcIssuers(
         "https://matthieubosquet.inrupt.net/profile/card#me",
@@ -20,7 +22,7 @@ describe("retrieveWebidTrustedOidcIssuers", () => {
       await retrieveWebidTrustedOidcIssuers(
         "https://matthieubi.solidcommunity.net/profile/card#me",
       ),
-    ).toEqual(["https://solidcommunity.net"]);
+    ).toEqual(["https://solidcommunity.net/"]);
   });
 
   it("returns expected issuer set via solidweb.org", async () => {

test/unit/algorithm/retrieveWebidTrustedOidcIssuers.test.ts

@@ -7,6 +7,7 @@ import { WebidParsingError } from "../../../src/error/WebidParsingError";
 jest.mock("node-fetch", () => jest.fn());
 
 const webid = "https://example.com/webid#";
+const webidDocument = "https://example.com/webid";
 
 describe("retrieveWebidTrustedOidcIssuers", () => {
   it("returns the trusted OIDC issuer of a WebID", async () => {
@@ -16,6 +17,7 @@ describe("retrieveWebidTrustedOidcIssuers", () => {
         text: () => {
           return `<${webid}> <http://www.w3.org/ns/solid/terms#oidcIssuer> <https://example.issuer.com/> .`;
         },
+        url: webidDocument,
       }),
     );
 
@@ -31,6 +33,7 @@ describe("retrieveWebidTrustedOidcIssuers", () => {
         text: () => {
           return `<${webid}> <http://www.w3.org/ns/solid/terms#oidcIssuer> <https://example.issuer.com/>, <https://example.other.issuer.com/> .`;
         },
+        url: webidDocument,
       }),
     );
 
@@ -40,13 +43,32 @@ describe("retrieveWebidTrustedOidcIssuers", () => {
     ]);
   });
 
+  it("returns the trusted OIDC issuers with relative paths and redirect webId", async () => {
+    const webidDocumentRedirect = "https://webid.example/profile/card";
+
+    (fetch as unknown as jest.Mock).mockImplementationOnce(() =>
+      Promise.resolve({
+        ok: true,
+        text: () => {
+          return `<${webid}> <http://www.w3.org/ns/solid/terms#oidcIssuer> <../> .`;
+        },
+        url: webidDocumentRedirect,
+      }),
+    );
+
+    expect(await retrieveWebidTrustedOidcIssuers(webid)).toStrictEqual([
+      "https://webid.example/",
+    ]);
+  });
+
   it("ignores issuers in a non-default graph", async () => {
     (fetch as unknown as jest.Mock).mockImplementationOnce(() =>
       Promise.resolve({
         ok: true,
         text: () => {
           return `<#g> { <${webid}> <http://www.w3.org/ns/solid/terms#oidcIssuer> <https://example.issuer.com/> . }`;
         },
+        url: webidDocument,
       }),
     );
 
@@ -83,6 +105,7 @@ describe("retrieveWebidTrustedOidcIssuers", () => {
         text: () => {
           return "very invalid turtle";
         },
+        url: webidDocument,
       }),
     );