Generalise registration for openid

This commit is contained in:
Kristoffer Dalby 2022-02-27 18:42:24 +01:00
parent acb945841c
commit fd1e4a1dcd

21
oidc.go
View file

@ -328,27 +328,28 @@ func (h *Headscale) OIDCCallback(ctx *gin.Context) {
return return
} }
ips, err := h.getAvailableIPs() _, err = h.RegisterMachine(
machineKeyStr,
namespace.Name,
RegisterMethodOIDC,
&requestedTime,
nil,
nil,
&now,
)
if err != nil { if err != nil {
log.Error(). log.Error().
Caller(). Caller().
Err(err). Err(err).
Msg("could not get an IP from the pool") Msg("could not register machine")
ctx.String( ctx.String(
http.StatusInternalServerError, http.StatusInternalServerError,
"could not get an IP from the pool", "could not register machine",
) )
return return
} }
machine.IPAddresses = ips
machine.NamespaceID = namespace.ID
machine.Registered = true
machine.RegisterMethod = RegisterMethodOIDC
machine.LastSuccessfulUpdate = &now
machine.Expiry = &requestedTime
h.db.Save(&machine)
} }
var content bytes.Buffer var content bytes.Buffer