From 997839a2c75f8ffdb4771ac9c47d50e8c5333da0 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 23 Mar 2018 23:27:33 -0400
Subject: [PATCH] set base admin path for self host

---
 src/Admin/Controllers/HomeController.cs | 3 ++-
 src/Admin/Startup.cs                    | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Admin/Controllers/HomeController.cs b/src/Admin/Controllers/HomeController.cs
index f8a2a1a04d..0cf4e81c67 100644
--- a/src/Admin/Controllers/HomeController.cs
+++ b/src/Admin/Controllers/HomeController.cs
@@ -7,6 +7,7 @@ using Bit.Core;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Linq;
 
 namespace Bit.Admin.Controllers
 {
@@ -52,7 +53,7 @@ namespace Bit.Admin.Controllers
                     foreach(var result in results)
                     {
                         var name = result["name"].ToString();
-                        if(name != "latest" && name != "beta")
+                        if(name.Count(c => c == '.') > 2)
                         {
                             return new JsonResult(name);
                         }
diff --git a/src/Admin/Startup.cs b/src/Admin/Startup.cs
index fbb6496570..c6f72dc02e 100644
--- a/src/Admin/Startup.cs
+++ b/src/Admin/Startup.cs
@@ -69,6 +69,15 @@ namespace Bit.Admin
                 app.UseDeveloperExceptionPage();
             }
 
+            if(globalSettings.SelfHosted)
+            {
+                app.Use(async (context, next) =>
+                {
+                    context.Request.PathBase = "/admin";
+                    await next.Invoke();
+                });
+            }
+
             app.UseAuthentication();
             app.UseStaticFiles();
             app.UseMvcWithDefaultRoute();