Skip to content

Commit 37e3de8

Browse files
mcroydonmcroydon
committedMay 27, 2015
Added support for the inbound API (with tests).
1 parent c6ce50e commit 37e3de8

File tree

3 files changed

+285
-0
lines changed

3 files changed

+285
-0
lines changed
 

‎chimp.go

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ func (t *APITime) UnmarshalJSON(data []byte) (err error) {
5050
t.Time, err = time.Parse(`"2006-01-02"`, s)
5151
case l == 21:
5252
t.Time, err = time.Parse(`"2006-01-02 15:04:05"`, s)
53+
case l == 27:
54+
t.Time, err = time.Parse(`"2006-01-02 15:04:05.00000"`, s)
5355
case l == 9:
5456
t.Time, err = time.Parse(`"2006-01"`, s)
5557
}

‎mandrill_inbound.go

+169
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
// Copyright 2013 Matthew Baird
2+
// Licensed under the Apache License, Version 2.0 (the "License");
3+
// you may not use this file except in compliance with the License.
4+
// You may obtain a copy of the License at
5+
// http://www.apache.org/licenses/LICENSE-2.0
6+
// Unless required by applicable law or agreed to in writing, software
7+
// distributed under the License is distributed on an "AS IS" BASIS,
8+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9+
// See the License for the specific language governing permissions and
10+
// limitations under the License.
11+
12+
package gochimp
13+
14+
import (
15+
"errors"
16+
)
17+
18+
// see https://mandrillapp.com/api/docs/inbound.JSON.html
19+
const inbound_domains_endpoint string = "/inbound/domains.json" //List the domains that have been configured for inbound delivery
20+
const add_domain_endpoint string = "/inbound/add-domain.json" //Add an inbound domain to your account
21+
const check_domain_endpoint string = "/inbound/check-domain.json" //Check the MX settings for an inbound domain.
22+
const delete_domain_endpoint string = "/inbound/delete-domain.json" //Delete an inbound domain from the account.
23+
const routes_endopoint string = "/inbound/routes.json" //List the mailbox routes defined for an inbound domain
24+
const add_route_endpoint string = "/inbound/add-route.json" //Add a new mailbox route to an inbound domain
25+
const update_route_endpoint string = "/inbound/update-route.json" //Update the pattern or webhook of an existing inbound mailbox route.
26+
const delete_route_endpoint string = "/inbound/delete-route.json" //Delete an existing inbound mailbox route
27+
const send_raw_endpoint string = "/inbound/send-raw.json" //Send a raw MIME message to an inbound hook as if it had been sent over SMTP.
28+
29+
// can error with one of the following: Invalid_Key, ValidationError, GeneralError
30+
func (a *MandrillAPI) InboundDomainList() ([]InboundDomain, error) {
31+
var response []InboundDomain
32+
var params map[string]interface{} = make(map[string]interface{})
33+
err := parseMandrillJson(a, inbound_domains_endpoint, params, &response)
34+
return response, err
35+
}
36+
37+
// can error with one of the following: Invalid_Key, ValidationError, GeneralError
38+
func (a *MandrillAPI) InboundDomainAdd(domain string) (InboundDomain, error) {
39+
return getInboundDomain(a, domain, add_domain_endpoint)
40+
}
41+
42+
// can error with one of the following: Invalid_Key, Unknown_InboundDomain, ValidationError, GeneralError
43+
func (a *MandrillAPI) InboundDomainCheck(domain string) (InboundDomain, error) {
44+
return getInboundDomain(a, domain, check_domain_endpoint)
45+
}
46+
47+
// can error with one of the following: Invalid_Key, Unknown_InboundDomain, ValidationError, GeneralError
48+
func (a *MandrillAPI) InboundDomainDelete(domain string) (InboundDomain, error) {
49+
return getInboundDomain(a, domain, delete_domain_endpoint)
50+
}
51+
52+
// can error with one of the following: Invalid_Key, Unknown_InboundDomain, ValidationError, GeneralError
53+
func (a *MandrillAPI) RouteList(domain string) ([]Route, error) {
54+
var response []Route
55+
if domain == "" {
56+
return response, errors.New("domain cannot be blank")
57+
}
58+
var params map[string]interface{} = make(map[string]interface{})
59+
params["domain"] = domain
60+
err := parseMandrillJson(a, routes_endopoint, params, &response)
61+
return response, err
62+
}
63+
64+
// can error with one of the following: Invalid_Key, Unknown_InboundDomain, ValidationError, GeneralError
65+
func (a *MandrillAPI) RouteAdd(domain string, pattern string, url string) (Route, error) {
66+
var response Route
67+
if domain == "" {
68+
return response, errors.New("domain cannot be blank")
69+
}
70+
if pattern == "" {
71+
return response, errors.New("pattern cannot be blank")
72+
}
73+
if url == "" {
74+
return response, errors.New("url cannot be blank")
75+
}
76+
return getRoute(a, "", domain, pattern, url, add_route_endpoint)
77+
}
78+
79+
// can error with one of the following: Invalid_Key, Unknown_InboundDomain, ValidationError, GeneralError
80+
func (a *MandrillAPI) RouteUpdate(id string, domain string, pattern string, url string) (Route, error) {
81+
var response Route
82+
if id == "" {
83+
return response, errors.New("id cannot be blank")
84+
}
85+
return getRoute(a, id, domain, pattern, url, update_route_endpoint)
86+
}
87+
88+
// can error with one of the following: Invalid_Key, Unknown_InboundDomain, ValidationError, GeneralError
89+
func (a *MandrillAPI) RouteDelete(id string) (Route, error) {
90+
var response Route
91+
if id == "" {
92+
return response, errors.New("id cannot be blank")
93+
}
94+
return getRoute(a, id, "", "", "", delete_route_endpoint)
95+
}
96+
97+
// can error with one of the following: Invalid_Key, ValidationError, GeneralError
98+
func (a *MandrillAPI) SendRawMIME(raw_message string, to []string, mail_from string, helo string, client_address string) ([]InboundRecipient, error) {
99+
var response []InboundRecipient
100+
if raw_message == "" {
101+
return response, errors.New("raw_message cannot be blank")
102+
}
103+
var params map[string]interface{} = make(map[string]interface{})
104+
params["raw_message"] = raw_message
105+
if len(to) > 0 {
106+
params["to"] = to
107+
}
108+
if mail_from != "" {
109+
params["mail_from"] = mail_from
110+
}
111+
if helo != "" {
112+
params["helo"] = helo
113+
}
114+
if client_address != "" {
115+
params["client_address"] = client_address
116+
}
117+
118+
err := parseMandrillJson(a, send_raw_endpoint, params, &response)
119+
return response, err
120+
}
121+
122+
func getRoute(a *MandrillAPI, id string, domain string, pattern string, url string, endpoint string) (Route, error) {
123+
var params map[string]interface{} = make(map[string]interface{})
124+
var response Route
125+
if id != "" {
126+
params["id"] = id
127+
}
128+
if domain != "" {
129+
params["domain"] = domain
130+
}
131+
if pattern != "" {
132+
params["pattern"] = pattern
133+
}
134+
if url != "" {
135+
params["url"] = url
136+
}
137+
138+
err := parseMandrillJson(a, endpoint, params, &response)
139+
return response, err
140+
}
141+
142+
func getInboundDomain(a *MandrillAPI, domain string, endpoint string) (InboundDomain, error) {
143+
if domain == "" {
144+
return InboundDomain{}, errors.New("domain cannot be blank")
145+
}
146+
var params map[string]interface{} = make(map[string]interface{})
147+
params["domain"] = domain
148+
var response InboundDomain
149+
err := parseMandrillJson(a, endpoint, params, &response)
150+
return response, err
151+
}
152+
153+
type InboundDomain struct {
154+
Domain string `json:"domain"`
155+
CreatedAt APITime `json:"created_at"`
156+
ValidMx bool `json:"valid_mx"`
157+
}
158+
159+
type Route struct {
160+
Id string `json:"id"`
161+
Pattern string `json:"pattern"`
162+
Url string `json:"url"`
163+
}
164+
165+
type InboundRecipient struct {
166+
Email string `json:"email"`
167+
Pattern string `json:"pattern"`
168+
Url string `json:"url"`
169+
}

‎mandrill_test.go

+114
Original file line numberDiff line numberDiff line change
@@ -239,3 +239,117 @@ func TestSendersList(t *testing.T) {
239239
t.Errorf("should have found User %s in [%v] length array", user, len(results))
240240
}
241241
}
242+
243+
// incoming tests
244+
245+
func TestInboundDomainListAddCheckDelete(t *testing.T) {
246+
domainName := "improbable.example.com"
247+
domains, err := mandrill.InboundDomainList()
248+
if err != nil {
249+
t.Error("Error:", err)
250+
}
251+
originalCount := len(domains)
252+
domain, err := mandrill.InboundDomainAdd(domainName)
253+
if err != nil {
254+
t.Error("Error:", err)
255+
}
256+
domains, err = mandrill.InboundDomainList()
257+
if err != nil {
258+
t.Error("Error:", err)
259+
}
260+
newCount := len(domains)
261+
if newCount != originalCount+1 {
262+
t.Errorf("Expected %v domains, found %v after adding %v.", originalCount+1, newCount, domainName)
263+
}
264+
newDomain, err := mandrill.InboundDomainCheck(domainName)
265+
if err != nil {
266+
t.Error("Error:", err)
267+
}
268+
if domain.CreatedAt != newDomain.CreatedAt {
269+
t.Errorf("Domain check of %v and %v do not match.", domain.CreatedAt, newDomain.CreatedAt)
270+
}
271+
if domain.Domain != newDomain.Domain {
272+
t.Errorf("Domain check of %v and %v do not match.", domain.Domain, newDomain.Domain)
273+
}
274+
if domain.ValidMx != newDomain.ValidMx {
275+
t.Errorf("Domain check of %v and %v do not match.", domain.ValidMx, newDomain.ValidMx)
276+
}
277+
_, err = mandrill.InboundDomainDelete(domainName)
278+
if err != nil {
279+
t.Error("Error:", err)
280+
}
281+
domains, err = mandrill.InboundDomainList()
282+
if err != nil {
283+
t.Error("Error:", err)
284+
}
285+
deletedCount := len(domains)
286+
if deletedCount != originalCount {
287+
t.Errorf("Expected %v domains, found %v after deleting %v.", originalCount, deletedCount, domainName)
288+
}
289+
}
290+
291+
func TestInboundDomainRoutesAndRaw(t *testing.T) {
292+
domainName := "www.google.com"
293+
emailAddress := "test"
294+
webhookUrl := fmt.Sprintf("http://%v/", domainName)
295+
_, err := mandrill.InboundDomainAdd(domainName)
296+
if err != nil {
297+
t.Error("Error:", err)
298+
}
299+
routeList, err := mandrill.RouteList(domainName)
300+
if err != nil {
301+
t.Error("Error:", err)
302+
}
303+
count := len(routeList)
304+
if count != 0 {
305+
t.Errorf("Expected no routes at %v, found %v.", domainName, count)
306+
}
307+
route, err := mandrill.RouteAdd(domainName, emailAddress, webhookUrl)
308+
if err != nil {
309+
t.Error("Error:", err)
310+
}
311+
if route.Pattern != emailAddress {
312+
t.Errorf("Expected pattern %v, found %v.", emailAddress, route.Pattern)
313+
}
314+
if route.Url != webhookUrl {
315+
t.Errorf("Expected URL %v, found %v.", webhookUrl, route.Url)
316+
}
317+
newDomainName := "www.google.com"
318+
newEmailAddress := "test2"
319+
newWebhookUrl := fmt.Sprintf("http://%v/", newDomainName)
320+
_, err = mandrill.InboundDomainCheck(newDomainName)
321+
if err != nil {
322+
t.Error("Error:", err)
323+
}
324+
route, err = mandrill.RouteUpdate(route.Id, newDomainName, newEmailAddress, newWebhookUrl)
325+
if err != nil {
326+
t.Error("Error:", err)
327+
}
328+
if route.Pattern != newEmailAddress {
329+
t.Errorf("Expected pattern %v, found %v.", newEmailAddress, route.Pattern)
330+
}
331+
if route.Url != newWebhookUrl {
332+
t.Errorf("Expected URL %v, found %v.", newWebhookUrl, route.Pattern)
333+
}
334+
route, err = mandrill.RouteDelete(route.Id)
335+
if err != nil {
336+
t.Error("Error:", err)
337+
}
338+
routeList, err = mandrill.RouteList(domainName)
339+
if err != nil {
340+
t.Error("Error:", err)
341+
}
342+
newCount := len(routeList)
343+
if newCount != count {
344+
t.Errorf("Expected %v routes at %v, found %v.", count, domainName, newCount)
345+
}
346+
rawMessage := "From: sender@example.com\nTo: test2@www.google.com\nSubject: Some Subject\n\nSome content."
347+
_, err = mandrill.SendRawMIME(rawMessage, []string{"test2@www.google.com"}, "test@www.google.com", "", "127.0.0.1")
348+
if err != nil {
349+
t.Error("Error:", err)
350+
}
351+
_, err = mandrill.InboundDomainDelete(domainName)
352+
if err != nil {
353+
t.Error("Error:", err)
354+
}
355+
}

0 commit comments

Comments
 (0)
Please sign in to comment.