Merge branch 'fix/login-under-path' into orchestrator

OxfordHCC · Nov 23, 2022 · d6339b8 · d6339b8
2 parents d3cacbe + 068e368
commit d6339b8
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 23 deletions.
diff --git a/src/context/BaseUrlContex.js b/src/context/BaseUrlContex.js
@@ -0,0 +1,19 @@
+import { useContext, createContext, useState } from "react";
+
+const baseUrlContext = createContext();
+
+export function useBaseUrl() {
+  return useContext(baseUrlContext);
+}
+
+export function BaseUrlProvider({ children }) {
+  const [baseUrl, setBaseUrl] = useState(
+    "https://localhost:3000"
+  );
+
+  return (
+    <baseUrlContext.Provider value={[baseUrl, setBaseUrl]}>
+      {children}
+    </baseUrlContext.Provider>
+  );
+}
diff --git a/src/pages/_app.js b/src/pages/_app.js
@@ -8,27 +8,30 @@ import CssBaseline from "@mui/material/CssBaseline";
 import Box from "@mui/material/Box";
 import { UrlProvider } from "../context/UrlContext";
 import { SnackbarProvider } from "notistack";
+import { BaseUrlProvider } from "../context/BaseUrlContex";
 
 function MyApp({ Component, pageProps }) {
   return (
-    <UrlProvider>
-      <SessionProvider restorePreviousSession={true}>
-        <SnackbarProvider maxSnack={3} autoHideDuration={3000}>
-          <Head>
-            <title>Solid Calendar</title>
-          </Head>
-          <Box sx={{ display: "flex" }}>
-            <CssBaseline />
-            <Header title="KNoodle" />
-            <CustomDrawer />
-            <Box sx={{ flexGrow: 1, pt: 3, pl: 3 }}>
-              <Toolbar />
-              <Component {...pageProps} />
+    <BaseUrlProvider>
+      <UrlProvider>
+        <SessionProvider restorePreviousSession={true}>
+          <SnackbarProvider maxSnack={3} autoHideDuration={3000}>
+            <Head>
+              <title>Solid Calendar</title>
+            </Head>
+            <Box sx={{ display: "flex" }}>
+              <CssBaseline />
+              <Header title="KNoodle" />
+              <CustomDrawer />
+              <Box sx={{ flexGrow: 1, pt: 3, pl: 3 }}>
+                <Toolbar />
+                <Component {...pageProps} />
+              </Box>
             </Box>
-          </Box>
-        </SnackbarProvider>
-      </SessionProvider>
-    </UrlProvider>
+          </SnackbarProvider>
+        </SessionProvider>
+      </UrlProvider>
+    </BaseUrlProvider>
   );
 }
 

diff --git a/src/pages/index.js b/src/pages/index.js
@@ -3,10 +3,16 @@ import { useEffect, useState } from "react";
 import { useSession } from "@inrupt/solid-ui-react";
 import { getPersonName } from "../utils/participantsHelper";
 import { getRDFasJson } from "../utils/fetchHelper";
+import { useBaseUrl } from "../context/BaseUrlContex";
 
 export default function Home() {
   const { session, sessionRequestInProgress } = useSession();
   const [name, setName] = useState("");
+  const [baseUrl, setBaseUrl] = useBaseUrl();
+
+  useEffect(() => {
+    setBaseUrl(window.location.origin + window.location.pathname);
+  }, [setBaseUrl]);
 
   useEffect(() => {
     const webID = session.info.webId;

diff --git a/src/pages/login.js b/src/pages/login.js
@@ -15,6 +15,7 @@ import {
   handleIncomingRedirect,
   login,
 } from "@inrupt/solid-client-authn-browser";
+import { useBaseUrl } from "../context/BaseUrlContex";
 
 const providers = [
   { title: "Inrupt Pod Spaces", url: "https://broker.pod.inrupt.com/" },
@@ -26,7 +27,7 @@ const providers = [
 ];
 
 export default function Login() {
-  const [currentUrl, setCurrentUrl] = useState("https://localhost:3000");
+  const [baseUrl, setBaseUrl] = useBaseUrl();
   const [provider, setProvider] = useState("");
   const [inputWebId, setInputWebId] = useState("");
 
@@ -48,10 +49,6 @@ export default function Login() {
     return oidcIssuer;
   }
 
-  useEffect(() => {
-    setCurrentUrl(window.location.origin);
-  }, [setCurrentUrl]);
-
   return (
     <div>
       <Container maxWidth="sm">
@@ -109,7 +106,7 @@ export default function Login() {
           <LoginButton
             authOptions={{ clientName: "solid calendar" }}
             oidcIssuer={provider}
-            redirectUrl={currentUrl}
+            redirectUrl={baseUrl}
             onError={console.error}
           >
             <Button sx={{ mt: 1, mb: 2 }} variant="outlined">