Merge pull request #219 from LowerEarthOrbiters/dynamicUsers

Dynamically routed users via auth-0
LowerEarthOrbiters · Mar 28, 2024 · ec0c6e6 · ec0c6e6
2 parents 9fb8073 + 3a0deee
commit ec0c6e6
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 11 deletions.
diff --git a/src/leo-client-app/src/app/api/auth/[auth0]/user.ts b/src/leo-client-app/src/app/api/auth/[auth0]/user.ts
@@ -0,0 +1,11 @@
+import { getSession } from "@auth0/nextjs-auth0";
+
+export default async function user(req: any, res: any) {
+  const session = await getSession(req, res);
+
+  if (session) {
+    return res.json({ email: session.user.email });
+  } else {
+    return res.json({ email: null });
+  }
+}
diff --git a/src/leo-client-app/src/components/SatellitesOfInterest.tsx b/src/leo-client-app/src/components/SatellitesOfInterest.tsx
@@ -14,7 +14,6 @@ import {
   DialogTitle,
 } from "@mui/material";
 import Link from "next/link";
-import axios from "axios";
 import React, { useEffect, useState } from "react";
 import "../styles.css";
 import "./styles/satellitesOfInterest.css";
@@ -35,7 +34,10 @@ type SatelliteDetails = {
 };
 
 const SatellitesOfInterest = ({ userId }: Props) => {
-  const satellites = useGetUserSatellites(userId);
+  const satellites = useGetUserSatellites(
+    userId ? userId : "66059b2aa430445956d73120"
+  );
+
   const queryClient = useQueryClient();
 
   const [open, setOpen] = useState(false);
@@ -63,13 +65,14 @@ const SatellitesOfInterest = ({ userId }: Props) => {
   return (
     <div className="satellitesOfInterest">
       <Stack alignItems="flex-start" spacing={1}>
-        <UserName userName="leo" />
+        <UserName userName={userId} />
         <p className="headerBox"></p>
         <Stack
           className="satellitesOfInterestBox"
           alignItems="flex-start"
           direction="row"
-          spacing={5}>
+          spacing={5}
+        >
           {satellites.data?.satellitesOfInterest?.satellites.length &&
             satellites.data?.satellitesOfInterest?.satellites?.map(
               (satellite: any, index: number) => (
@@ -92,7 +95,8 @@ const SatellitesOfInterest = ({ userId }: Props) => {
                         alignItems: "center",
                         marginLeft: 2,
                         marginRight: 2,
-                      }}>
+                      }}
+                    >
                       <CardContent>
                         <p className="cardTitle">{satellite.name}</p>
                         <p className="cardSubtitle">{satellite.noradId}</p>
@@ -114,7 +118,8 @@ const SatellitesOfInterest = ({ userId }: Props) => {
                 "var(--material-theme-sys-dark-on-secondary-container)",
             },
           }}
-          onClick={handleClickOpen}>
+          onClick={handleClickOpen}
+        >
           Add Custom Satellite +
         </Button>
 

diff --git a/src/leo-client-app/src/components/UserName.tsx b/src/leo-client-app/src/components/UserName.tsx
@@ -19,7 +19,7 @@ const UserName = ({ userName }: Props) => {
         color: "var(--material-theme-white)",
       }}
     >
-      <span>{userName}&apos;s</span>
+      <span>{userName}&apos;s</span> <br />
       <span> saved satellites</span>
     </Box>
   );

diff --git a/src/leo-client-app/src/pages/satellites-of-interest/index.tsx b/src/leo-client-app/src/pages/satellites-of-interest/index.tsx
@@ -2,19 +2,43 @@
 import { withPageAuthRequired } from "@auth0/nextjs-auth0/client";
 import Navbar from "@/components/navbar/Navbar";
 import SatellitesOfInterest from "@/components/SatellitesOfInterest";
-import { Grid, Stack } from "@mui/material";
+import { Stack } from "@mui/material";
+import { useUser } from "@auth0/nextjs-auth0/client";
+import axios from "axios";
+import { useEffect, useState } from "react";
+import { BACKEND_URL } from "@/constants/api";
 
 function SatellitesOfInterestPage() {
+  const { user, error, isLoading } = useUser();
+  const [userId, setUserId] = useState("");
+
+  const fetchUser = async (email: string) => {
+    try {
+      const res = await axios.get(`${BACKEND_URL}/users/getUserByEmail`, {
+        params: { email: email },
+      });
+      setUserId(res.data.user._id);
+    } catch (error) {
+      console.error("Error fetching data:", error);
+    }
+  };
+
+  useEffect(() => {
+    if (user?.email) {
+      fetchUser(user.email);
+    }
+  }, []);
+
   return (
     <main>
       <Stack
         alignItems="center"
         justifyContent="center"
         spacing={1}
-        sx={{ width: "100%", backgroundColor: "var(--material-theme-black)"}}
+        sx={{ width: "100%", backgroundColor: "var(--material-theme-black)" }}
       >
         <Navbar />
-        <SatellitesOfInterest userId="65a5e14ee0d601e0e8c4a387" />
+        <SatellitesOfInterest userId={userId} />
       </Stack>
     </main>
   );

diff --git a/src/leo-server-app/.gitignore b/src/leo-server-app/.gitignore
@@ -4,3 +4,4 @@ dist/
 coverage/
 yarn.lock
 *.pem
+test_*
diff --git a/src/leo-server-app/src/socket.ts b/src/leo-server-app/src/socket.ts
@@ -15,7 +15,7 @@ dotenv.config({
 });
 
 const SocketServer = https.createServer({
-  cert: fs.readFileSync(process.env.CERT_PATH),
+  cert: fs.readFileSync(process.env.KEY_CERT),
   key: fs.readFileSync(process.env.KEY_PATH),
 });