minor changes to prepare for the 60-day free trial of hosted version

Author: dstpierre

Makefile

@@ -8,8 +8,9 @@ start: build
 	@./cmd/staticbackend
 
 deploy:
-	CGO_ENABLED=0 go build
-	scp staticbackend sb-poc:/home/dstpierre/sb
+	@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/
 
 test:
 	@JWT_SECRET=okdevmode go test --race --cover ./...

account.go

@@ -61,8 +61,11 @@ func (a *accounts) create(w http.ResponseWriter, r *http.Request) {
 	}
 
 	stripeCustomerID, subID := "", ""
+	active := true
+
+	if AppEnv == AppEnvProd && len(os.Getenv("STRIPE_KEY")) > 0 {
+		active = false
 
-	if AppEnv == AppEnvProd {
 		cusParams := &stripe.CustomerParams{
 			Email: stripe.String(email),
 		}
@@ -99,6 +102,7 @@ func (a *accounts) create(w http.ResponseWriter, r *http.Request) {
 		Email:          email,
 		StripeID:       stripeCustomerID,
 		SubscriptionID: subID,
+		IsActive:       active,
 		Created:        time.Now(),
 	}
 
@@ -127,6 +131,7 @@ func (a *accounts) create(w http.ResponseWriter, r *http.Request) {
 		ID:        primitive.NewObjectID(),
 		SBID:      acctID,
 		Name:      dbName,
+		IsActive:  active,
 		Whitelist: []string{"localhost"},
 	}
 
@@ -146,7 +151,7 @@ func (a *accounts) create(w http.ResponseWriter, r *http.Request) {
 	}
 
 	signUpURL := "no need to sign up in dev mode"
-	if AppEnv == AppEnvProd {
+	if AppEnv == AppEnvProd && len(os.Getenv("STRIPE_KEY")) > 0 {
 		params := &stripe.BillingPortalSessionParams{
 			Customer:  stripe.String(stripeCustomerID),
 			ReturnURL: stripe.String("https://staticbackend.com/stripe"),

internal/data.go

@@ -12,7 +12,7 @@ type BaseConfig struct {
 	SBID      primitive.ObjectID `bson:"accountId" json:"-"`
 	Name      string             `bson:"name" json:"name"`
 	Whitelist []string           `bson:"whitelist" json:"whitelist"`
-	Valid     bool               `bson:"valid" json:"valid"`
+	IsActive  bool               `bson:"active" json:"-"`
 }
 
 var (

middleware/withdb.go

@@ -54,6 +54,9 @@ func WithDB(client *mongo.Client) Middleware {
 				if err != nil {
 					http.Error(w, err.Error(), http.StatusInternalServerError)
 					return
+				} else if !conf.IsActive {
+					http.Error(w, "your account is not inactive. Please contact us [email protected]", http.StatusUnauthorized)
+					return
 				}
 
 				ctx = context.WithValue(ctx, ContextBase, conf)

stripe.go

@@ -2,71 +2,55 @@ package staticbackend
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
-	"log"
+	"io"
 	"net/http"
+	"os"
 	"staticbackend/internal"
 
+	"github.com/stripe/stripe-go/v71"
 	"go.mongodb.org/mongo-driver/bson"
 )
 
 type stripeWebhook struct{}
 
-type CustomerSourceCreated struct {
-	Data struct {
-		CustomerID string `json:"customer"`
-	} `json:"data"`
-}
-
 func (wh *stripeWebhook) process(w http.ResponseWriter, r *http.Request) {
-	fmt.Println("inside stripe webhook")
-	var evt map[string]interface{}
-	if err := parseBody(r.Body, &evt); err != nil {
-		log.Println(err)
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-
-	typ, ok := evt["type"]
-	if !ok {
-		log.Println("no type specified")
-		http.Error(w, "no type specified in the event data", http.StatusBadRequest)
+	const MaxBodyBytes = int64(65536)
+	r.Body = http.MaxBytesReader(w, r.Body, MaxBodyBytes)
+	payload, err := io.ReadAll(r.Body)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error reading request body: %v\n", err)
+		w.WriteHeader(http.StatusServiceUnavailable)
 		return
 	}
 
-	fmt.Println("event type", typ)
+	event := stripe.Event{}
 
-	var err error
-
-	switch typ {
-	case "customer.source.created":
-		err = wh.sourceCreated(evt["data"])
-	}
-
-	if err != nil {
-		log.Println(err)
-		http.Error(w, err.Error(), http.StatusInternalServerError)
+	if err := json.Unmarshal(payload, &event); err != nil {
+		fmt.Fprintf(os.Stderr, "Failed to parse webhook body json: %v\n", err.Error())
+		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
-	respond(w, http.StatusOK, true)
-}
-
-func (wh *stripeWebhook) sourceCreated(params interface{}) error {
-	data, ok := params.(map[string]interface{})
-	if !ok {
-		return fmt.Errorf("unable to cast params: %v into a map[string]interface{}", params)
+	// Unmarshal the event data into an appropriate struct depending on its Type
+	switch event.Type {
+	case "payment_method.attached":
+		var paymentMethod stripe.PaymentMethod
+		err := json.Unmarshal(event.Data.Raw, &paymentMethod)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Error parsing webhook JSON: %v\n", err)
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+		wh.handlePaymentMethodAttached(paymentMethod)
 	}
 
-	obj, ok := data["object"].(map[string]interface{})
-	if !ok {
-		return fmt.Errorf("unable to cast data[object] into a map[string]interface{}")
-	}
+	w.WriteHeader(http.StatusOK)
+}
 
-	stripeID, ok := obj["customer"].(string)
-	if !ok {
-		return fmt.Errorf("unable to convert %v to string", data["customer"])
-	}
+func (wh *stripeWebhook) handlePaymentMethodAttached(pm stripe.PaymentMethod) error {
+	stripeID := pm.Customer.ID
 
 	db := client.Database("sbsys")
 	ctx := context.Background()