From f7461342f9334ed677e61a1c7b2c33222d454e85 Mon Sep 17 00:00:00 2001
From: andypalmi <andrea@flowfuse.com>
Date: Tue, 4 Aug 2026 12:21:15 +0200
Subject: [PATCH 1/3] Add team broker admin API credentials for the Expert
 bridge

The Expert chat bridge provisions itself through the EMQX admin API, but
the forge config enabled the team broker without any broker.teamBroker.api
credentials, so the bridge failed to build (Invalid URL, no connector).
Add the api block, sourced from BROKER_API_KEY/BROKER_API_SECRET, and drive
the emqx-api bootstrap from the same variables so the two always match.
---
 .env.example       | 5 +++++
 docker-compose.yml | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 22de9d0..ae61e06 100644
--- a/.env.example
+++ b/.env.example
@@ -36,3 +36,8 @@ ASSISTANT_TOKEN=""
 EXPERT_URL="https://expert.flowfuse.com/v4/expert"
 EXPERT_TOKEN=""
 EXPERT_BROKER_SERVER="expert-broker.flowfuse.com"
+
+### Team broker admin API credentials (used to bootstrap the local EMQX and to
+### provision the Expert chat bridge). Both sides read the same values.
+BROKER_API_KEY="flowfuse"
+BROKER_API_SECRET="verySecret"
diff --git a/docker-compose.yml b/docker-compose.yml
index 0f0fe75..1ffd2bc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,6 +37,12 @@ configs:
         public_url: ws${TLS_ENABLED:+s}://mqtt.${DOMAIN:?error}
         teamBroker:
           enabled: true
+          # Admin API credentials for the local EMQX (bootstrapped in the emqx-api
+          # config below). Required for the Expert chat bridge to provision itself.
+          api:
+            url: http://broker:18083/api/v5
+            key: ${BROKER_API_KEY:-flowfuse}
+            secret: ${BROKER_API_SECRET:-verySecret}
       fileStore:
         enable: true
         url: http://file-server:3001
@@ -426,7 +432,7 @@ configs:
       }
   emqx-api:
     content: |
-      flowfuse:verySecret:administrator
+      ${BROKER_API_KEY:-flowfuse}:${BROKER_API_SECRET:-verySecret}:administrator
   npm-registry-config:
     content: |
       storage: /verdaccio/storage

From e49870a35ebdbf5ef014af06f0703eb84d1205b8 Mon Sep 17 00:00:00 2001
From: andypalmi <andrea@flowfuse.com>
Date: Tue, 4 Aug 2026 14:38:37 +0200
Subject: [PATCH 2/3] Leave broker admin API creds empty to use defaults

---
 .env.example | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index ae61e06..1bfd9ea 100644
--- a/.env.example
+++ b/.env.example
@@ -39,5 +39,5 @@ EXPERT_BROKER_SERVER="expert-broker.flowfuse.com"
 
 ### Team broker admin API credentials (used to bootstrap the local EMQX and to
 ### provision the Expert chat bridge). Both sides read the same values.
-BROKER_API_KEY="flowfuse"
-BROKER_API_SECRET="verySecret"
+BROKER_API_KEY=""
+BROKER_API_SECRET=""

From cd529c248b90aa35d27a3046eafae8ea85b0f04d Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Tue, 4 Aug 2026 13:47:01 +0100
Subject: [PATCH 3/3] Apply suggestion from @hardillb

---
 .env.example | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.env.example b/.env.example
index 1bfd9ea..aca2df7 100644
--- a/.env.example
+++ b/.env.example
@@ -39,5 +39,6 @@ EXPERT_BROKER_SERVER="expert-broker.flowfuse.com"
 
 ### Team broker admin API credentials (used to bootstrap the local EMQX and to
 ### provision the Expert chat bridge). Both sides read the same values.
+### Leave empty to use defaults
 BROKER_API_KEY=""
 BROKER_API_SECRET=""