From 753a403aed976490a41e93a0c8f802faa1ab8f83 Mon Sep 17 00:00:00 2001
From: Aarnav Tale <aarnavtale@icloud.com>
Date: Fri, 16 May 2025 11:10:39 -0400
Subject: [PATCH] fix: use full users for preauthkey lookup

---
 app/routes/settings/auth-keys/overview.tsx | 4 ++--
 app/types/PreAuthKey.ts                    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/routes/settings/auth-keys/overview.tsx b/app/routes/settings/auth-keys/overview.tsx
index ae8fe4e..a2457e7 100644
--- a/app/routes/settings/auth-keys/overview.tsx
+++ b/app/routes/settings/auth-keys/overview.tsx
@@ -31,7 +31,7 @@ export async function loader({
 			.filter((user) => user.name?.length > 0) // Filter out any invalid users
 			.map(async (user) => {
 				const qp = new URLSearchParams();
-				qp.set('user', user.name);
+				qp.set('user', user.id);
 
 				try {
 					const { preAuthKeys } = await context.client.get<{
@@ -237,7 +237,7 @@ export default function Page() {
 					filteredKeys.map((key) => {
 						// TODO: Why is Headscale using email as the user ID here?
 						// https://github.com/juanfont/headscale/issues/2520
-						const user = users.find((user) => user.email === key.user);
+						const user = users.find((user) => user.id === key.user.id);
 						if (!user) {
 							return null;
 						}
diff --git a/app/types/PreAuthKey.ts b/app/types/PreAuthKey.ts
index 1b6e9b7..11829e8 100644
--- a/app/types/PreAuthKey.ts
+++ b/app/types/PreAuthKey.ts
@@ -1,7 +1,9 @@
+import type { User } from './User';
+
 export interface PreAuthKey {
 	id: string;
 	key: string;
-	user: string;
+	user: User;
 	reusable: boolean;
 	ephemeral: boolean;
 	used: boolean;