Merge branch 'main' into snyk-upgrade-98cddbc99c0d327a244aaef84e496939

inrupt · May 3, 2024 · f2a2d3a · f2a2d3a
2 parents 9377eb4 + 73effa2
commit f2a2d3a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/e2e-browser.yml b/.github/workflows/e2e-browser.yml
@@ -10,14 +10,14 @@ concurrency:
   cancel-in-progress: true
 jobs:
   e2e-browser:
-    runs-on: ubuntu-latest-m
+    runs-on: ubuntu-latest
     environment:
       name: ${{ matrix.environment-name }}
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: true
       matrix:
-        environment-name: ["ESS PodSpaces", "ESS Dev-2-1"]
+        environment-name: ["ESS PodSpaces"]
         experimental: [false]
         include:
           - environment-name: "ESS Dev-2-2"

diff --git a/e2e/accessRequest.playwright.ts b/e2e/accessRequest.playwright.ts
@@ -179,7 +179,7 @@ test("access request deny flow", async ({
 
   // deny confirmation modal
   await page.getByTestId("modal-primary-action").click();
-  await visible(page.getByText("Access Request Denied"), false, {
+  await visible(page.getByText("Access Request Denied"), true, {
     tags: ["wcag2a", "wcag21a", "wcag21aa"],
   });
 

diff --git a/scripts/updateClientId.ts b/scripts/updateClientId.ts
@@ -27,13 +27,14 @@ import { buildClientIdentifierDoc } from "../src/helpers/clientId/clientId";
 const CLIENT_ID_DOC_IRI =
   "https://storage.inrupt.com/87048fc7-b553-4c86-95de-633e1675f0bd/AMI/clientid.jsonld";
 
+const clientId = process.env.CLIENT_ID;
+const clientSecret = process.env.CLIENT_SECRET;
+
 // build client id doc
 const clientIdDoc = buildClientIdentifierDoc(
   "http://localhost:3000/",
-  CLIENT_ID_DOC_IRI
+  clientId as string
 );
-const clientId = process.env.CLIENT_ID;
-const clientSecret = process.env.CLIENT_SECRET;
 
 async function updateClientId() {
   // save it to pod

diff --git a/src/session/SessionProvider.tsx b/src/session/SessionProvider.tsx
@@ -94,7 +94,7 @@ export interface ISessionProvider {
  * @param session
  * @param callback The callback should mutate react state to trigger re-rendering.
  */
-const discoverAccessEnpoint = async (
+const discoverAccessEndpoint = async (
   session: Session,
   callback: (endpoint: string) => void
 ): Promise<void> => {
@@ -124,7 +124,7 @@ const discoverAccessEnpoint = async (
     endpoint = await getAccessApiEndpoint(podRoot);
   } catch (e: unknown) {
     throw new DiscoveryNotAvailable(
-      `Access enpoint discovery for Pod ${podRoot} failed: ${e}`
+      `Access endpoint discovery for Pod ${podRoot} failed: ${e}`
     );
   }
   callback(endpoint);
@@ -242,7 +242,7 @@ export default function SessionProvider({
 
   useEffect(() => {
     if (state === "authenticated") {
-      discoverAccessEnpoint(session, (endpoint: string) => {
+      discoverAccessEndpoint(session, (endpoint: string) => {
         setAccessEndpoint(endpoint);
       }).catch((e) => {
         if (e instanceof Error) {