From c230de4915b42c80172d55f66c79dadbc8fe06f8 Mon Sep 17 00:00:00 2001
From: Spencer Killen <sjkillen@ualberta.ca>
Date: Mon, 3 Aug 2026 11:53:01 -0600
Subject: [PATCH] .

---
 client.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/client.ts b/client.ts
index 0a63f7f..e312250 100644
--- a/client.ts
+++ b/client.ts
@@ -19,7 +19,7 @@ const app = express();
 
 const database: Record<
   string,
-  { oidConfig: oid.Configuration; pkceCodeVerifier: string }
+  { oidConfig: oid.Configuration; pkceCodeVerifier: string, url: string }
 > = {};
 
 app.get("/login", async (req, res) => {
@@ -30,6 +30,7 @@ app.get("/login", async (req, res) => {
   }
   const cbid = uid();
   const redirect_uri = `${CLIENT_URL}/callback/${cbid}`;
+  console.log("Redirect URI is", redirect_uri)
   const provider = new URL(req.query.provider);
   const oidConfig = await oid.dynamicClientRegistration(
     provider,
@@ -44,7 +45,7 @@ app.get("/login", async (req, res) => {
   );
   const pkceCodeVerifier = oid.randomPKCECodeVerifier();
   const code_challenge = await oid.calculatePKCECodeChallenge(pkceCodeVerifier);
-  database[cbid] = { oidConfig, pkceCodeVerifier };
+  database[cbid] = { oidConfig, pkceCodeVerifier, url: redirect_uri };
   setTimeout(() => {
     delete database[cbid];
   }, 600000 /* 10 minutes */);
@@ -65,9 +66,10 @@ app.get("/callback/:cbid", async (req, res) => {
     res.end();
     return;
   }
-  const { oidConfig, pkceCodeVerifier } = database[cbid]!;
-  const fullUrl = `${req.protocol}://${req.get("host")}${req.url}`;
-  const url = new URL(fullUrl);
+  const { oidConfig, pkceCodeVerifier, url: redirect_uri } = database[cbid]!;
+  const url = new URL(redirect_uri + req.query);
+  console.log("URL")
+  console.log(redirect_uri + req.query);
   let tokens = await oid
     .authorizationCodeGrant(oidConfig, url, {
       pkceCodeVerifier,