-
Notifications
You must be signed in to change notification settings - Fork 146
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #165 from thrawn01/fix-get-stored
GetStoredMessage() now accepts a URL instead of an id
- Loading branch information
Showing
8 changed files
with
174 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,10 @@ import ( | |
|
|
||
| func (ms *MockServer) addMessagesRoutes(r chi.Router) { | ||
| r.Post("/{domain}/messages", ms.createMessages) | ||
|
|
||
| // This path is made up; it could be anything as the storage url could change over time | ||
| r.Get("/se.storage.url/messages/{id}", ms.getStoredMessages) | ||
| r.Post("/se.storage.url/messages/{id}", ms.sendStoredMessages) | ||
| } | ||
|
|
||
| // TODO: This implementation doesn't support multiple recipients | ||
|
|
@@ -22,22 +26,98 @@ func (ms *MockServer) createMessages(w http.ResponseWriter, r *http.Request) { | |
| toJSON(w, okResp{Message: "invalid 'to' address"}) | ||
| return | ||
| } | ||
| id := randomString(16, "ID-") | ||
|
|
||
| switch to.Address { | ||
| case "[email protected]": | ||
| stored := new(events.Stored) | ||
| stored.Name = events.EventStored | ||
| stored.Timestamp = TimeToFloat(time.Now().UTC()) | ||
| stored.ID = id | ||
| stored.Storage.URL = ms.URL() + "/se.storage.url/messages/" + id | ||
| stored.Storage.Key = id | ||
| stored.Message.Headers = events.MessageHeaders{ | ||
| Subject: r.FormValue("subject"), | ||
| From: r.FormValue("from"), | ||
| To: to.Address, | ||
| MessageID: id, | ||
| } | ||
| stored.Message.Recipients = []string{ | ||
| r.FormValue("to"), | ||
| } | ||
| stored.Message.Size = 10 | ||
| stored.Flags = events.Flags{ | ||
| IsTestMode: false, | ||
| } | ||
| ms.events = append(ms.events, stored) | ||
| default: | ||
| accepted := new(events.Accepted) | ||
| accepted.Name = events.EventAccepted | ||
| accepted.ID = id | ||
| accepted.Timestamp = TimeToFloat(time.Now().UTC()) | ||
| accepted.Message.Headers.From = r.FormValue("from") | ||
| accepted.Message.Headers.To = r.FormValue("to") | ||
| accepted.Message.Headers.MessageID = accepted.ID | ||
| accepted.Message.Headers.Subject = r.FormValue("subject") | ||
|
|
||
| accepted.Recipient = r.FormValue("to") | ||
| accepted.RecipientDomain = strings.Split(to.Address, "@")[1] | ||
| accepted.Flags = events.Flags{ | ||
| IsAuthenticated: true, | ||
| } | ||
| ms.events = append(ms.events, accepted) | ||
| } | ||
|
|
||
| toJSON(w, okResp{ID: "<" + id + ">", Message: "Queued. Thank you."}) | ||
| } | ||
|
|
||
| func (ms *MockServer) getStoredMessages(w http.ResponseWriter, r *http.Request) { | ||
| id := chi.URLParam(r, "id") | ||
|
|
||
| // Find our stored event | ||
| var stored *events.Stored | ||
| for _, event := range ms.events { | ||
| if event.GetID() == id { | ||
| stored = event.(*events.Stored) | ||
| } | ||
| } | ||
|
|
||
| accepted := new(events.Accepted) | ||
| accepted.ID = randomString(16, "ID-") | ||
| accepted.Name = events.EventAccepted | ||
| accepted.Timestamp = TimeToFloat(time.Now().UTC()) | ||
| accepted.Message.Headers.From = r.FormValue("from") | ||
| accepted.Message.Headers.To = r.FormValue("to") | ||
| accepted.Message.Headers.MessageID = accepted.ID | ||
| accepted.Message.Headers.Subject = r.FormValue("subject") | ||
|
|
||
| accepted.Recipient = r.FormValue("to") | ||
| accepted.RecipientDomain = strings.Split(to.Address, "@")[1] | ||
| accepted.Flags = events.Flags{ | ||
| IsAuthenticated: true, | ||
| if stored == nil { | ||
| w.WriteHeader(http.StatusNotFound) | ||
| toJSON(w, okResp{Message: "not found"}) | ||
| } | ||
| ms.events = append(ms.events, accepted) | ||
|
|
||
| toJSON(w, okResp{ID: "<" + accepted.ID + ">", Message: "Queued. Thank you."}) | ||
| toJSON(w, StoredMessage{ | ||
| Recipients: strings.Join(stored.Message.Recipients, ","), | ||
| Sender: stored.Message.Headers.From, | ||
| Subject: stored.Message.Headers.Subject, | ||
| From: stored.Message.Headers.From, | ||
| MessageHeaders: [][]string{ | ||
| {"Sender", stored.Message.Headers.From}, | ||
| {"To", stored.Message.Headers.To}, | ||
| {"Subject", stored.Message.Headers.Subject}, | ||
| {"Content-Type", "text/plain"}, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func (ms *MockServer) sendStoredMessages(w http.ResponseWriter, r *http.Request) { | ||
| id := chi.URLParam(r, "id") | ||
|
|
||
| // Find our stored event | ||
| var stored *events.Stored | ||
| for _, event := range ms.events { | ||
| if event.GetID() == id { | ||
| stored = event.(*events.Stored) | ||
| } | ||
| } | ||
|
|
||
| if stored == nil { | ||
| w.WriteHeader(http.StatusNotFound) | ||
| toJSON(w, okResp{Message: "not found"}) | ||
| } | ||
|
|
||
| // DO NOTHING | ||
|
|
||
| toJSON(w, okResp{ID: "<" + id + ">", Message: "Queued. Thank you."}) | ||
| } | ||
Oops, something went wrong.