diff --git a/Backend/Dockerfile b/Backend/Dockerfile index 0c46f56..7514daf 100644 --- a/Backend/Dockerfile +++ b/Backend/Dockerfile @@ -9,6 +9,7 @@ ARG STRIPE_SECRET_KEY="" ARG STRIPE_CANCEL_URL="" ARG STRIPE_SUCCESS_URL="" ARG STRIPE_BILLING_RETURN_URL="" +ARG STRIPE_WHSEC="" ARG HOST="" ARG PORT="443" ARG DEVELOPMENT="" @@ -19,6 +20,7 @@ ENV STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY} ENV STRIPE_CANCEL_URL=${STRIPE_CANCEL_URL} ENV STRIPE_SUCCESS_URL=${STRIPE_SUCCESS_URL} ENV STRIPE_BILLING_RETURN_URL=${STRIPE_BILLING_RETURN_URL} +ENV STRIPE_WHSEC=${STRIPE_WHSEC} ENV HOST=${HOST} ENV PORT=${PORT} ENV DEVELOPMENT=${DEVELOPMENT} diff --git a/Backend/bin/app-amd64-linux b/Backend/bin/app-amd64-linux index d9117e8..cf531fc 100755 Binary files a/Backend/bin/app-amd64-linux and b/Backend/bin/app-amd64-linux differ diff --git a/Backend/bin/pb_hooks/main.pb.js b/Backend/bin/pb_hooks/main.pb.js new file mode 100644 index 0000000..0e627f5 --- /dev/null +++ b/Backend/bin/pb_hooks/main.pb.js @@ -0,0 +1,20 @@ +onRecordAfterCreateRequest((e) => { + const message = new MailerMessage({ + from: { + address: $app.settings().meta.senderAddress, + name: $app.settings().meta.senderName, + }, + to: [{address: e.record.email()}], + subject: "YOUR_SUBJECT...", + html: "YOUR_HTML_BODY...", + // bcc, cc and custom headers are also supported... + }) + + $app.newMailClient().send(message) +}, "user") + +routerAdd("GET", "/hello/:name", (c) => { + let name = c.pathParam("name") + + return c.json(200, { "message": "Hello " + name }) +}) \ No newline at end of file diff --git a/Backend/compose.yaml b/Backend/compose.yaml index a643988..1b2be57 100644 --- a/Backend/compose.yaml +++ b/Backend/compose.yaml @@ -9,6 +9,7 @@ services: STRIPE_SUCCESS_URL: https://fastpocket.dev/account STRIPE_CANCEL_URL: https://fastpocket.dev/pricing STRIPE_BILLING_RETURN_URL: https://fastpocket.dev/account + STRIPE_WHSEC: whsec_3CwRHq3in97luW9zKAsVvmy2MUfib6vT PORT: 8090 DEVELOPMENT: "" platform: linux/amd64 diff --git a/Backend/fly.toml b/Backend/fly.toml index 2fde9c5..3baed14 100644 --- a/Backend/fly.toml +++ b/Backend/fly.toml @@ -15,6 +15,7 @@ primary_region = 'syd' STRIPE_SUCCESS_URL = 'https://www.fastpocket.dev/account' STRIPE_CANCEL_URL = 'https://www.fastpocket.dev/pricing' STRIPE_BILLING_RETURN_URL = 'https://www.fastpocket.dev/account' + STRIPE_WHSEC = 'whsec_3CwRHq3in97luW9zKAsVvmy2MUfib6vT' # requires STRIPE_SECRET_KEY = '{sk_live_...}' to be setup as a secret # see: https://fly.io/docs/reference/secrets/#setting-secrets diff --git a/Backend/main.go b/Backend/main.go index 4779472..4d1e159 100644 --- a/Backend/main.go +++ b/Backend/main.go @@ -7,7 +7,6 @@ import ( "log" "net/http" "os" - "strings" "time" "github.com/labstack/echo/v5" @@ -41,18 +40,19 @@ func int64ToISODate(timestamp int64) string { func main() { // Retreive stripe generated webhook secret - SECRET_TXT, err := os.ReadFile("secret.txt") - if err != nil { - log.Fatal(err) - } - WHSEC := strings.ReplaceAll(string(SECRET_TXT), "\n", "") - log.Print(WHSEC) + // SECRET_TXT, err := os.ReadFile("secret.txt") + // if err != nil { + // log.Fatal(err) + // } + // WHSEC := strings.ReplaceAll(string(SECRET_TXT), "\n", "") + // log.Print(WHSEC) app := pocketbase.New() // Retreive your STRIPE_SECRET_KEY from environment variables stripe.Key = os.Getenv("STRIPE_SECRET_KEY") stripeSuccessURL := os.Getenv("STRIPE_SUCCESS_URL") stripeCancelURL := os.Getenv("STRIPE_CANCEL_URL") stripeBillingReturnURL := os.Getenv("STRIPE_BILLING_RETURN_URL") + WHSEC := os.Getenv("STRIPE_WHSEC") app.OnBeforeServe().Add(func(e *core.ServeEvent) error { e.Router.POST("/create-checkout-session", func(c echo.Context) error { // 1. Destructure the price and quantity from the POST body diff --git a/Backend/script.sh b/Backend/script.sh index 959ebc9..b119711 100644 --- a/Backend/script.sh +++ b/Backend/script.sh @@ -3,6 +3,7 @@ echo "STRIPE_SECRET_KEY = $STRIPE_SECRET_KEY" echo "STRIPE_CANCEL_URL = $STRIPE_CANCEL_URL" echo "STRIPE_SUCCESS_URL = $STRIPE_SUCCESS_URL" +echo "STRIPE_WHSEC = $STRIPE_WHSEC" echo "HOST = $HOST" echo "PORT = $PORT" echo "DEVELOPMENT = $DEVELOPMENT" @@ -17,10 +18,10 @@ if [[ -n "$DEVELOPMENT" ]]; then # Serve Online elif [[ -n "$HOST" && -n "$STRIPE_SECRET_KEY" ]]; then echo "Serving Online..." - nohup stripe listen --print-secret --api-key "$STRIPE_SECRET_KEY" > secret.txt & - wait $! - echo "WHSEC = $( stripe.out 2>&1 & + # nohup stripe listen --print-secret --api-key "$STRIPE_SECRET_KEY" > secret.txt & + # wait $! + # echo "WHSEC = $( stripe.out 2>&1 & nohup ./bin/app-amd64-linux serve --http "0.0.0.0:8090" # Error else