added db increase and allowed sending email for verified domain

Author: dstpierre

Makefile

@@ -8,7 +8,6 @@ start: build
 	@./cmd/staticbackend
 
 deploy: build
-	@cd cmd && rm -rf staticbackend && CGO_ENABLED=0 go build -o staticbackend
 	scp cmd/staticbackend sb-poc:/home/dstpierre/sb
 	scp -qr ./templates/* sb-poc:/home/dstpierre/templates/
 

db.go

@@ -251,6 +251,36 @@ func (database *Database) update(w http.ResponseWriter, r *http.Request) {
 	respond(w, http.StatusOK, result)
 }
 
+func (database *Database) increase(w http.ResponseWriter, r *http.Request) {
+	conf, auth, err := middleware.Extract(r, true)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	curDB := database.client.Database(conf.Name)
+
+	// /db/col/id
+	col := getURLPart(r.URL.Path, 2)
+	id := getURLPart(r.URL.Path, 3)
+
+	var v = new(struct {
+		Field string `json:"field"`
+		Range int    `json:"range"`
+	})
+	if err := json.NewDecoder(r.Body).Decode(&v); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	if err := database.base.Increase(auth, curDB, col, id, v.Field, v.Range); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	respond(w, http.StatusOK, true)
+}
+
 func (database *Database) del(w http.ResponseWriter, r *http.Request) {
 	conf, auth, err := middleware.Extract(r, true)
 	if err != nil {

db/base.go

@@ -323,6 +323,50 @@ func (b *Base) Update(auth internal.Auth, db *mongo.Database, col, id string, do
 	return result, nil
 }
 
+func (b *Base) Increase(auth internal.Auth, db *mongo.Database, col, id, field string, n int) error {
+	oid, err := primitive.ObjectIDFromHex(id)
+	if err != nil {
+		return err
+	}
+
+	filter := bson.M{internal.FieldID: oid}
+
+	// if they are not "root", we use permission
+	if auth.Role < 100 {
+		switch internal.WritePermission(col) {
+		case internal.PermGroup:
+			filter[internal.FieldAccountID] = auth.AccountID
+		case internal.PermOwner:
+			filter[internal.FieldAccountID] = auth.AccountID
+			filter[internal.FieldOwnerID] = auth.UserID
+		}
+	}
+
+	update := bson.M{"$inc": bson.M{field: n}}
+
+	ctx := context.Background()
+	res := db.Collection(col).FindOneAndUpdate(ctx, filter, update)
+	if err := res.Err(); err != nil {
+		return err
+	}
+
+	var result bson.M
+	sr := db.Collection(col).FindOne(ctx, filter)
+	if err := sr.Decode(&result); err != nil {
+		return err
+	} else if err := sr.Err(); err != nil {
+		return err
+	}
+
+	result["id"] = result[internal.FieldID]
+	delete(result, internal.FieldID)
+	delete(result, internal.FieldOwnerID)
+
+	b.PublishDocument("db-"+col, internal.MsgTypeDBUpdated, result)
+
+	return nil
+}
+
 func (b *Base) Delete(auth internal.Auth, db *mongo.Database, col, id string) (int64, error) {
 	oid, err := primitive.ObjectIDFromHex(id)
 	if err != nil {

db_test.go

@@ -13,8 +13,8 @@ import (
 	"time"
 )
 
-// dbPost post on behalf of adminToken by default (use params[0] true for root)
-func dbPost(t *testing.T, hf func(http.ResponseWriter, *http.Request), repo string, v interface{}, params ...bool) *http.Response {
+// dbReq post on behalf of adminToken by default (use params[0] true for root)
+func dbReq(t *testing.T, hf func(http.ResponseWriter, *http.Request), method, path string, v interface{}, params ...bool) *http.Response {
 	if params == nil {
 		params = make([]bool, 0)
 	}
@@ -28,7 +28,7 @@ func dbPost(t *testing.T, hf func(http.ResponseWriter, *http.Request), repo stri
 		t.Fatal("error marshaling post data:", err)
 	}
 
-	req := httptest.NewRequest("POST", "/db/"+repo, bytes.NewReader(b))
+	req := httptest.NewRequest(method, path, bytes.NewReader(b))
 	w := httptest.NewRecorder()
 
 	req.Header.Set("SB-PUBLIC-KEY", pubKey)
@@ -97,6 +97,7 @@ type Task struct {
 	Title   string    `json:"title"`
 	Done    bool      `json:"done"`
 	Created time.Time `json:"created"`
+	Count   int       `json:"count"`
 }
 
 func TestDBCreate(t *testing.T) {
@@ -106,7 +107,8 @@ func TestDBCreate(t *testing.T) {
 			Created: time.Now(),
 		}
 
-	resp := dbPost(t, database.add, "tasks", task)
+	resp := dbReq(t, database.add, "POST", "/db/tasks", task)
+	defer resp.Body.Close()
 
 	if resp.StatusCode > 299 {
 		t.Fatal(GetResponseBody(t, resp))
@@ -154,3 +156,49 @@ func TestDBListCollections(t *testing.T) {
 		t.Errorf("expected len to be > than 2 got %d", len(names))
 	}
 }
+
+func TestDBIncrease(t *testing.T) {
+	task :=
+		Task{
+			Title:   "item created",
+			Created: time.Now(),
+			Count:   1,
+		}
+
+	resp := dbReq(t, database.add, "POST", "/db/tasks", task)
+	defer resp.Body.Close()
+
+	if resp.StatusCode > 299 {
+		t.Fatal(GetResponseBody(t, resp))
+	}
+
+	var createdTask Task
+	if err := parseBody(resp.Body, &createdTask); err != nil {
+		t.Fatal(err)
+	}
+
+	var data = new(struct {
+		Field string `json:"field"`
+		Range int    `json:"range"`
+	})
+	data.Field = "count"
+	data.Range = 4
+
+	resp = dbReq(t, database.increase, "PUT", "/inc/tasks/"+createdTask.ID, data)
+
+	if resp.StatusCode > 299 {
+		t.Fatal(GetResponseBody(t, resp))
+	}
+
+	resp = dbReq(t, database.get, "GET", "/db/tasks/"+createdTask.ID, nil)
+	if resp.StatusCode > 299 {
+		t.Fatal(GetResponseBody(t, resp))
+	}
+
+	var increased Task
+	if err := parseBody(resp.Body, &increased); err != nil {
+		t.Fatal(err)
+	} else if increased.Count != 5 {
+		t.Errorf("expected count to be 5 got %d", increased.Count)
+	}
+}

email/ses.go

@@ -34,6 +34,8 @@ func (AWSSES) Send(data internal.SendMailData) error {
 	// Create an SES session.
 	svc := ses.New(sess)
 
+	from := fmt.Sprintf("%s <%s>", data.FromName, data.From)
+
 	// Assemble the email.
 	input := &ses.SendEmailInput{
 		Destination: &ses.Destination{
@@ -58,7 +60,7 @@ func (AWSSES) Send(data internal.SendMailData) error {
 				Data:    aws.String(data.Subject),
 			},
 		},
-		Source:           aws.String(data.From),
+		Source:           aws.String(from),
 		ReplyToAddresses: aws.StringSlice([]string{data.ReplyTo}),
 		// Uncomment to use a configuration set
 		//ConfigurationSetName: aws.String(ConfigurationSet),

functions_test.go

@@ -68,7 +68,7 @@ func TestFunctionsExecuteDBOperations(t *testing.T) {
 		Code:         code,
 		TriggerTopic: "web",
 	}
-	addResp := dbPost(t, funexec.add, "", data, true)
+	addResp := dbReq(t, funexec.add, "POST", "/", data, true)
 	if addResp.StatusCode != http.StatusOK {
 		b, err := io.ReadAll(addResp.Body)
 		if err != nil {
@@ -80,7 +80,7 @@ func TestFunctionsExecuteDBOperations(t *testing.T) {
 		t.Errorf("add: expected status 200 got %s", addResp.Status)
 	}
 
-	execResp := dbPost(t, funexec.exec, "", data, true)
+	execResp := dbReq(t, funexec.exec, "POST", "/", data, true)
 	if execResp.StatusCode != http.StatusOK {
 		b, err := io.ReadAll(execResp.Body)
 		if err != nil {

hub_test.go

@@ -208,7 +208,7 @@ func TestWebSocketDBEvents(t *testing.T) {
 		Title:   "websocket test",
 		Created: time.Now(),
 	}
-	resp := dbPost(t, database.add, "test", task)
+	resp := dbReq(t, database.add, "POST", "/db/test", task)
 	if resp.StatusCode > 299 {
 		t.Fatal(GetResponseBody(t, resp))
 	}
@@ -290,7 +290,7 @@ func TestWebSocketDBPermission(t *testing.T) {
 		Title:   "websocket test",
 		Created: time.Now(),
 	}
-	resp := dbPost(t, database.add, "permtest_700_", task)
+	resp := dbReq(t, database.add, "POST", "/db/permtest_700_", task)
 	if resp.StatusCode > 299 {
 		t.Fatal(GetResponseBody(t, resp))
 	}

sendmail.go

@@ -17,15 +17,6 @@ func sudoSendMail(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// all email are sent from the env var MAIL_FROM
-	from := data.From
-	if len(data.ReplyTo) > 0 {
-		from = data.ReplyTo
-	}
-
-	data.From = FromEmail
-	data.ReplyTo = from
-
 	// if only body is provided
 	if len(data.Body) > 0 {
 		data.HTMLBody = data.Body

sendmail_test.go

@@ -0,0 +1,25 @@
+package staticbackend
+
+import (
+	"staticbackend/email"
+	"staticbackend/internal"
+	"testing"
+)
+
+func Test_Sendmail_AWS(t *testing.T) {
+	emailer := &email.AWSSES{}
+
+	data := internal.SendMailData{
+		FromName: "My name here",
+		From:     "[email protected]",
+		To:       "[email protected]",
+		ToName:   "Dominic St-Pierre",
+		Subject:  "From unit test",
+		HTMLBody: "<h1>hello</h1><p>working</p>",
+		TextBody: "Hello\nworking",
+		ReplyTo:  "[email protected]",
+	}
+	if err := emailer.Send(data); err != nil {
+		t.Error(err)
+	}
+}

server.go

@@ -133,6 +133,7 @@ func Start(dbHost, port string) {
 	// database routes
 	http.Handle("/db/", middleware.Chain(http.HandlerFunc(database.dbreq), stdAuth...))
 	http.Handle("/query/", middleware.Chain(http.HandlerFunc(database.query), stdAuth...))
+	http.Handle("/inc/", middleware.Chain(http.HandlerFunc(database.increase), stdAuth...))
 	http.Handle("/sudoquery/", middleware.Chain(http.HandlerFunc(database.query), stdRoot...))
 	http.Handle("/sudolistall/", middleware.Chain(http.HandlerFunc(database.listCollections), stdRoot...))
 	http.Handle("/sudo/", middleware.Chain(http.HandlerFunc(database.dbreq), stdRoot...))