Add support for httpNodeAuth

.gitignore

@@ -1,2 +1,2 @@
-node_modules/
+/node_modules/
 var/

lib/launcher.js

@@ -304,8 +304,22 @@ class Launcher {
             // The `httpNodeAuth` config is passed straight through to Node-RED
             // It is however sanitised in config.js to ensure it is an object
             // containing `user` and `pass` properties.
-            settings.httpNodeAuth = this.config.httpNodeAuth
+            settings.flowforge.httpNodeAuth = {
+                type: 'basic',
+                ...this.config.httpNodeAuth
+            }
+        } else if (this.settings?.security?.httpNodeAuth) {
+            settings.flowforge.httpNodeAuth = {
+                ...this.settings.security.httpNodeAuth,
+                bin: path.join(__dirname, 'plugins/node_modules/@flowfuse/flowfuse-auth/httpAuthMiddleware.js')
+            }
+            if (settings.flowforge.httpNodeAuth.type === 'ff-user') {
+                // Add the ff-auth plugin
+                settings.nodesDir = settings.nodesDir || []
+                settings.nodesDir.push(path.join(__dirname, 'plugins', 'node_modules', '@flowfuse', 'flowfuse-auth'))
+            }
         }
+
         await fs.writeFile(this.files.userSettings, JSON.stringify(settings))
     }
 

lib/template/template-settings.js

@@ -199,11 +199,25 @@ if (settings.https) {
 if (settings.httpStatic) {
     runtimeSettings.httpStatic = settings.httpStatic
 }
-
-if (settings.httpNodeAuth && typeof settings.httpNodeAuth === 'object') {
+if (settings.flowforge.httpNodeAuth?.user && settings.flowforge.httpNodeAuth?.pass) {
     runtimeSettings.httpNodeAuth = {
-        user: settings.httpNodeAuth.user,
-        pass: settings.httpNodeAuth.pass
+        user: settings.flowforge.httpNodeAuth.user,
+        pass: settings.flowforge.httpNodeAuth.pass
+    }
+} else if (settings.flowforge.httpNodeAuth?.type === 'ff-user') {
+    const ffAuthMiddleware = require(settings.flowforge.httpNodeAuth.bin).init({
+        type: 'flowforge-user',
+        // baseURL is the url of the http endpoints. We don't know the external
+        // ip/name of the device, so we use a placeholder. The code only needs the
+        // pathname (ie '/') from this URL - the domain/etc is not used.
+        baseURL: 'https://example.com/',
+        forgeURL: settings.flowforge.forgeURL,
+        clientID: settings.flowforge.httpNodeAuth.clientID,
+        clientSecret: settings.flowforge.httpNodeAuth.clientSecret
+    })
+    runtimeSettings.httpNodeMiddleware = ffAuthMiddleware
+    runtimeSettings.ui = {
+        middleware: ffAuthMiddleware
     }
 }
 module.exports = runtimeSettings