From df7bb2fb5765a3ea78308f5267dd2b6e4c7fcda3 Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Fri, 31 Jul 2026 15:17:16 -0400
Subject: [PATCH] Get exit node every time

---
 .../routers/olm/handleOlmRegisterMessage.ts   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/server/routers/olm/handleOlmRegisterMessage.ts b/server/routers/olm/handleOlmRegisterMessage.ts
index 7fa270fa2..374c37631 100644
--- a/server/routers/olm/handleOlmRegisterMessage.ts
+++ b/server/routers/olm/handleOlmRegisterMessage.ts
@@ -1,4 +1,4 @@
-import { db, ExitNode, orgs, primaryDb } from "@server/db";
+import { db, ExitNode, exitNodes, orgs, primaryDb } from "@server/db";
 import { MessageHandler } from "@server/routers/ws";
 import {
     clients,
@@ -311,15 +311,14 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
     }
 
     let clientSubnet = client.exitNodeSubnet;
-    let exitNode: ExitNode | null = null;
     if (
         exitNodeId &&
         (client.exitNodeId !== exitNodeId || !client.exitNodeSubnet)
     ) {
-        const { exitNode: exitNodeResult, hasAccess } =
-            await verifyExitNodeOrgAccess(exitNodeId, client.orgId);
-
-        exitNode = exitNodeResult;
+        const { exitNode, hasAccess } = await verifyExitNodeOrgAccess(
+            exitNodeId,
+            client.orgId
+        );
 
         if (!exitNode) {
             logger.warn("[handleOlmRegisterMessage] Exit node not found", {
@@ -451,6 +450,15 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
         return;
     }
 
+    let exitNode: ExitNode | null = null;
+    if (exitNodeId) {
+        [exitNode] = await db
+            .select()
+            .from(exitNodes)
+            .where(eq(exitNodes.exitNodeId, exitNodeId))
+            .limit(1);
+    }
+
     // NOTE: its important that the client here is the old client and the public key is the new key
     await waitForClientRebuildIdle(olm.clientId);