forked from TrueCloudLab/lego
Merge pull request #222 from connctd/registration
In case of conflict during registration, the old registration is now recovered
This commit is contained in:
commit
c570b320ae
1 changed files with 18 additions and 2 deletions
|
@ -167,15 +167,31 @@ func (c *Client) Register() (*RegistrationResource, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var serverReg Registration
|
var serverReg Registration
|
||||||
|
var regURI string
|
||||||
hdr, err := postJSON(c.jws, c.directory.NewRegURL, regMsg, &serverReg)
|
hdr, err := postJSON(c.jws, c.directory.NewRegURL, regMsg, &serverReg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
remoteErr, ok := err.(RemoteError)
|
||||||
|
if ok && remoteErr.StatusCode == 409 {
|
||||||
|
regURI = hdr.Get("Location")
|
||||||
|
regMsg = registrationMessage{
|
||||||
|
Resource: "reg",
|
||||||
|
}
|
||||||
|
if hdr, err = postJSON(c.jws, regURI, regMsg, &serverReg); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
reg := &RegistrationResource{Body: serverReg}
|
reg := &RegistrationResource{Body: serverReg}
|
||||||
|
|
||||||
links := parseLinks(hdr["Link"])
|
links := parseLinks(hdr["Link"])
|
||||||
reg.URI = hdr.Get("Location")
|
|
||||||
|
if regURI == "" {
|
||||||
|
regURI = hdr.Get("Location")
|
||||||
|
}
|
||||||
|
reg.URI = regURI
|
||||||
if links["terms-of-service"] != "" {
|
if links["terms-of-service"] != "" {
|
||||||
reg.TosURL = links["terms-of-service"]
|
reg.TosURL = links["terms-of-service"]
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue