From fdd64d98c81c186743b5eec60928292d743d656e Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby <kradalby@kradalby.no>
Date: Wed, 24 Nov 2021 12:15:32 +0000
Subject: [PATCH] Add missing iff to handle expired preauthkey machines

---
 api.go | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/api.go b/api.go
index 6b75ad45..43a9f235 100644
--- a/api.go
+++ b/api.go
@@ -364,15 +364,21 @@ func (h *Headscale) handleMachineExpired(
 		Str("machine", machine.Name).
 		Msg("Machine registration has expired. Sending a authurl to register")
 
-	if h.cfg.OIDC.Issuer != "" {
-		resp.AuthURL = fmt.Sprintf("%s/oidc/register/%s",
-			strings.TrimSuffix(h.cfg.ServerURL, "/"), idKey.HexString())
-	} else {
-		resp.AuthURL = fmt.Sprintf("%s/register?key=%s",
-			strings.TrimSuffix(h.cfg.ServerURL, "/"), idKey.HexString())
+	if registerRequest.Auth.AuthKey != "" {
+		h.handleAuthKey(ctx, machineKey, registerRequest, machine)
+
+		return
 	}
 
-	respBody, err := encode(resp, &idKey, h.privateKey)
+	if h.cfg.OIDC.Issuer != "" {
+		resp.AuthURL = fmt.Sprintf("%s/oidc/register/%s",
+			strings.TrimSuffix(h.cfg.ServerURL, "/"), machineKey.HexString())
+	} else {
+		resp.AuthURL = fmt.Sprintf("%s/register?key=%s",
+			strings.TrimSuffix(h.cfg.ServerURL, "/"), machineKey.HexString())
+	}
+
+	respBody, err := encode(resp, &machineKey, h.privateKey)
 	if err != nil {
 		log.Error().
 			Str("handler", "Registration").