bitwarden · justindbaur · Aug 10, 2026 · Aug 4, 2026 · Aug 5, 2026 · Aug 5, 2026
@@ -1,4 +1,4 @@
-@using static Bit.Core.Utilities.AssemblyHelpers;
+@inject Bitwarden.Server.Sdk.Environment.IBitwardenEnvironment BitwardenEnvironment
 
 <!DOCTYPE html>
 <html lang="en">
@@ -30,7 +30,7 @@
             </div>
             <div class="col text-center"></div>
             <div class="col text-right">
-                Version @GetVersion()
+                Version @BitwardenEnvironment.Version
             </div>
         </div>
     </div>

diff --git a/src/Admin/Controllers/HomeController.cs b/src/Admin/Controllers/HomeController.cs
@@ -5,6 +5,7 @@
 using System.Text.Json;
 using Bit.Admin.Models;
 using Bit.Core.Settings;
+using Bitwarden.Server.Sdk.Environment;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
@@ -18,12 +19,14 @@ public class HomeController : Controller
     private readonly GlobalSettings _globalSettings;
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly ILogger<HomeController> _logger;
+    private readonly IBitwardenEnvironment _bitwardenEnvironment;
 
-    public HomeController(GlobalSettings globalSettings, IHttpClientFactory httpClientFactory, ILogger<HomeController> logger)
+    public HomeController(GlobalSettings globalSettings, IHttpClientFactory httpClientFactory, ILogger<HomeController> logger, IBitwardenEnvironment bitwardenEnvironment)
     {
         _globalSettings = globalSettings;
         _httpClientFactory = httpClientFactory;
         _logger = logger;
+        _bitwardenEnvironment = bitwardenEnvironment;
     }
 
     [Authorize]
@@ -32,7 +35,7 @@ public IActionResult Index()
         return View(new HomeModel
         {
             GlobalSettings = _globalSettings,
-            CurrentVersion = Core.Utilities.AssemblyHelpers.GetVersion()
+            CurrentVersion = _bitwardenEnvironment.Version
         });
     }
 

diff --git a/src/Admin/Controllers/InfoController.cs b/src/Admin/Controllers/InfoController.cs
@@ -1,5 +1,4 @@
-using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Admin.Controllers;
 
@@ -11,10 +10,4 @@ public DateTime GetAlive()
     {
         return DateTime.UtcNow;
     }
-
-    [HttpGet("~/version")]
-    public JsonResult GetVersion()
-    {
-        return Json(AssemblyHelpers.GetVersion());
-    }
 }
diff --git a/src/Admin/Startup.cs b/src/Admin/Startup.cs
@@ -162,6 +162,10 @@ public void Configure(
         // Gates endpoints carrying IFeatureMetadata; required in any app that
         // routes requests through endpoints tagged with [RequireFeature].
         app.UseFeatureFlagChecks();
-        app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute());
+        app.UseEndpoints(endpoints =>
+        {
+            endpoints.MapDefaultControllerRoute();
+            endpoints.MapVersionEndpoint();
+        });
     }
 }
diff --git a/src/Api/Controllers/ConfigController.cs b/src/Api/Controllers/ConfigController.cs
@@ -1,5 +1,6 @@
 using Bit.Api.Models.Response;
 using Bit.Core.Settings;
+using Bitwarden.Server.Sdk.Environment;
 using Bitwarden.Server.Sdk.Features;
 using Microsoft.AspNetCore.Mvc;
 
@@ -10,18 +11,21 @@ public class ConfigController : Controller
 {
     private readonly IGlobalSettings _globalSettings;
     private readonly IFeatureService _featureService;
+    private readonly IBitwardenEnvironment _bitwardenEnvironment;
 
     public ConfigController(
         IGlobalSettings globalSettings,
-        IFeatureService featureService)
+        IFeatureService featureService,
+        IBitwardenEnvironment bitwardenEnvironment)
     {
         _globalSettings = globalSettings;
         _featureService = featureService;
+        _bitwardenEnvironment = bitwardenEnvironment;
     }
 
     [HttpGet("")]
     public ConfigResponseModel GetConfigs()
     {
-        return new ConfigResponseModel(_featureService, _globalSettings);
+        return new ConfigResponseModel(_featureService, _globalSettings, _bitwardenEnvironment);
     }
 }
diff --git a/src/Api/Controllers/InfoController.cs b/src/Api/Controllers/InfoController.cs
@@ -1,5 +1,4 @@
-using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers;
 
@@ -17,10 +16,4 @@ public DateTime GetNow()
     {
         return GetAlive();
     }
-
-    [HttpGet("~/version")]
-    public JsonResult GetVersion()
-    {
-        return Json(AssemblyHelpers.GetVersion());
-    }
 }
diff --git a/src/Api/Models/Response/ConfigResponseModel.cs b/src/Api/Models/Response/ConfigResponseModel.cs
@@ -9,7 +9,7 @@
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Settings;
-using Bit.Core.Utilities;
+using Bitwarden.Server.Sdk.Environment;
 
 namespace Bit.Api.Models.Response;
 
@@ -24,22 +24,14 @@ public class ConfigResponseModel : ResponseModel
     public CommunicationSettings Communication { get; set; }
     public ServerSettingsResponseModel Settings { get; set; }
 
-    public ConfigResponseModel() : base("config")
-    {
-        Version = AssemblyHelpers.GetVersion();
-        GitHash = AssemblyHelpers.GetGitHash();
-        Environment = new EnvironmentConfigResponseModel();
-        FeatureStates = new Dictionary<string, JsonValue>();
-        Settings = new ServerSettingsResponseModel();
-    }
-
     public ConfigResponseModel(
         Bitwarden.Server.Sdk.Features.IFeatureService featureService,
-        IGlobalSettings globalSettings
+        IGlobalSettings globalSettings,
+        IBitwardenEnvironment bitwardenEnvironment
         ) : base("config")
     {
-        Version = AssemblyHelpers.GetVersion();
-        GitHash = AssemblyHelpers.GetGitHash();
+        Version = bitwardenEnvironment.Version;
+        GitHash = bitwardenEnvironment.GitHash;
         Environment = new EnvironmentConfigResponseModel
         {
             CloudRegion = globalSettings.BaseServiceUri.CloudRegion,

diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs
@@ -286,6 +286,7 @@ public void Configure(
         app.UseEndpoints(endpoints =>
         {
             endpoints.MapDefaultControllerRoute();
+            endpoints.MapVersionEndpoint();
 
 #if !OSS
             // PAM is a commercial feature; its Minimal API endpoints are only mapped in non-OSS builds.

diff --git a/src/Core/Utilities/AssemblyHelpers.cs b/src/Core/Utilities/AssemblyHelpers.cs
diff --git a/src/Icons/Controllers/InfoController.cs b/src/Icons/Controllers/InfoController.cs
@@ -1,5 +1,4 @@
-using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Icons.Controllers;
 
@@ -11,10 +10,4 @@ public DateTime GetAlive()
     {
         return DateTime.UtcNow;
     }
-
-    [HttpGet("~/version")]
-    public JsonResult GetVersion()
-    {
-        return Json(AssemblyHelpers.GetVersion());
-    }
 }
diff --git a/src/Icons/Startup.cs b/src/Icons/Startup.cs
@@ -98,6 +98,10 @@ public void Configure(
             .AllowAnyMethod().AllowAnyHeader().AllowCredentials());
 
         app.UseRouting();
-        app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute());
+        app.UseEndpoints(endpoints =>
+        {
+            endpoints.MapDefaultControllerRoute();
+            endpoints.MapVersionEndpoint();
+        });
     }
 }
diff --git a/src/Notifications/Controllers/InfoController.cs b/src/Notifications/Controllers/InfoController.cs
@@ -1,5 +1,4 @@
-using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Notifications.Controllers;
 
@@ -11,10 +10,4 @@ public DateTime GetAlive()
     {
         return DateTime.UtcNow;
     }
-
-    [HttpGet("~/version")]
-    public JsonResult GetVersion()
-    {
-        return Json(AssemblyHelpers.GetVersion());
-    }
 }
diff --git a/src/Notifications/Startup.cs b/src/Notifications/Startup.cs
@@ -122,6 +122,7 @@ public void Configure(
                 options.TransportMaxBufferSize = 4096;
             });
             endpoints.MapDefaultControllerRoute();
+            endpoints.MapVersionEndpoint();
         });
     }
 }
diff --git a/test/Api.IntegrationTest/Controllers/ConfigControllerTests.cs b/test/Api.IntegrationTest/Controllers/ConfigControllerTests.cs
@@ -1,13 +1,14 @@
 using System.Net.Http.Headers;
 using Bit.Api.IntegrationTest.Factories;
 using Bit.Api.IntegrationTest.Helpers;
-using Bit.Api.Models.Response;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Enums;
 using Xunit;
 
 namespace Bit.Api.IntegrationTest.Controllers;
 
+file record ConfigResponse(string Version);
+
 public class ConfigControllerTests : IClassFixture<ApiApplicationFactory>, IAsyncLifetime
 {
     private readonly HttpClient _client;
@@ -48,7 +49,7 @@ public async Task GetConfigs_Unauthenticated()
 
         var response = await _client.GetAsync("/config");
         response.EnsureSuccessStatusCode();
-        var result = await response.Content.ReadFromJsonAsync<ConfigResponseModel>();
+        var result = await response.Content.ReadFromJsonAsync<ConfigResponse>();
 
         Assert.NotNull(result);
         Assert.NotEmpty(result!.Version);
@@ -61,7 +62,7 @@ public async Task GetConfigs_Authenticated()
 
         var response = await _client.GetAsync("/config");
         response.EnsureSuccessStatusCode();
-        var result = await response.Content.ReadFromJsonAsync<ConfigResponseModel>();
+        var result = await response.Content.ReadFromJsonAsync<ConfigResponse>();
 
         Assert.NotNull(result);
         Assert.NotEmpty(result!.Version);
@@ -87,7 +88,7 @@ public async Task GetConfigs_WithOrganizations(int orgCount)
 
         var response = await _client.GetAsync("/config");
         response.EnsureSuccessStatusCode();
-        var result = await response.Content.ReadFromJsonAsync<ConfigResponseModel>();
+        var result = await response.Content.ReadFromJsonAsync<ConfigResponse>();
 
         Assert.NotNull(result);
         Assert.NotEmpty(result!.Version);

diff --git a/test/Api.Test/Controllers/ConfigControllerTests.cs b/test/Api.Test/Controllers/ConfigControllerTests.cs
@@ -2,6 +2,7 @@
 using AutoFixture.Xunit2;
 using Bit.Api.Controllers;
 using Bit.Core.Settings;
+using Bitwarden.Server.Sdk.Environment;
 using Bitwarden.Server.Sdk.Features;
 using NSubstitute;
 using Xunit;
@@ -13,16 +14,19 @@ public class ConfigControllerTests : IDisposable
     private readonly ConfigController _sut;
     private readonly GlobalSettings _globalSettings;
     private readonly IFeatureService _featureService;
+    private readonly IBitwardenEnvironment _bitwardenEnvironment;
 
     public ConfigControllerTests()
     {
         _globalSettings = new GlobalSettings();
         _featureService = Substitute.For<IFeatureService>();
         _featureService.GetAll().Returns(new Dictionary<string, JsonValue>());
+        _bitwardenEnvironment = Substitute.For<IBitwardenEnvironment>();
 
         _sut = new ConfigController(
             _globalSettings,
-            _featureService
+            _featureService,
+            _bitwardenEnvironment
         );
     }
 

diff --git a/test/Api.Test/Models/Response/ServerSettingsResponseModelTests.cs b/test/Api.Test/Models/Response/ServerSettingsResponseModelTests.cs
@@ -1,6 +1,7 @@
 using System.Text.Json.Nodes;
 using Bit.Api.Models.Response;
 using Bit.Core.Settings;
+using Bitwarden.Server.Sdk.Environment;
 using Bitwarden.Server.Sdk.Features;
 using NSubstitute;
 using Xunit;
@@ -21,7 +22,9 @@ public void ConfigResponseModel_SuppressOnboardingInterstitialsTrue_MapsToSettin
         var featureService = Substitute.For<IFeatureService>();
         featureService.GetAll().Returns(new Dictionary<string, JsonValue>());
 
-        var model = new ConfigResponseModel(featureService, globalSettings);
+        var bitwardenEnvironment = Substitute.For<IBitwardenEnvironment>();
+
+        var model = new ConfigResponseModel(featureService, globalSettings, bitwardenEnvironment);
 
         Assert.True(model.Settings.SuppressOnboardingInterstitials);
     }
@@ -38,7 +41,9 @@ public void ConfigResponseModel_SuppressOnboardingInterstitialsFalse_MapsToSetti
         var featureService = Substitute.For<IFeatureService>();
         featureService.GetAll().Returns(new Dictionary<string, JsonValue>());
 
-        var model = new ConfigResponseModel(featureService, globalSettings);
+        var bitwardenEnvironment = Substitute.For<IBitwardenEnvironment>();
+
+        var model = new ConfigResponseModel(featureService, globalSettings, bitwardenEnvironment);
 
         Assert.False(model.Settings.SuppressOnboardingInterstitials);
     }

diff --git a/test/Core.Test/Utilities/AssemblyHelpersTests.cs b/test/Core.Test/Utilities/AssemblyHelpersTests.cs