From bd16ce49127b168b18c04167ca5766f549c834b3 Mon Sep 17 00:00:00 2001
From: James Clarke <james@edgedb.com>
Date: Wed, 5 Feb 2025 12:08:35 +0000
Subject: [PATCH] Fix displayed oauth callback endpoint url to include port

---
 shared/studio/state/instance.ts    | 1 +
 shared/studio/tabs/auth/config.tsx | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/shared/studio/state/instance.ts b/shared/studio/state/instance.ts
index 6363a8c8..3c0887c1 100644
--- a/shared/studio/state/instance.ts
+++ b/shared/studio/state/instance.ts
@@ -50,6 +50,7 @@ export interface ServerVersion {
 export class InstanceState extends Model({
   _instanceId: prop<string | null>(null),
   serverUrl: prop<string>(),
+  serverUrlWithPort: prop<string | null>(null),
   authUsername: prop<string | null>(null),
   authToken: prop<string | null>(),
 
diff --git a/shared/studio/tabs/auth/config.tsx b/shared/studio/tabs/auth/config.tsx
index cee74083..5b0792bd 100644
--- a/shared/studio/tabs/auth/config.tsx
+++ b/shared/studio/tabs/auth/config.tsx
@@ -369,14 +369,18 @@ const AuthUrls = observer(function AuthUrls({
   const databaseState = useDatabaseState();
 
   const url = new URL(instanceState.serverUrl);
-  url.pathname = `db/${encodeURIComponent(databaseState.name)}/ext/auth`;
+  const urlWithPort = new URL(
+    instanceState.serverUrlWithPort ?? instanceState.serverUrl
+  );
+  url.pathname =
+    urlWithPort.pathname = `db/${encodeURIComponent(databaseState.name)}/ext/auth`;
 
   const baseUrl = url.toString();
 
   return (
     <div className={styles.authUrls}>
       <div className={styles.label}>OAuth callback endpoint:</div>
-      <CopyUrl url={`${baseUrl}/callback`} />
+      <CopyUrl url={`${urlWithPort.toString()}/callback`} />
       <div
         className={cn({[styles.disabled]: !builtinUIEnabled})}
         style={{display: "contents"}}