Merge branch '1464-remove--migrate-away-from-legacy-connect-account-types'

Author: chrisjsimpson

.gitignore

@@ -56,3 +56,5 @@ emails
 *.bk
 email-queue
 uploads/*
+*.deb
+stripe_listen.log

README.md

@@ -149,6 +149,8 @@ export FLASK_APP=subscribie
 export FLASK_DEBUG=1
 flask db upgrade
 flask initdb # (recommended- gives you some example data)
+# Note if using rye (no longer maintained) use:
+# rye sync --features test # to install test requirements
 ```
 
 The database file is called `data.db`. Note,

docs/README.md

@@ -8,7 +8,11 @@ You can find out more about how to install Hugo for your environment in our
 [Getting started](https://www.docsy.dev/docs/getting-started/#prerequisites-and-installation) guide.
 
 On `Ubuntu Linux`? You can download from [Hugu Releases on GitHub](https://github.com/gohugoio/hugo/releases) 
-e.g. `hugo_extended_0.105.0_linux-amd64.deb` then `sudo dpkg -i hugo_extended_0.105.0_linux-amd64.deb`
+e.g. 
+
+```shell
+wget https://github.com/gohugoio/hugo/releases/download/v0.105.0/hugo_extended_0.105.0_linux-amd64.deb && sudo dpkg -i hugo_extended_0.105.0_linux-amd64.deb
+```
 
 > Remember, you must download/install the **extended** version.
 

docs/content/en/docs/Architecture/testing.md

@@ -85,6 +85,32 @@ Remember Stripe will give you a key valid for 90 days, if you get the following
 Error while authenticating with Stripe: Authorization failed, status=401
 ```
 
+#### Time machine webhook validation with Stripe Test Clocks
+
+The following verifies that changes to the `application_fee_amount` get applied to future invoices generated by *existing* active Subscriptions. Such invoices are generated by the `subscription_cycle` billing reason.
+
+This script creates an isolated Stripe Connected Account, provisions a Customer and Subscription attached to a time-frozen "Test Clock", and then advances the clock exactly one month into the future to force Stripe to generate a new recurring draft invoice.
+
+**How to run the automated Test Clock simulation script:**
+
+
+1. Ensure your local Flask application is running (See [Quickstart without docker](https://github.com/Subscribie/subscribie?tab=readme-ov-file#quickstart-without-docker)).
+2. In a separate terminal, start the Stripe webhook forwarder as instructed above:
+   ```bash
+   stripe listen --events checkout.session.completed,payment_intent.succeeded,payment_intent.payment_failed,invoice.created --forward-to 127.0.0.1:5000/stripe_webhook --forward-connect-to 127.0.0.1:5000/stripe_webhook
+   ```
+3. In a third terminal, activate your virtual environment and execute the simulation script:
+   ```bash
+   . venv/bin/activate
+   export PYTHONUNBUFFERED=1
+   python test_stripe_clock.py
+   ```
+
+Stripe takes **1-2 minutes** to compute a month of time in the background. Once the clock goes 'ready', Stripe will synchronously push the `invoice.created` webhook event to your local `<stripe listen>` broker.
+
+If successful, the script will catch the webhook modification, printing:
+`[SUCCESS] End-to-End verified! Local webhook caught the 'draft' invoice and successfully injected application_fee_amount: x` (these may also be verified visually in the Stripe dashboard with test mode activated).
+
 #### Bulk delete Stripe accounts
 
 > **Warning**

pyproject.toml

@@ -20,7 +20,6 @@ dependencies = [
     "stripe",
     "GitPython",
     "pathlib",
-    "pytest",
     "Flask-SQLAlchemy",
     "Flask-Migrate",
     "Flask-Babel",
@@ -59,3 +58,6 @@ allow-direct-references = true
 
 [tool.hatch.build.targets.wheel]
 packages = ["./"]
+
+[project.optional-dependencies]
+test = ["pytest"]

requirements-dev.lock

@@ -3,10 +3,11 @@
 #
 # last locked with the following flags:
 #   pre: false
-#   features: []
+#   features: ["test"]
 #   all-features: false
 #   with-sources: false
 #   generate-hashes: false
+#   universal: false
 
 -e file:.
 alembic==1.13.1

requirements.lock

@@ -3,10 +3,11 @@
 #
 # last locked with the following flags:
 #   pre: false
-#   features: []
+#   features: ["test"]
 #   all-features: false
 #   with-sources: false
 #   generate-hashes: false
+#   universal: false
 
 -e file:.
 alembic==1.13.1

start_stripe_listener.sh

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+# start_stripe_listener.sh
+# Script to easily run stripe listen in the background for local development.
+
+LOG_FILE="stripe_listen.log"
+PID_FILE=".stripe_listen.pid"
+
+# Check if already running
+if [ -f "$PID_FILE" ]; then
+    OLD_PID=$(cat "$PID_FILE")
+    if ps -p $OLD_PID > /dev/null; then
+        echo "Stripe listener is already running with PID $OLD_PID."
+        echo "Stop it first with: ./stop_stripe_listener.sh"
+        exit 1
+    else
+        # Process died but pid file remains, clean up
+        rm "$PID_FILE"
+    fi
+fi
+
+echo "Starting Stripe CLI listener..."
+
+# If STRIPE_TEST_SECRET_KEY is not in environment, fail and exit
+if [ -z "$STRIPE_TEST_SECRET_KEY" ]; then
+    echo "STRIPE_TEST_SECRET_KEY is not set. Please set it in your environment."
+    exit 1
+fi
+
+# Run stripe listen in the background
+# We use nohup so that closing the terminal doesn't kill it
+nohup stripe listen \
+  --api-key "${STRIPE_TEST_SECRET_KEY}" \
+  --events checkout.session.completed,payment_intent.succeeded,payment_intent.payment_failed,invoice.created \
+  --forward-to 127.0.0.1:5000/stripe_webhook \
+  --forward-connect-to 127.0.0.1:5000/stripe_webhook > "$LOG_FILE" 2>&1 &
+
+PID=$!
+echo $PID > "$PID_FILE"
+
+echo "✅ Stripe listener started in background (PID: $PID)."
+echo "📁 Logs are being written to $LOG_FILE"
+echo "🛑 To stop, run: ./stop_stripe_listener.sh"
+echo ""
+echo "Note: If the logs in $LOG_FILE show 'Please authenticate', run 'stripe login' interactive to refresh your token."
+echo "To view the logs, run: tail -f $LOG_FILE"

stop_stripe_listener.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# stop_stripe_listener.sh
+# Script to easily stop the stripe listener running in the background.
+
+PID_FILE=".stripe_listen.pid"
+
+if [ -f "$PID_FILE" ]; then
+    PID=$(cat "$PID_FILE")
+    if ps -p $PID > /dev/null; then
+        echo "Stopping Stripe listener (PID: $PID)..."
+        kill $PID
+        rm "$PID_FILE"
+        echo "✅ Stopped."
+    fi
+else
+    echo "Stripe listener not currently running (no $PID_FILE found)."
+fi

subscribie/blueprints/admin/__init__.py

@@ -341,7 +341,7 @@ def stripe_create_charge():
             amount=amount,
             currency=currency,
             payment_method_types=["card"],
-            application_fee_amount=int(amount * 0.025),
+            application_fee_amount=int(amount * 0.025) + 40,
             customer=customer,
             description=statement_descriptor_suffix,
             statement_descriptor_suffix=statement_descriptor_suffix,