From 82cb6b9ddce6d0f2e7b3539313378d301b54e671 Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby <kradalby@kradalby.no>
Date: Mon, 28 Feb 2022 23:00:41 +0000
Subject: [PATCH] Cleanup some unreachable code

---
 machine.go | 23 -----------------------
 oidc.go    |  2 +-
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/machine.go b/machine.go
index 03f727a2..1560858b 100644
--- a/machine.go
+++ b/machine.go
@@ -718,25 +718,6 @@ func (h *Headscale) RegisterMachine(machine Machine,
 		Str("machine_key", machine.MachineKey).
 		Msg("Registering machine")
 
-	// If the machine is already in the database, it is seeking
-	// reauthentication, and by reaching this step, has been authenticated
-	// and need to have an updated expiry.
-	var machineKey key.MachinePublic
-	_ = machineKey.UnmarshalText(
-		[]byte(MachinePublicKeyEnsurePrefix(machine.MachineKey)),
-	)
-	machineFromDatabase, _ := h.GetMachineByMachineKey(machineKey)
-	if machineFromDatabase != nil {
-		log.Trace().
-			Caller().
-			Str("machine", machine.Name).
-			Msg("machine already registered, reauthenticating")
-
-		h.RefreshMachine(machineFromDatabase, *machine.Expiry)
-
-		return machineFromDatabase, nil
-	}
-
 	log.Trace().
 		Caller().
 		Str("machine", machine.Name).
@@ -758,10 +739,6 @@ func (h *Headscale) RegisterMachine(machine Machine,
 
 	machine.IPAddresses = ips
 
-	// TODO(kradalby): This field is uneccessary metadata,
-	// move it to tags instead of having a column.
-	// machine.RegisterMethod = registrationMethod
-
 	h.db.Save(&machine)
 
 	log.Trace().
diff --git a/oidc.go b/oidc.go
index 93fc1be6..8e89e27f 100644
--- a/oidc.go
+++ b/oidc.go
@@ -215,7 +215,7 @@ func (h *Headscale) OIDCCallback(ctx *gin.Context) {
 		return
 	}
 
-	// retrieve machine information
+	// retrieve machine information if it exist
 	machine, err := h.GetMachineByMachineKey(machineKey)
 	if err != nil {
 		log.Error().Msg("machine key not found in database")