From 9bb20024fab0d05b20de6cfb4aa6418364001cd6 Mon Sep 17 00:00:00 2001
From: kevinf100 <12779728+kevinf100@users.noreply.github.com>
Date: Sat, 18 Jan 2025 02:48:50 -0500
Subject: [PATCH] fix: Reusable Pre-Auth Keys no longer show expired when used
 (#88)

---
 app/routes/settings/auth-keys.tsx      | 2 +-
 app/routes/settings/components/key.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/routes/settings/auth-keys.tsx b/app/routes/settings/auth-keys.tsx
index d143052..8b25ecf 100644
--- a/app/routes/settings/auth-keys.tsx
+++ b/app/routes/settings/auth-keys.tsx
@@ -137,7 +137,7 @@ export default function Page() {
 			const expiry = new Date(key.expiration);
 
 			if (status === 'Active') {
-				return !(expiry < now) && !key.used;
+				return !(expiry < now) && (!key.used || key.reusable);
 			}
 
 			if (status === 'Used/Expired') {
diff --git a/app/routes/settings/components/key.tsx b/app/routes/settings/components/key.tsx
index a9acf2d..fd30adc 100644
--- a/app/routes/settings/components/key.tsx
+++ b/app/routes/settings/components/key.tsx
@@ -31,7 +31,7 @@ export default function AuthKeyRow({ authKey, server }: Props) {
 				tailscale up --login-server {server} --authkey {authKey.key}
 			</Code>
 			<div className="flex gap-4 items-center">
-				{authKey.used ||
+				{authKey.used && !authKey.reusable ||
 				new Date(authKey.expiration) < new Date() ? undefined : (
 					<ExpireKey authKey={authKey} />
 				)}