simplified the relay to accept message in the body (#32)

Parquery · Mar 18, 2019 · 28032c8 · 28032c8
1 parent fa52ecd
commit 28032c8
Show file tree

Hide file tree

Showing 13 changed files with 345 additions and 349 deletions.
diff --git a/README.md b/README.md
@@ -74,37 +74,46 @@ Sending requests
   to create a mailing channel and authorization token:
 
     ```bash
-    curl -i -H "Accept: application/json" -H "Content-Type:application/json" -X PUT \
-      --data '
-        {
-          "descriptor": "some-channel",
-          "token": "oqiwdJKNsdKIUwezd92DNQsndkDERDFKJNQWSwq3rODIU",
-          "sender": {
-            "email": "your-name@company.com",
-            "name": "Sender"
-          },
-          "recipients":[
-            {
-              "email": "your-client@client.com",
-              "name":"Recipient"
-            }
-          ],
-          "cc": [],
-          "bcc": [],
-          "min_period": 1.2,
-          "max_size":10000
-          "domain": "company.com"
-        }' \
+    curl -i \
+        -X PUT \
+        -H "Accept: application/json" \
+        -H "Content-Type: application/json" \
+        --data '{
+            "descriptor": "some-channel",
+            "token": "oqiwdJKNsdK",
+            "sender": {
+              "email": "your-name@company.com",
+              "name":"Some Sender"
+            },
+            "recipients":[
+              {
+                "email": "your-client@client.com",
+                "name": "Recipient"
+              }
+            ],
+            "cc": [],
+            "bcc": [],
+            "min_period":0.1,
+            "max_size":10000000
+          }' \
       "localhost:8300/api/channel"
     ```
      
 * Use the [Relay Server API](https://github.com/Parquery/mailgun-relayery/swagger/relay/swagger.yaml) 
   to relay a message:
 
     ```bash
-    curl -i -H "Accept: application/json" -H "Content-Type:application/json" -X POST \
-      --data '{"message":"hello there", "subject": "a message from your friend"}' \
-      "localhost:8200/api/message?descriptor=some-channel&token=oqiwdJKNsdKIUwezd92DNQsndkDERDFKJNQWSwq3rODIU"
+    curl -i \
+        -X POST \
+        -H "Accept: application/json" \
+        -H "Content-Type: application/json" \
+        -H "X-Descriptor: some-channel" \
+        -H "X-Token: oqiwdJKNsdK" \
+        --data '{
+          "message": "hello there",
+          "subject": "a message from your friend"
+        }' \
+        "localhost:8200/api/message
     ```
      
 Development

diff --git a/database/database_test.go b/database/database_test.go
@@ -585,7 +585,7 @@ func TestTxn_PutTimestamp(t *testing.T) {
 }
 
 func TestTxn_RemoveChannel(t *testing.T) {
-	d, err := emptyDatabase(ControlAccess) //TODO test with put timestamp as well
+	d, err := emptyDatabase(ControlAccess)
 	if err != nil {
 		t.Fatal(err.Error())
 	}

diff --git a/mailgun-relayery/main.go b/mailgun-relayery/main.go
@@ -136,7 +136,7 @@ func main() {
 			ReadHeaderTimeout: 60 * time.Second}
 
 		go func() {
-			h := &relay.HandlerImpl{
+			h := &relay.Handler{
 				Env:         env,
 				MailgunData: mailgunData,
 				LogOut:      logOut,

diff --git a/mailgun-relayery/relay/handler.go b/mailgun-relayery/relay/handler.go
diff --git a/mailgun-relayery/relay/handler_impl.go b/mailgun-relayery/relay/handler_impl.go