aboutsummaryrefslogtreecommitdiff
path: root/messages.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2015-12-13 03:18:59 +0100
committerDimitri Sokolyuk <demon@dim13.org>2015-12-13 03:18:59 +0100
commit5dd267af24d709292ed7c48c213b7bfd0d7b9269 (patch)
tree10587c8efd87ab6533d7b9fff1327e8783e382bf /messages.go
parentdbc27c3a29e6644688d015f36c689165e6d90168 (diff)
Combine messages
Diffstat (limited to 'messages.go')
-rw-r--r--messages.go49
1 files changed, 21 insertions, 28 deletions
diff --git a/messages.go b/messages.go
index c4bf8e5..444e4d8 100644
--- a/messages.go
+++ b/messages.go
@@ -24,20 +24,15 @@ type Directory struct {
// Registration Objects
type Registration struct {
- Resource Resource `json:"resource"` // new-reg
- Contact Contacts `json:"contact,omitempty"`
- Agreement string `json:"agreement,omitempty"`
- Authorizations string `json:"authorizations,omitempty"`
- Certificates string `json:"certificates,omitempty"`
-}
-
-// RegistrationResp ...
-type RegistrationResp struct {
- ID int `json:"id"`
- Key Key `json:"key"`
- Contact Contacts `json:"contact"`
- InitialIP net.IP `json:"initialIp"` // not in draft
- CreatedAt time.Time `json:"createdAt"` // 2006-01-02T15:04:05.999999999Z
+ Resource Resource `json:"resource"` // new-reg
+ Contact Contacts `json:"contact,omitempty"`
+ Agreement string `json:"agreement,omitempty"`
+ Authorizations string `json:"authorizations,omitempty"`
+ Certificates string `json:"certificates,omitempty"`
+ ID int `json:"id,omitempty"`
+ Key *Key `json:"key,omitempty"`
+ InitialIP net.IP `json:"initialIp,omitempty"` // not in draft
+ CreatedAt *time.Time `json:"createdAt,omitempty"` // 2006-01-02T15:04:05.999999999Z
}
// Key contains public part of jose.JsonWebKey
@@ -49,17 +44,12 @@ type Key struct {
// Authorization request
type Authorization struct {
- Resource Resource `json:"resource"` // new-authz
- Identifier Identifier `json:"identifier"`
-}
-
-// AuthorizationResp Objects
-type AuthorizationResp struct {
+ Resource Resource `json:"resource"` // new-authz
Identifier Identifier `json:"identifier"`
- Status Status `json:"status,omitemtpy"` // e.g. valid
- Expires time.Time `json:"expires,omitempty"` // 2006-01-02
- Challenges []Challenge `json:"challenges"`
- Combinations [][]int `json:"combinations,omitemtpy"`
+ Status Status `json:"status,omitempty"` // e.g. valid
+ Expires *time.Time `json:"expires,omitempty"` // 2006-01-02
+ Challenges []Challenge `json:"challenges,omitempty"`
+ Combinations [][]int `json:"combinations,omitempty"`
}
// Identifier ...
@@ -70,10 +60,13 @@ type Identifier struct {
// Challege ...
type Challenge struct {
- Type ChallengeType `json:"type"` // http-01
- Status Status `json:"status"` // e.g. valid
- Validated time.Time `json:"validated"` // 2006-01-02T15:04Z
- KeyAuthorization string `json:"keyAuthorization"`
+ Resource Resource `json:"resource"` // challenge
+ Type ChallengeType `json:"type"`
+ Token string `json:"token"`
+ Status Status `json:"status,omitempty"` // e.g. valid
+ URI string `json:"uri,omitempty"`
+ Validated *time.Time `json:"validated,omitempty"` // 2006-01-02T15:04Z
+ KeyAuthorization string `json:"keyAuthorization,omitempty"`
}
// Problem description