From 11f47c057939cd0ebf4db2049171476d426f6dcb Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 7 Oct 2025 14:23:17 +0100
Subject: [PATCH 1/4] Add FF exclusive nodes feature flag

---
 forge/ee/lib/index.js                         |   1 +
 forge/routes/api/deviceLive.js                |  64 ++++++----
 forge/routes/api/project.js                   |  66 +++++-----
 forge/routes/api/settings.js                  |   6 +-
 forge/settings/defaults.js                    |  10 +-
 .../src/pages/admin/CertifiedNodes/index.vue  | 117 ++++--------------
 .../TeamTypes/dialogs/TeamTypeEditDialog.vue  |   1 +
 frontend/src/pages/admin/routes.js            |   2 +-
 frontend/src/store/modules/account/index.js   |   2 +
 frontend/src/store/modules/ux/index.js        |   2 +-
 10 files changed, 112 insertions(+), 159 deletions(-)

diff --git a/forge/ee/lib/index.js b/forge/ee/lib/index.js
index 4f13e2ad6f..4b7fc5ba40 100644
--- a/forge/ee/lib/index.js
+++ b/forge/ee/lib/index.js
@@ -31,6 +31,7 @@ module.exports = fp(async function (app, opts) {
             app.decorate('tables', await require('./tables').init(app))
         }
         app.config.features.register('certifiedNodes', true, true)
+        app.config.features.register('ffNodes', true, true)
         app.config.features.register('rbacApplication', true, true)
     }
 
diff --git a/forge/routes/api/deviceLive.js b/forge/routes/api/deviceLive.js
index a6ef9290d4..bf2cd4417e 100644
--- a/forge/routes/api/deviceLive.js
+++ b/forge/routes/api/deviceLive.js
@@ -351,36 +351,46 @@ module.exports = async function (app) {
         }
 
         // Platform wide catalogue and npm registry
-        const platformNPMEnabled = !!app.config.features.enabled('certifiedNodes') && !!teamType.getFeatureProperty('certifiedNodes', false)
-        if (platformNPMEnabled) {
-            const npmRegURLString = app.settings.get('platform:certifiedNodes:npmRegistryURL')
-            const token = app.settings.get('platform:certifiedNodes:token')
-            const catalogueString = app.settings.get('platform:certifiedNodes:catalogueURL')
-            if (npmRegURLString && token && catalogueString) {
-                const npmRegURL = new URL(npmRegURLString)
-                const catalogue = new URL(catalogueString)
-                if (!response.palette) {
-                    response.palette = {}
+        const platformNPMEnabled = !!app.config.features.enabled('certifiedNodes', false) &&
+                                   !!app.config.features.enabled('ffNodes', false) &&
+                                   !!app.settings.get('platform:ff-npm-registry:token')
+        const certifiedNodesEnabledForTeam = teamType.getFeatureProperty('certifiedNodes', false)
+        const ffNodesEnabledForTeam = teamType.getFeatureProperty('ffNodes', false)
+
+        if (platformNPMEnabled && (certifiedNodesEnabledForTeam || ffNodesEnabledForTeam)) {
+            try {
+                const npmRegURL = new URL(app.settings.get('platform:ff-npm-registry:url') || 'https://registry.flowfuse.com/')
+                const token = app.settings.get('platform:ff-npm-registry:token')
+
+                const certNodesCatalogue = app.settings.get('platform:ff-npm-registry:catalogue:certifiedNodes') || 'https://ff-certified-nodes.flowfuse.cloud/catalogue.json'
+                const ffNodesCatalogue = app.settings.get('platform:ff-npm-registry:catalogue:ffNodes') || 'https://ff-certified-nodes.flowfuse.cloud/ff-catalogue.json'
+
+                // Handle FF Exclusive Nodes
+
+                if (certNodesCatalogue || ffNodesCatalogue) {
+                    // At least one is configured - so initialise the settings
+                    response.palette = response.palette || {}
+                    response.palette.catalogue = response.palette.catalogue || []
+                }
+                function updateSettingsForCatalogue (scope, catalogueString) {
+                    const catalogue = new URL(catalogueString)
+                    response.palette.catalogue.push(catalogue.toString())
+                    const npmrcEntry = `${scope}:registry=${npmRegURL.toString()}\n` +
+                          `//${npmRegURL.host}:_auth="${token}"\n`
+                    if (response.palette.npmrc) {
+                        response.palette.npmrc += '\n' + npmrcEntry
+                    } else {
+                        response.palette.npmrc = npmrcEntry
+                    }
                 }
-                if (response.palette?.catalogues) {
-                    response.palette.catalogues
-                        .push(catalogue.toString())
-                } else {
-                    response.palette.catalogues = [
-                        catalogue.toString()
-                    ]
+                if (certifiedNodesEnabledForTeam && certNodesCatalogue) {
+                    updateSettingsForCatalogue('@flowfuse-certified-nodes', certNodesCatalogue)
                 }
-                if (response.palette?.npmrc) {
-                    response.palette.npmrc = `${response.palette.npmrc}\n` +
-                        `@flowfuse-certified-nodes:registry=${npmRegURL.toString()}\n` +
-                        `@flowfuse-nodes:registry=${npmRegURL.toString()}\n` +
-                        `//${npmRegURL.host}:_auth="${token}"\n`
-                } else {
-                    response.palette.npmrc =
-                        `@flowfuse-certified-nodes:registry=${npmRegURL.toString()}\n` +
-                        `@flowfuse-nodes:registry=${npmRegURL.toString()}\n` +
-                        `//${npmRegURL.host}:_auth="${token}"\n`
+                if (ffNodesEnabledForTeam && ffNodesCatalogue) {
+                    updateSettingsForCatalogue('@flowfuse-nodes', ffNodesCatalogue)
                 }
+            } catch (err) {
+                app.log.error('Failed to configure platform npm registry for device', err)
             }
         }
 
diff --git a/forge/routes/api/project.js b/forge/routes/api/project.js
index 4ed5ccba9c..896d971eb6 100644
--- a/forge/routes/api/project.js
+++ b/forge/routes/api/project.js
@@ -910,36 +910,46 @@ module.exports = async function (app) {
         }
 
         // Platform wide catalogue and npm registry
-        const platformNPMEnabled = !!app.config.features.enabled('certifiedNodes') && !!teamType.getFeatureProperty('certifiedNodes', false)
-        if (platformNPMEnabled) {
-            const npmRegURLString = app.settings.get('platform:certifiedNodes:npmRegistryURL')
-            const token = app.settings.get('platform:certifiedNodes:token')
-            const catalogueString = app.settings.get('platform:certifiedNodes:catalogueURL')
-            if (npmRegURLString && token && catalogueString) {
-                const npmRegURL = new URL(npmRegURLString)
-                const catalogue = new URL(catalogueString)
-                if (!settings.settings?.palette) {
-                    settings.settings.palette = {}
-                }
-                if (settings.settings?.palette?.catalogue) {
-                    settings.settings.palette.catalogue
-                        .push(catalogue.toString())
-                } else {
-                    settings.settings.palette.catalogue = [
-                        catalogue.toString()
-                    ]
+        const platformNPMEnabled = !!app.config.features.enabled('certifiedNodes', false) &&
+                                   !!app.config.features.enabled('ffNodes', false) &&
+                                   !!app.settings.get('platform:ff-npm-registry:token')
+
+        const certifiedNodesEnabledForTeam = teamType.getFeatureProperty('certifiedNodes', false)
+        const ffNodesEnabledForTeam = teamType.getFeatureProperty('ffNodes', false)
+        if (platformNPMEnabled && (certifiedNodesEnabledForTeam || ffNodesEnabledForTeam)) {
+            try {
+                const npmRegURL = new URL(app.settings.get('platform:ff-npm-registry:url') || 'https://registry.flowfuse.com/')
+                const token = app.settings.get('platform:ff-npm-registry:token')
+
+                const certNodesCatalogue = app.settings.get('platform:ff-npm-registry:catalogue:certifiedNodes') || 'https://ff-certified-nodes.flowfuse.cloud/catalogue.json'
+                const ffNodesCatalogue = app.settings.get('platform:ff-npm-registry:catalogue:ffNodes') || 'https://ff-certified-nodes.flowfuse.cloud/ff-catalogue.json'
+
+                // Handle FF Exclusive Nodes
+
+                if (certNodesCatalogue || ffNodesCatalogue) {
+                    // At least one is configured - so initialise the settings
+                    settings.settings.palette = settings.settings.palette || {}
+                    settings.settings.palette.catalogue = settings.settings.palette.catalogue || []
+                }
+                function updateSettingsForCatalogue (scope, catalogueString) {
+                    const catalogue = new URL(catalogueString)
+                    settings.settings.palette.catalogue.push(catalogue.toString())
+                    const npmrcEntry = `${scope}:registry=${npmRegURL.toString()}\n` +
+                          `//${npmRegURL.host}:_auth="${token}"\n`
+                    if (settings.settings.palette.npmrc) {
+                        settings.settings.palette.npmrc += '\n' + npmrcEntry
+                    } else {
+                        settings.settings.palette.npmrc = npmrcEntry
+                    }
                 }
-                if (settings.settings?.palette?.npmrc) {
-                    settings.settings.palette.npmrc = `${settings.settings.palette.npmrc}\n` +
-                        `@flowfuse-certified-nodes:registry=${npmRegURL.toString()}\n` +
-                        `@flowfuse-nodes:registry=${npmRegURL.toString()}\n` +
-                        `//${npmRegURL.host}:_auth="${token}"\n`
-                } else {
-                    settings.settings.palette.npmrc =
-                        `@flowfuse-certified-nodes:registry=${npmRegURL.toString()}\n` +
-                        `@flowfuse-nodes:registry=${npmRegURL.toString()}\n` +
-                        `//${npmRegURL.host}:_auth="${token}"\n`
+                if (certifiedNodesEnabledForTeam && certNodesCatalogue) {
+                    updateSettingsForCatalogue('@flowfuse-certified-nodes', certNodesCatalogue)
                 }
+                if (ffNodesEnabledForTeam && ffNodesCatalogue) {
+                    updateSettingsForCatalogue('@flowfuse-nodes', ffNodesCatalogue)
+                }
+            } catch (err) {
+                app.log.error('Failed to configure platform npm registry for device', err)
             }
         }
 
diff --git a/forge/routes/api/settings.js b/forge/routes/api/settings.js
index 8e43f5beaf..c47ea7eb6f 100644
--- a/forge/routes/api/settings.js
+++ b/forge/routes/api/settings.js
@@ -89,10 +89,8 @@ module.exports = async function (app) {
                     }
                 })
                 response['platform:stats:token'] = app.settings.get('platform:stats:token')
-                if (app.config.features.enabled('certifiedNodes')) {
-                    response['platform:certifiedNodes:npmRegistryURL'] = app.settings.get('platform:certifiedNodes:npmRegistryURL')
-                    response['platform:certifiedNodes:token'] = app.settings.get('platform:certifiedNodes:token')
-                    response['platform:certifiedNodes:catalogueURL'] = app.settings.get('platform:certifiedNodes:catalogueURL')
+                if (app.config.features.enabled('certifiedNodes') || app.config.features.enabled('ffNodes')) {
+                    response['platform:ff-npm-registry:enabled'] = !!app.settings.get('platform:ff-npm-registry:token')
                 }
             }
             if (app.config.features.enabled('sso') && app.settings.get('platform:sso:google') && app.settings.get('platform:sso:google:clientId')) {
diff --git a/forge/settings/defaults.js b/forge/settings/defaults.js
index 76d6e680f1..79a9e29a8c 100644
--- a/forge/settings/defaults.js
+++ b/forge/settings/defaults.js
@@ -71,9 +71,9 @@ module.exports = {
     'platform:sso:google:clientId': null, // Client ID for Google SSO
     'platform:sso:direct': false, // Direct SSO Login
 
-    // Certified Nodes
-    'platform:certifiedNodes:npmRegistryURL': null, // NPM registry URL for certified nodes
-    'platform:certifiedNodes:token': null, // Token for certified nodes
-    'platform:certifiedNodes:catalogueURL': null // Catalogue URL for certified nodes
-
+    // FlowFuse npm registry
+    'platform:ff-npm-registry:url': null,
+    'platform:ff-npm-registry:token': null,
+    'platform:ff-npm-registry:catalogue:certifiedNodes': null,
+    'platform:ff-npm-registry:catalogue:ffNodes': null
 }
diff --git a/frontend/src/pages/admin/CertifiedNodes/index.vue b/frontend/src/pages/admin/CertifiedNodes/index.vue
index 28f61dc488..4121fdc157 100644
--- a/frontend/src/pages/admin/CertifiedNodes/index.vue
+++ b/frontend/src/pages/admin/CertifiedNodes/index.vue
@@ -1,26 +1,15 @@
 <template>
     <ff-page>
         <template #header>
-            <ff-page-header title="Certified Nodes" :tabs="sideNavigation" />
+            <ff-page-header title="FlowFuse Nodes" :tabs="sideNavigation" />
         </template>
         <div class="flex-grow">
             <ff-loading v-if="loading" message="Saving Settings..." />
-            <FormRow v-model="input['platform:certifiedNodes:npmRegistryURL']" :label="'NPM Registry URL'" :error="errors['platform:certifiedNodes:npmRegistryURL']">
-                NPM Registry URL for Certified Nodes
+            <FormRow v-model="input.registryToken" type="password" :label="'FlowFuse Registry Token'">
+                Access token for the FlowFuse NPM registry
                 <template #description>
-                    The URL of the NPM registry to use for certified nodes.
-                </template>
-            </FormRow>
-            <FormRow v-model="input['platform:certifiedNodes:token']" :label="'NPM Registry Token'" :error="errors['platform:certifiedNodes:token']">
-                NPM Registry Authentication Token
-                <template #description>
-                    The authentication token for the NPM registry to use for certified nodes.
-                </template>
-            </FormRow>
-            <FormRow v-model="input['platform:certifiedNodes:catalogueURL']" :label="'Node-RED Catalogue URL'" :error="errors['platform:certifiedNodes:catalogueURL']">
-                Node-RED Catalogue URL
-                <template #description>
-                    The URL of the Node-RED catalogue to use for certified nodes.
+                    Access to Certified Nodes, or FlowFuse Exclusive nodes requires an access token for the FlowFuse NPM registry.
+                    To obtain an access token, please contact <a target="_blank" class="underline" href="https://flowfuse.com/support">FlowFuse Support</a>.
                 </template>
             </FormRow>
             <div class="pt-8">
@@ -37,12 +26,6 @@ import settingsApi from '../../../api/settings.js'
 import FormRow from '../../../components/FormRow.vue'
 import Alerts from '../../../services/alerts.js'
 
-const validSettings = [
-    'platform:certifiedNodes:npmRegistryURL',
-    'platform:certifiedNodes:token',
-    'platform:certifiedNodes:catalogueURL'
-]
-
 export default {
     name: 'AdminCertifiedNodes',
     components: {
@@ -50,12 +33,13 @@ export default {
     },
     data () {
         return {
+            placeholderToken: '********',
             loading: false,
-            input: {},
+            input: {
+                registryToken: ''
+            },
             errors: {
-                'platform:certifiedNodes:npmRegistryURL': '',
-                'platform:certifiedNodes:token': '',
-                'platform:certifiedNodes:catalogueURL': ''
+                'platform:ff-npm-registry:token': ''
             }
         }
     },
@@ -64,86 +48,33 @@ export default {
         sideNavigation () {
             return []
         },
-        isLicensed () {
-            return !!this.settings['platform:licensed']
-        },
         saveEnabled () {
-            let result = false
-            if (this.validate()) {
-                validSettings.forEach((s) => {
-                    result = result || (this.input[s] !== this.settings[s])
-                })
+            if (this.settings['platform:ff-npm-registry:enabled']) {
+                return this.input.registryToken !== this.placeholderToken
             }
-            return result
+            return this.input.registryToken !== ''
         }
     },
     created () {
-        validSettings.forEach(s => {
-            this.input[s] = this.settings[s]
-        })
+        if (this.settings['platform:ff-npm-registry:enabled']) {
+            this.input.registryToken = this.placeholderToken
+        }
     },
     methods: {
         ...mapActions('account', ['refreshSettings']),
-        validate () {
-            if (this.input['platform:certifiedNodes:npmRegistryURL']) {
-                try {
-                    const url = new URL(this.input['platform:certifiedNodes:npmRegistryURL'])
-                    // const url = URL.parse(this.input['platform:certifiedNodes:npmRegistryURL'])
-                    if (url.protocol !== 'http:' && url.protocol !== 'https:') {
-                        this.errors['platform:certifiedNodes:npmRegistryURL'] = 'Invalid URL'
-                        return false
-                    } else {
-                        this.errors['platform:certifiedNodes:npmRegistryURL'] = ''
-                    }
-                } catch (e) {
-                    this.errors['platform:certifiedNodes:npmRegistryURL'] = 'Invalid URL'
-                    return false
-                }
-            } else {
-                this.errors['platform:certifiedNodes:npmRegistryURL'] = ''
-            }
-
-            if (this.input['platform:certifiedNodes:catalogueURL']) {
-                try {
-                    const url = new URL(this.input['platform:certifiedNodes:catalogueURL'])
-                    // const url = URL.parse(this.input['platform:certifiedNodes:catalogueURL'])
-                    if (url.protocol !== 'http:' && url.protocol !== 'https:') {
-                        this.errors['platform:certifiedNodes:catalogueURL'] = 'Invalid URL'
-                        return false
-                    } else {
-                        this.errors['platform:certifiedNodes:catalogueURL'] = ''
-                    }
-                } catch (e) {
-                    this.errors['platform:certifiedNodes:catalogueURL'] = 'Invalid URL'
-                    return false
-                }
-            } else {
-                this.errors['platform:certifiedNodes:catalogueURL'] = ''
-            }
-
-            if (this.input['platform:certifiedNodes:npmRegistryURL'] &&
-                this.input['platform:certifiedNodes:catalogueURL'] &&
-                !this.input['platform:certifiedNodes:token']) {
-                this.errors['platform:certifiedNodes:token'] = 'Token is required when NPM Registry URL is set'
-                return false
-            } else {
-                this.errors['platform:certifiedNodes:token'] = ''
-            }
-
-            return true
-        },
         async saveChanges () {
             this.loading = true
-            const options = {}
-            validSettings.forEach((s) => {
-                if (this.input[s] !== this.settings[s]) {
-                    options[s] = this.input[s]
-                }
-            })
-
+            const options = {
+                'platform:ff-npm-registry:token': this.input.registryToken
+            }
             settingsApi.updateSettings(options)
                 .then(async () => {
                     await this.refreshSettings()
+                    if (this.settings['platform:ff-npm-registry:enabled']) {
+                        // Set the placeholder to the same length as the just-saved token, so
+                        // it doesn't change
+                        this.placeholderToken = this.input.registryToken
+                    }
                     Alerts.emit('Settings changed successfully.', 'confirmation')
                 })
                 .catch(async (err) => {
diff --git a/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue b/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue
index 2d4e677987..e67ae1ed85 100644
--- a/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue
+++ b/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue
@@ -137,6 +137,7 @@
                     <FormRow v-model="input.properties.features.instanceResources" type="checkbox">Instance Resources</FormRow>
                     <FormRow v-model="input.properties.features.tables" type="checkbox">Tables</FormRow>
                     <FormRow v-model="input.properties.features.certifiedNodes" type="checkbox">Certified Nodes</FormRow>
+                    <FormRow v-model="input.properties.features.ffNodes" type="checkbox">FlowFuse Exclusive Nodes</FormRow>
                     <FormRow v-model="input.properties.features.generatedSnapshotDescription" type="checkbox">Generated Snapshot Descriptions</FormRow>
                     <FormRow v-model="input.properties.features.assistantInlineCompletions" type="checkbox">Assistant Inline Code Completions</FormRow>
                     <FormRow v-model="input.properties.features.rbacApplication" type="checkbox">Application-level RBAC</FormRow>
diff --git a/frontend/src/pages/admin/routes.js b/frontend/src/pages/admin/routes.js
index d7c66579bf..dd3e674bb2 100644
--- a/frontend/src/pages/admin/routes.js
+++ b/frontend/src/pages/admin/routes.js
@@ -219,7 +219,7 @@ export default [
                 path: 'certified-nodes',
                 component: AdminCertifiedNodes,
                 meta: {
-                    title: 'Admin - Certified Nodes'
+                    title: 'Admin - FlowFuse Nodes'
                 }
             }
         ]
diff --git a/frontend/src/store/modules/account/index.js b/frontend/src/store/modules/account/index.js
index 05c62ec813..3900858640 100644
--- a/frontend/src/store/modules/account/index.js
+++ b/frontend/src/store/modules/account/index.js
@@ -205,6 +205,8 @@ const getters = {
 
             // Certified Nodes
             isCertifiedNodesFeatureEnabledForPlatform: !!state.features?.certifiedNodes,
+            // FlowFuse Nodes
+            isFlowFuseNodesFeatureEnabledForPlatform: !!state.features?.ffNodes,
 
             // Static Assets
             isStaticAssetFeatureEnabledForPlatform: !!state.features?.staticAssets,
diff --git a/frontend/src/store/modules/ux/index.js b/frontend/src/store/modules/ux/index.js
index 50354d854f..b51b9f8b70 100644
--- a/frontend/src/store/modules/ux/index.js
+++ b/frontend/src/store/modules/ux/index.js
@@ -132,7 +132,7 @@ const getters = {
                         featureUnavailable: !features.isBlueprintsFeatureEnabledForPlatform
                     },
                     {
-                        label: 'Certified Nodes',
+                        label: 'FlowFuse Nodes',
                         to: { name: 'admin-certified-nodes' },
                         tag: 'admin-certified-nodes',
                         icon: CollectionIcon,

From 56da996d72f7dced16cbfca99879a128bf6db42b Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 7 Oct 2025 16:12:53 +0100
Subject: [PATCH 2/4] Fix tests for device/project settings

---
 forge/routes/api/deviceLive.js             |  4 +-
 test/unit/forge/routes/api/device_spec.js  | 59 +++++++++++++++++++---
 test/unit/forge/routes/api/project_spec.js | 27 ++++++++--
 test/unit/forge/routes/setup.js            |  8 +--
 4 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/forge/routes/api/deviceLive.js b/forge/routes/api/deviceLive.js
index bf2cd4417e..2d18d6fe27 100644
--- a/forge/routes/api/deviceLive.js
+++ b/forge/routes/api/deviceLive.js
@@ -370,11 +370,11 @@ module.exports = async function (app) {
                 if (certNodesCatalogue || ffNodesCatalogue) {
                     // At least one is configured - so initialise the settings
                     response.palette = response.palette || {}
-                    response.palette.catalogue = response.palette.catalogue || []
+                    response.palette.catalogues = response.palette.catalogues || []
                 }
                 function updateSettingsForCatalogue (scope, catalogueString) {
                     const catalogue = new URL(catalogueString)
-                    response.palette.catalogue.push(catalogue.toString())
+                    response.palette.catalogues.push(catalogue.toString())
                     const npmrcEntry = `${scope}:registry=${npmRegURL.toString()}\n` +
                           `//${npmRegURL.host}:_auth="${token}"\n`
                     if (response.palette.npmrc) {
diff --git a/test/unit/forge/routes/api/device_spec.js b/test/unit/forge/routes/api/device_spec.js
index a5ec3463fa..df4b3a4fc0 100644
--- a/test/unit/forge/routes/api/device_spec.js
+++ b/test/unit/forge/routes/api/device_spec.js
@@ -1427,28 +1427,73 @@ describe('Device API', async function () {
             })
         })
         describe('device certified nodes', function () {
+            async function setTeamFlags (certifiedNodes, ffNodes) {
+                const defaultTeamTypeProperties = app.defaultTeamType.properties
+                defaultTeamTypeProperties.features = defaultTeamTypeProperties.features || {}
+                defaultTeamTypeProperties.features.certifiedNodes = certifiedNodes
+                defaultTeamTypeProperties.features.ffNodes = ffNodes
+                app.defaultTeamType.properties = defaultTeamTypeProperties
+                await app.defaultTeamType.save()
+            }
             before(async function () {
                 const license = 'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJGbG93Rm9yZ2UgSW5jLiIsInN1YiI6IkZsb3dGb3JnZSBJbmMuIERldmVsb3BtZW50IiwibmJmIjoxNjYyNTk1MjAwLCJleHAiOjc5ODcwNzUxOTksIm5vdGUiOiJEZXZlbG9wbWVudC1tb2RlIE9ubHkuIE5vdCBmb3IgcHJvZHVjdGlvbiIsInVzZXJzIjoxNTAsInRlYW1zIjo1MCwicHJvamVjdHMiOjUwLCJkZXZpY2VzIjoyLCJkZXYiOnRydWUsImlhdCI6MTY2MjY1MzkyMX0.Tj4fnuDuxi_o5JYltmVi1Xj-BRn0aEjwRPa_fL2MYa9MzSwnvJEd-8bsRM38BQpChjLt-wN-2J21U7oSq2Fp5A'
                 await app.close()
                 await setupApp(license)
+
+                await app.settings.set('platform:ff-npm-registry:url', 'https://localhost:1234')
+                await app.settings.set('platform:ff-npm-registry:token', 'verySecret')
+                await app.settings.set('platform:ff-npm-registry:catalogue:certifiedNodes', 'https://localhost/cert-nodes-catalogue.json')
+                await app.settings.set('platform:ff-npm-registry:catalogue:ffNodes', 'https://localhost/ff-nodes-catalogue.json')
             })
             after(async function () {
                 // After this set of tests, close the app and recreate (ie remove the license)
                 await app.close()
                 await setupApp()
             })
-            it('can handle Certified Nodes', async function () {
-                await app.settings.set('platform:certifiedNodes:npmRegistryURL', 'https://localhost')
-                await app.settings.set('platform:certifiedNodes:token', 'verySecret')
-                await app.settings.set('platform:certifiedNodes:catalogueURL', 'https://localhost/catalogue.json')
+            it('does not include any npm registry if no feature flags set', async function () {
                 const device = await createDevice({ name: 'CertifiedNodes', type: '', team: TestObjects.ATeam.hashid, as: TestObjects.tokens.alice })
+                const liveSettings = await getLiveSettings(device)
+                liveSettings.should.not.have.property('palette')
+            })
 
+            it('includes cert nodes settings if feature flag is set', async function () {
+                await setTeamFlags(true, false)
+                const device = await createDevice({ name: 'CertifiedNodes', type: '', team: TestObjects.ATeam.hashid, as: TestObjects.tokens.alice })
+                const liveSettings = await getLiveSettings(device)
+                liveSettings.palette.should.have.property('catalogues')
+                liveSettings.palette.catalogues.should.containEql('https://localhost/cert-nodes-catalogue.json')
+                liveSettings.palette.catalogues.should.not.containEql('https://localhost/ff-nodes-catalogue.json')
+                liveSettings.palette.should.have.property('npmrc')
+                liveSettings.palette.npmrc.should.equal(`@flowfuse-certified-nodes:registry=https://localhost:1234/
+//localhost:1234:_auth="verySecret"
+`)
+            })
+            it('includes ff-nodes if feature flag is set', async function () {
+                await setTeamFlags(false, true)
+                const device = await createDevice({ name: 'CertifiedNodes', type: '', team: TestObjects.ATeam.hashid, as: TestObjects.tokens.alice })
+                const liveSettings = await getLiveSettings(device)
+                liveSettings.palette.should.have.property('catalogues')
+                liveSettings.palette.catalogues.should.not.containEql('https://localhost/cert-nodes-catalogue.json')
+                liveSettings.palette.catalogues.should.containEql('https://localhost/ff-nodes-catalogue.json')
+                liveSettings.palette.should.have.property('npmrc')
+                liveSettings.palette.npmrc.should.equal(`@flowfuse-nodes:registry=https://localhost:1234/
+//localhost:1234:_auth="verySecret"
+`)
+            })
+            it('includes both cert nodes and ff-nodes if feature flag is set', async function () {
+                await setTeamFlags(true, true)
+                const device = await createDevice({ name: 'CertifiedNodes', type: '', team: TestObjects.ATeam.hashid, as: TestObjects.tokens.alice })
                 const liveSettings = await getLiveSettings(device)
-                liveSettings.should.have.property('palette')
                 liveSettings.palette.should.have.property('catalogues')
-                liveSettings.palette.catalogues.should.containEql('https://localhost/catalogue.json')
+                liveSettings.palette.catalogues.should.containEql('https://localhost/cert-nodes-catalogue.json')
+                liveSettings.palette.catalogues.should.containEql('https://localhost/ff-nodes-catalogue.json')
                 liveSettings.palette.should.have.property('npmrc')
-                liveSettings.palette.npmrc.should.equal('@flowfuse-certified-nodes:registry=https://localhost/\n@flowfuse-nodes:registry=https://localhost/\n//localhost:_auth="verySecret"\n')
+                liveSettings.palette.npmrc.should.equal(`@flowfuse-certified-nodes:registry=https://localhost:1234/
+//localhost:1234:_auth="verySecret"
+
+@flowfuse-nodes:registry=https://localhost:1234/
+//localhost:1234:_auth="verySecret"
+`)
             })
         })
 
diff --git a/test/unit/forge/routes/api/project_spec.js b/test/unit/forge/routes/api/project_spec.js
index 56127a48ea..964ae5acab 100644
--- a/test/unit/forge/routes/api/project_spec.js
+++ b/test/unit/forge/routes/api/project_spec.js
@@ -978,10 +978,21 @@ describe('Project API', function () {
                 runtimeSettings.settings.palette.should.not.have.property('npmrc')
                 runtimeSettings.settings.palette.should.not.have.property('catalogue')
             })
+            async function setTeamFlags (certifiedNodes, ffNodes) {
+                const defaultTeamTypeProperties = app.defaultTeamType.properties
+                defaultTeamTypeProperties.features = defaultTeamTypeProperties.features || {}
+                defaultTeamTypeProperties.features.certifiedNodes = certifiedNodes
+                defaultTeamTypeProperties.features.ffNodes = ffNodes
+                app.defaultTeamType.properties = defaultTeamTypeProperties
+                await app.defaultTeamType.save()
+            }
             it('Should include certified nodes', async function () {
-                await app.settings.set('platform:certifiedNodes:npmRegistryURL', 'https://localhost')
-                await app.settings.set('platform:certifiedNodes:token', 'verySecret')
-                await app.settings.set('platform:certifiedNodes:catalogueURL', 'https://localhost/catalogue.json')
+                await app.settings.set('platform:ff-npm-registry:url', 'https://localhost:1234')
+                await app.settings.set('platform:ff-npm-registry:token', 'verySecret')
+                await app.settings.set('platform:ff-npm-registry:catalogue:certifiedNodes', 'https://localhost/cert-nodes-catalogue.json')
+                await app.settings.set('platform:ff-npm-registry:catalogue:ffNodes', 'https://localhost/ff-nodes-catalogue.json')
+
+                await setTeamFlags(true, true)
 
                 const projectName = generateProjectName()
                 const response = await app.inject({
@@ -1013,9 +1024,15 @@ describe('Project API', function () {
                 settings.should.have.property('palette')
                 settings.palette.should.have.property('npmrc')
                 settings.palette.should.have.property('catalogue')
-                settings.palette.catalogue.should.containEql('https://localhost/catalogue.json')
+                settings.palette.catalogue.should.containEql('https://localhost/cert-nodes-catalogue.json')
+                settings.palette.catalogue.should.containEql('https://localhost/ff-nodes-catalogue.json')
                 settings.palette.should.have.property('npmrc')
-                settings.palette.npmrc.should.equal('@flowfuse-certified-nodes:registry=https://localhost/\n@flowfuse-nodes:registry=https://localhost/\n//localhost:_auth="verySecret"\n')
+                settings.palette.npmrc.should.equal(`@flowfuse-certified-nodes:registry=https://localhost:1234/
+//localhost:1234:_auth="verySecret"
+
+@flowfuse-nodes:registry=https://localhost:1234/
+//localhost:1234:_auth="verySecret"
+`)
             })
         })
 
diff --git a/test/unit/forge/routes/setup.js b/test/unit/forge/routes/setup.js
index 777f601022..b12b42c4f4 100644
--- a/test/unit/forge/routes/setup.js
+++ b/test/unit/forge/routes/setup.js
@@ -70,13 +70,7 @@ module.exports = async function (config = {}) {
     defaultTeamTypeProperties.instances = {
         [projectType.hashid]: { active: true }
     }
-    if (defaultTeamTypeProperties.features) {
-        defaultTeamTypeProperties.features.certifiedNodes = true
-    } else {
-        defaultTeamTypeProperties.features = {
-            certifiedNodes: true
-        }
-    }
+
     forge.defaultTeamType.properties = defaultTeamTypeProperties
     await forge.defaultTeamType.save()
 

From f1a7b24110c1f1d553e1a0aa3c071b1021b0d2a5 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 8 Oct 2025 14:32:00 +0100
Subject: [PATCH 3/4] Allow registry config to be set via yml

---
 forge/routes/api/deviceLive.js                |  7 ++---
 forge/routes/api/project.js                   |  7 ++---
 forge/settings/defaults.js                    |  9 +++---
 .../TeamTypes/dialogs/TeamTypeEditDialog.vue  |  2 +-
 test/unit/forge/routes/api/device_spec.js     | 31 ++++++++++++-------
 test/unit/forge/routes/api/project_spec.js    | 24 ++++++++------
 6 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/forge/routes/api/deviceLive.js b/forge/routes/api/deviceLive.js
index 2d18d6fe27..9483c70990 100644
--- a/forge/routes/api/deviceLive.js
+++ b/forge/routes/api/deviceLive.js
@@ -359,11 +359,10 @@ module.exports = async function (app) {
 
         if (platformNPMEnabled && (certifiedNodesEnabledForTeam || ffNodesEnabledForTeam)) {
             try {
-                const npmRegURL = new URL(app.settings.get('platform:ff-npm-registry:url') || 'https://registry.flowfuse.com/')
                 const token = app.settings.get('platform:ff-npm-registry:token')
-
-                const certNodesCatalogue = app.settings.get('platform:ff-npm-registry:catalogue:certifiedNodes') || 'https://ff-certified-nodes.flowfuse.cloud/catalogue.json'
-                const ffNodesCatalogue = app.settings.get('platform:ff-npm-registry:catalogue:ffNodes') || 'https://ff-certified-nodes.flowfuse.cloud/ff-catalogue.json'
+                const npmRegURL = new URL(app.config['ff-npm-registry']?.url || 'https://registry.flowfuse.com/')
+                const certNodesCatalogue = app.config['ff-npm-registry']?.catalogue?.certifiedNodes || 'https://ff-certified-nodes.flowfuse.cloud/catalogue.json'
+                const ffNodesCatalogue = app.config['ff-npm-registry']?.catalogue?.ffNodes || 'https://ff-certified-nodes.flowfuse.cloud/ff-catalogue.json'
 
                 // Handle FF Exclusive Nodes
 
diff --git a/forge/routes/api/project.js b/forge/routes/api/project.js
index 896d971eb6..dd91fa9cef 100644
--- a/forge/routes/api/project.js
+++ b/forge/routes/api/project.js
@@ -918,11 +918,10 @@ module.exports = async function (app) {
         const ffNodesEnabledForTeam = teamType.getFeatureProperty('ffNodes', false)
         if (platformNPMEnabled && (certifiedNodesEnabledForTeam || ffNodesEnabledForTeam)) {
             try {
-                const npmRegURL = new URL(app.settings.get('platform:ff-npm-registry:url') || 'https://registry.flowfuse.com/')
                 const token = app.settings.get('platform:ff-npm-registry:token')
-
-                const certNodesCatalogue = app.settings.get('platform:ff-npm-registry:catalogue:certifiedNodes') || 'https://ff-certified-nodes.flowfuse.cloud/catalogue.json'
-                const ffNodesCatalogue = app.settings.get('platform:ff-npm-registry:catalogue:ffNodes') || 'https://ff-certified-nodes.flowfuse.cloud/ff-catalogue.json'
+                const npmRegURL = new URL(app.config['ff-npm-registry']?.url || 'https://registry.flowfuse.com/')
+                const certNodesCatalogue = app.config['ff-npm-registry']?.catalogue?.certifiedNodes || 'https://ff-certified-nodes.flowfuse.cloud/catalogue.json'
+                const ffNodesCatalogue = app.config['ff-npm-registry']?.catalogue?.ffNodes || 'https://ff-certified-nodes.flowfuse.cloud/ff-catalogue.json'
 
                 // Handle FF Exclusive Nodes
 
diff --git a/forge/settings/defaults.js b/forge/settings/defaults.js
index 79a9e29a8c..d0fb2d8e45 100644
--- a/forge/settings/defaults.js
+++ b/forge/settings/defaults.js
@@ -72,8 +72,9 @@ module.exports = {
     'platform:sso:direct': false, // Direct SSO Login
 
     // FlowFuse npm registry
-    'platform:ff-npm-registry:url': null,
-    'platform:ff-npm-registry:token': null,
-    'platform:ff-npm-registry:catalogue:certifiedNodes': null,
-    'platform:ff-npm-registry:catalogue:ffNodes': null
+    'platform:ff-npm-registry:token': null
+    // The following properties can be overriden in the config yml file to point to a local registry for testing
+    // 'ff-npm-registry.url'
+    // 'ff-npm-registry.catalogue.certifiedNodes'
+    // 'ff-npm-registry.catalogue.ffNodes'
 }
diff --git a/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue b/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue
index e67ae1ed85..cbf10c36cb 100644
--- a/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue
+++ b/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue
@@ -142,7 +142,7 @@
                     <FormRow v-model="input.properties.features.assistantInlineCompletions" type="checkbox">Assistant Inline Code Completions</FormRow>
                     <FormRow v-model="input.properties.features.rbacApplication" type="checkbox">Application-level RBAC</FormRow>
                     <!-- to make the grid work nicely, only needed if there is an odd number of checkbox features above-->
-                    <!-- <span /> -->
+                    <span />
                     <FormRow v-model="input.properties.features.fileStorageLimit">Persistent File storage limit (Mb)</FormRow>
                     <FormRow v-model="input.properties.features.contextLimit">Persistent Context storage limit (Mb)</FormRow>
                 </div>
diff --git a/test/unit/forge/routes/api/device_spec.js b/test/unit/forge/routes/api/device_spec.js
index df4b3a4fc0..4213854fe9 100644
--- a/test/unit/forge/routes/api/device_spec.js
+++ b/test/unit/forge/routes/api/device_spec.js
@@ -86,14 +86,12 @@ describe('Device API', async function () {
         return device
     }
 
-    async function setupApp (license) {
+    async function setupApp (options) {
         const setupConfig = {
             limits: {
                 instances: 50
-            }
-        }
-        if (license) {
-            setupConfig.license = license
+            },
+            ...options
         }
         app = await setup(setupConfig)
         AccessTokenController = app.db.controllers.AccessToken
@@ -1438,12 +1436,19 @@ describe('Device API', async function () {
             before(async function () {
                 const license = 'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJGbG93Rm9yZ2UgSW5jLiIsInN1YiI6IkZsb3dGb3JnZSBJbmMuIERldmVsb3BtZW50IiwibmJmIjoxNjYyNTk1MjAwLCJleHAiOjc5ODcwNzUxOTksIm5vdGUiOiJEZXZlbG9wbWVudC1tb2RlIE9ubHkuIE5vdCBmb3IgcHJvZHVjdGlvbiIsInVzZXJzIjoxNTAsInRlYW1zIjo1MCwicHJvamVjdHMiOjUwLCJkZXZpY2VzIjoyLCJkZXYiOnRydWUsImlhdCI6MTY2MjY1MzkyMX0.Tj4fnuDuxi_o5JYltmVi1Xj-BRn0aEjwRPa_fL2MYa9MzSwnvJEd-8bsRM38BQpChjLt-wN-2J21U7oSq2Fp5A'
                 await app.close()
-                await setupApp(license)
+                await setupApp({
+                    license,
+                    'ff-npm-registry': {
+                        url: 'https://localhost:1234',
+                        catalogue: {
+                            certifiedNodes: 'https://localhost/cert-nodes-catalogue.json',
+                            ffNodes: 'https://localhost/ff-nodes-catalogue.json'
+                        }
+                    }
+
+                })
 
-                await app.settings.set('platform:ff-npm-registry:url', 'https://localhost:1234')
                 await app.settings.set('platform:ff-npm-registry:token', 'verySecret')
-                await app.settings.set('platform:ff-npm-registry:catalogue:certifiedNodes', 'https://localhost/cert-nodes-catalogue.json')
-                await app.settings.set('platform:ff-npm-registry:catalogue:ffNodes', 'https://localhost/ff-nodes-catalogue.json')
             })
             after(async function () {
                 // After this set of tests, close the app and recreate (ie remove the license)
@@ -1538,7 +1543,7 @@ describe('Device API', async function () {
             before(async function () {
                 const license = 'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJGbG93Rm9yZ2UgSW5jLiIsInN1YiI6IkZsb3dGb3JnZSBJbmMuIERldmVsb3BtZW50IiwibmJmIjoxNjYyNTk1MjAwLCJleHAiOjc5ODcwNzUxOTksIm5vdGUiOiJEZXZlbG9wbWVudC1tb2RlIE9ubHkuIE5vdCBmb3IgcHJvZHVjdGlvbiIsInVzZXJzIjoxNTAsInRlYW1zIjo1MCwicHJvamVjdHMiOjUwLCJkZXZpY2VzIjoyLCJkZXYiOnRydWUsImlhdCI6MTY2MjY1MzkyMX0.Tj4fnuDuxi_o5JYltmVi1Xj-BRn0aEjwRPa_fL2MYa9MzSwnvJEd-8bsRM38BQpChjLt-wN-2J21U7oSq2Fp5A'
                 await app.close()
-                await setupApp(license)
+                await setupApp({ license })
             })
             after(async function () {
                 // After this set of tests, close the app and recreate (ie remove the license)
@@ -2524,7 +2529,7 @@ describe('Device API', async function () {
             before(async function () {
                 const license = 'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJGbG93Rm9yZ2UgSW5jLiIsInN1YiI6IkZsb3dGb3JnZSBJbmMuIERldmVsb3BtZW50IiwibmJmIjoxNjYyNTk1MjAwLCJleHAiOjc5ODcwNzUxOTksIm5vdGUiOiJEZXZlbG9wbWVudC1tb2RlIE9ubHkuIE5vdCBmb3IgcHJvZHVjdGlvbiIsInVzZXJzIjoxNTAsInRlYW1zIjo1MCwicHJvamVjdHMiOjUwLCJkZXZpY2VzIjoyLCJkZXYiOnRydWUsImlhdCI6MTY2MjY1MzkyMX0.Tj4fnuDuxi_o5JYltmVi1Xj-BRn0aEjwRPa_fL2MYa9MzSwnvJEd-8bsRM38BQpChjLt-wN-2J21U7oSq2Fp5A'
                 await app.close()
-                await setupApp(license)
+                await setupApp({ license })
             })
             after(async function () {
                 // After this set of tests, close the app and recreate (ie remove the license)
@@ -3001,7 +3006,9 @@ describe('Device API', async function () {
             // Close down the default app
             await app.close()
             // setup app with granular rbac enabled
-            await setupApp('eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJGbG93Rm9yZ2UgSW5jLiIsInN1YiI6IkZsb3dGb3JnZSBJbmMuIERldmVsb3BtZW50IiwibmJmIjoxNjYyNDIyNDAwLCJleHAiOjc5ODY5MDIzOTksIm5vdGUiOiJEZXZlbG9wbWVudC1tb2RlIE9ubHkuIE5vdCBmb3IgcHJvZHVjdGlvbiIsInVzZXJzIjoxNTAsInRlYW1zIjo1MCwicHJvamVjdHMiOjUwLCJkZXZpY2VzIjo1MCwiZGV2Ijp0cnVlLCJpYXQiOjE2NjI0ODI5ODd9.e8Jeppq4aURwWYz-rEpnXs9RY2Y7HF7LJ6rMtMZWdw2Xls6-iyaiKV1TyzQw5sUBAhdUSZxgtiFH5e_cNJgrUg')
+            await setupApp({
+                license: 'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJGbG93Rm9yZ2UgSW5jLiIsInN1YiI6IkZsb3dGb3JnZSBJbmMuIERldmVsb3BtZW50IiwibmJmIjoxNjYyNDIyNDAwLCJleHAiOjc5ODY5MDIzOTksIm5vdGUiOiJEZXZlbG9wbWVudC1tb2RlIE9ubHkuIE5vdCBmb3IgcHJvZHVjdGlvbiIsInVzZXJzIjoxNTAsInRlYW1zIjo1MCwicHJvamVjdHMiOjUwLCJkZXZpY2VzIjo1MCwiZGV2Ijp0cnVlLCJpYXQiOjE2NjI0ODI5ODd9.e8Jeppq4aURwWYz-rEpnXs9RY2Y7HF7LJ6rMtMZWdw2Xls6-iyaiKV1TyzQw5sUBAhdUSZxgtiFH5e_cNJgrUg'
+            })
             TestObjects.eric = await app.db.models.User.create({ username: 'eric', name: 'Eric Fett', email: 'eric@example.com', email_verified: true, password: 'eePassword' })
             await login('eric', 'eePassword')
 
diff --git a/test/unit/forge/routes/api/project_spec.js b/test/unit/forge/routes/api/project_spec.js
index 964ae5acab..d51f820506 100644
--- a/test/unit/forge/routes/api/project_spec.js
+++ b/test/unit/forge/routes/api/project_spec.js
@@ -19,11 +19,8 @@ describe('Project API', function () {
     const generateProjectName = () => 'test-project' + (projectInstanceCount++)
     const TestObjects = {}
 
-    async function setupApp (license) {
-        const setupConfig = { limits: { instances: 50 }, domain: 'flowforge.dev' }
-        if (license) {
-            setupConfig.license = license
-        }
+    async function setupApp (options) {
+        const setupConfig = { limits: { instances: 50 }, domain: 'flowforge.dev', ...options }
         app = await setup(setupConfig)
 
         TestObjects.project1 = app.project
@@ -865,7 +862,17 @@ describe('Project API', function () {
             before(async function () {
                 const license = 'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJGbG93Rm9yZ2UgSW5jLiIsInN1YiI6IkZsb3dGb3JnZSBJbmMuIERldmVsb3BtZW50IiwibmJmIjoxNjYyNTk1MjAwLCJleHAiOjc5ODcwNzUxOTksIm5vdGUiOiJEZXZlbG9wbWVudC1tb2RlIE9ubHkuIE5vdCBmb3IgcHJvZHVjdGlvbiIsInVzZXJzIjoxNTAsInRlYW1zIjo1MCwicHJvamVjdHMiOjUwLCJkZXZpY2VzIjoyLCJkZXYiOnRydWUsImlhdCI6MTY2MjY1MzkyMX0.Tj4fnuDuxi_o5JYltmVi1Xj-BRn0aEjwRPa_fL2MYa9MzSwnvJEd-8bsRM38BQpChjLt-wN-2J21U7oSq2Fp5A'
                 await app.close()
-                await setupApp(license)
+                await setupApp({
+                    license,
+                    'ff-npm-registry': {
+                        url: 'https://localhost:1234',
+                        catalogue: {
+                            certifiedNodes: 'https://localhost/cert-nodes-catalogue.json',
+                            ffNodes: 'https://localhost/ff-nodes-catalogue.json'
+                        }
+                    }
+
+                })
             })
             after(async function () {
                 // After this set of tests, close the app and recreate (ie remove the license)
@@ -987,10 +994,7 @@ describe('Project API', function () {
                 await app.defaultTeamType.save()
             }
             it('Should include certified nodes', async function () {
-                await app.settings.set('platform:ff-npm-registry:url', 'https://localhost:1234')
                 await app.settings.set('platform:ff-npm-registry:token', 'verySecret')
-                await app.settings.set('platform:ff-npm-registry:catalogue:certifiedNodes', 'https://localhost/cert-nodes-catalogue.json')
-                await app.settings.set('platform:ff-npm-registry:catalogue:ffNodes', 'https://localhost/ff-nodes-catalogue.json')
 
                 await setTeamFlags(true, true)
 
@@ -1041,7 +1045,7 @@ describe('Project API', function () {
             before(async function () {
                 const license = 'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJGbG93Rm9yZ2UgSW5jLiIsInN1YiI6IkZsb3dGb3JnZSBJbmMuIERldmVsb3BtZW50IiwibmJmIjoxNjYyNTk1MjAwLCJleHAiOjc5ODcwNzUxOTksIm5vdGUiOiJEZXZlbG9wbWVudC1tb2RlIE9ubHkuIE5vdCBmb3IgcHJvZHVjdGlvbiIsInVzZXJzIjoxNTAsInRlYW1zIjo1MCwicHJvamVjdHMiOjUwLCJkZXZpY2VzIjoyLCJkZXYiOnRydWUsImlhdCI6MTY2MjY1MzkyMX0.Tj4fnuDuxi_o5JYltmVi1Xj-BRn0aEjwRPa_fL2MYa9MzSwnvJEd-8bsRM38BQpChjLt-wN-2J21U7oSq2Fp5A'
                 await app.close()
-                await setupApp(license)
+                await setupApp({ license })
                 flowBlueprint = await app.db.models.FlowTemplate.create({ name: 'Test Blueprint', description: 'This is a test blueprint\\n - with markdown\\n - formatted *description*', category: 'blueprint', active: true, flows: { flows: [{ id: '0959734f594cf1b7', type: 'tab', label: 'Example Flow', disabled: false, info: '', env: [] }, { id: '99a085239a033276', type: 'inject', z: '0959734f594cf1b7', name: '', props: [{ p: 'payload' }, { p: 'topic', vt: 'str' }], repeat: '', crontab: '', once: false, onceDelay: 0.1, topic: '', payload: '', payloadType: 'date', x: 160, y: 100, wires: [['5fbc411997c05334']] }, { id: '5fbc411997c05334', type: 'debug', z: '0959734f594cf1b7', name: 'debug 1', active: true, tosidebar: true, console: false, tostatus: false, complete: 'false', statusVal: '', statusType: 'auto', x: 410, y: 120, wires: [] }] }, modules: { '@flowforge/node-red-dashboard': '0.6.1' } })
             })
             after(async function () {

From 8d6dbbc5e6f86f91cc37094a25b4f18b23c3fa1b Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 8 Oct 2025 14:59:10 +0100
Subject: [PATCH 4/4] Update forge/routes/api/project.js

Co-authored-by: Ben Hardill <ben@flowforge.com>
---
 forge/routes/api/project.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge/routes/api/project.js b/forge/routes/api/project.js
index dd91fa9cef..2b5feec958 100644
--- a/forge/routes/api/project.js
+++ b/forge/routes/api/project.js
@@ -948,7 +948,7 @@ module.exports = async function (app) {
                     updateSettingsForCatalogue('@flowfuse-nodes', ffNodesCatalogue)
                 }
             } catch (err) {
-                app.log.error('Failed to configure platform npm registry for device', err)
+                app.log.error('Failed to configure platform npm registry for project', err)
             }
         }