Authentication is working, only when run on the vm though. Error in admin-router, setting headers too late.

Author: Conner Hnatiuk

server/src/index.ts

@@ -44,8 +44,8 @@ async function initializeSystem(): Promise<DatabaseController> {
 initializeSystem().then((dbController: DatabaseController) => {
   app.use("/", exampleRouter);
   //app.use("/getTable", tableRouter)
-  app.use("/dataRequest", cascadeRouter(dbController));
-  app.use("/adminRequest", adminRouter(dbController));
+  app.use("/api/dataRequest", cascadeRouter(dbController));
+  app.use("/api/adminRequest", adminRouter(dbController));
 
   app.listen(PORT, () => {
     console.log(`Server is running on ${PORT}`);

server/src/routes/admin-router.ts

@@ -55,22 +55,29 @@ export default function adminRouter(dbController: DatabaseController): Router {
   router.get("/auth/cas-validate", async (req: Request, res: Response) => {
     const { ticket, service } = req.query;
 
+	console.log("hit");
+	console.log(ticket);
+	console.log(service);
     if (!ticket || !service) {
       res.status(400).json({ error: "Missing ticket or service" });
     }
 
     try {
       // Validate CAS ticket
       const casResponse = await axios.get(
-        `https://cas.usask.ca/serviceValidate`,
+        `https://cas.usask.ca/cas/serviceValidate`,
         {
           params: { ticket, service },
         },
       );
 
+
+
       const casData = casResponse.data; // assumed user CAS info, need to test to see
       const nsid = casData.user; // Potentally the nsid of the user. Again need to test
 
+	console.log(casData);
+	console.log(nsid);
       if (!nsid) {
         res.status(401).json({ error: "Invalid CAS Ticket" });
       }

web/src/App.tsx

@@ -15,7 +15,15 @@ function App() {
       <Routes>
         {/* Unprotected routes */}
         <Route path="/cas-callback" element={<CASCallback />} />
-        
+	        
+        <Route 
+          path="/"
+          element={
+            <ProtectedRoute>
+                <div>Hello</div>
+            </ProtectedRoute>
+          }
+        ></Route>
         {/* Protected Routes */}
         <Route 
           path="/upload"

web/src/auth/CASCallback.tsx

@@ -1,16 +1,18 @@
 import React, { useEffect } from 'react';
 
-const BACKEND_URL = 'https://starr-lab-server.usask.ca/api'; // Replace with your backend URL
+const BACKEND_URL = 'https://starr-lab-server.usask.ca'; // Replace with your backend URL
 
 const CASCallback: React.FC = () => {
     useEffect(() => {
         // Extract CAS ticket from URL
         const urlParams = new URLSearchParams(window.location.search);
         const ticket = urlParams.get('ticket');
 
+	console.log(ticket);
+
         if (ticket) {
             // Call backend to validate ticket
-            fetch(`${BACKEND_URL}/admin-router/auth/cas-validate?ticket=${ticket}&service=${encodeURIComponent(window.location.origin + '/cas-callback')}`)
+            fetch(`${BACKEND_URL}/api/adminRequest/auth/cas-validate?ticket=${ticket}&service=${encodeURIComponent(window.location.origin + '/cas-callback')}`)
                 .then((response) => response.json())
                 .then((data) => {
                     if (data.token) {

web/src/auth/ProtectedRoute.tsx

@@ -1,6 +1,6 @@
 function redirectToCAS() {
     const CAS_SERVER = "https://cas.usask.ca/cas";
-    const FRONTEND_URL = "https://starr-lab-server.usask.ca:5173/";
+    const FRONTEND_URL = "https://starr-lab-server.usask.ca";
     const serviceURL = `${FRONTEND_URL}/cas-callback`;
 
     window.location.href = `${CAS_SERVER}/login?service=${encodeURIComponent(