From 22de8855c19da76049eeab8f38090509ced40dce Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 24 Feb 2020 21:08:29 +0000
Subject: [PATCH] Handle httpAdminRoot missing ending slash with login strategy
 Fixes #2473

---
 packages/node_modules/@node-red/editor-api/lib/auth/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/auth/index.js b/packages/node_modules/@node-red/editor-api/lib/auth/index.js
index a7ee2e7f3..189f903d8 100644
--- a/packages/node_modules/@node-red/editor-api/lib/auth/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/auth/index.js
@@ -100,7 +100,10 @@ function login(req,res) {
             }
         } else if (mergedAdminAuth.type === "strategy") {
 
-            var urlPrefix = (settings.httpAdminRoot==='/')?"":settings.httpAdminRoot;
+            var urlPrefix = (settings.httpAdminRoot||"").replace(/\/$/,"");
+            if (urlPrefix.length > 0) {
+                urlPrefix += "/";
+            }
             response = {
                 "type":"strategy",
                 "prompts":[{type:"button",label:mergedAdminAuth.strategy.label, url: urlPrefix + "auth/strategy"}]