diff --git a/src/Core/Models/Api/Response/VersionResponseModel.cs b/src/Core/Models/Api/Response/VersionResponseModel.cs index 4b241ee427..e28923193f 100644 --- a/src/Core/Models/Api/Response/VersionResponseModel.cs +++ b/src/Core/Models/Api/Response/VersionResponseModel.cs @@ -8,12 +8,9 @@ namespace Bit.Core.Models.Api public VersionResponseModel() : base("version") { - var info = CoreHelpers.GetVersionInfo(); - Version = info.version; - VersionWeight = info.versionWeight; + Version = CoreHelpers.GetVersion(); } public string Version { get; set; } - public int VersionWeight { get; set; } } } diff --git a/src/Core/Utilities/CoreHelpers.cs b/src/Core/Utilities/CoreHelpers.cs index f16068c6d7..a6a5147c2e 100644 --- a/src/Core/Utilities/CoreHelpers.cs +++ b/src/Core/Utilities/CoreHelpers.cs @@ -375,30 +375,16 @@ namespace Bit.Core.Utilities return val.ToString(); } - public static (string version, int versionWeight) GetVersionInfo() + public static string GetVersion() { if(string.IsNullOrWhiteSpace(_version)) { _version = Assembly.GetEntryAssembly() .GetCustomAttribute() .InformationalVersion; - - var dashIndex = _version.IndexOf('-'); - var trimmedVersion = dashIndex > 0 ? _version.Substring(0, dashIndex) : _version; - - var semVerParts = trimmedVersion.Split('.').Reverse().Select(p => Convert.ToInt32(p)).ToList(); - if(semVerParts.Count < 4) - { - semVerParts.Insert(0, 0); - } - - for(var i = 0; i < semVerParts.Count; i++) - { - _versionWeight += Convert.ToInt32(Math.Pow(100, (i + 1)) * semVerParts[i]); - } } - return (_version, _versionWeight); + return _version; } } } diff --git a/src/Core/Utilities/ServiceCollectionExtensions.cs b/src/Core/Utilities/ServiceCollectionExtensions.cs index 70e752c22b..97e5937e8f 100644 --- a/src/Core/Utilities/ServiceCollectionExtensions.cs +++ b/src/Core/Utilities/ServiceCollectionExtensions.cs @@ -290,9 +290,7 @@ namespace Bit.Core.Utilities { httpContext.Response.OnStarting((state) => { - var info = CoreHelpers.GetVersionInfo(); - httpContext.Response.Headers.Append("Server-Version", info.version); - httpContext.Response.Headers.Append("Server-Version-Weight", info.versionWeight.ToString()); + httpContext.Response.Headers.Append("Server-Version", CoreHelpers.GetVersion()); return Task.FromResult(0); }, null);