Create constants for other reg methods

This commit is contained in:
Kristoffer Dalby 2021-11-18 17:51:54 +00:00
parent 58d1255357
commit 106b1e7e8d
3 changed files with 4 additions and 4 deletions

4
api.go
View file

@ -21,6 +21,8 @@ import (
const ( const (
reservedResponseHeaderSize = 4 reservedResponseHeaderSize = 4
RegisterMethodAuthKey = "authKey" RegisterMethodAuthKey = "authKey"
RegisterMethodOIDC = "oidc"
RegisterMethodCLI = "cli"
) )
// KeyHandler provides the Headscale pub key // KeyHandler provides the Headscale pub key
@ -422,8 +424,6 @@ func (h *Headscale) handleMachineRefreshKey(
return return
} }
ctx.Data(http.StatusOK, "application/json; charset=utf-8", respBody) ctx.Data(http.StatusOK, "application/json; charset=utf-8", respBody)
return
} }
func (h *Headscale) handleMachineRegistrationNew( func (h *Headscale) handleMachineRegistrationNew(

View file

@ -660,7 +660,7 @@ func (h *Headscale) RegisterMachine(
machine.IPAddress = ip.String() machine.IPAddress = ip.String()
machine.NamespaceID = namespace.ID machine.NamespaceID = namespace.ID
machine.Registered = true machine.Registered = true
machine.RegisterMethod = "cli" machine.RegisterMethod = RegisterMethodCLI
h.db.Save(&machine) h.db.Save(&machine)
log.Trace(). log.Trace().

View file

@ -223,7 +223,7 @@ func (h *Headscale) OIDCCallback(ctx *gin.Context) {
machine.IPAddress = ip.String() machine.IPAddress = ip.String()
machine.NamespaceID = namespace.ID machine.NamespaceID = namespace.ID
machine.Registered = true machine.Registered = true
machine.RegisterMethod = "oidc" machine.RegisterMethod = RegisterMethodOIDC
machine.LastSuccessfulUpdate = &now machine.LastSuccessfulUpdate = &now
h.db.Save(&machine) h.db.Save(&machine)
} }