From 904193560ca04eca485bed23ba5e7a42f3f559ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Filipe=20da=20Silva=20Bispo?=
 <andrefsbispo@hotmail.com>
Date: Mon, 20 Jun 2022 12:53:09 +0100
Subject: [PATCH] [PS-293] Update admin portal to use the new version.json
 (#2006)

* PS-293: Get latest version no comes from GitHub instead of DockerHub.

* PS-293: format fixes

* PS-293: code refactor and clean up

* PS-293: deserialization to class, argument typification.

* PS-293: formating fix

* PS-293: Moved ProjectType to HomeController

* PS-293: updated version endpoint to CDN

* PS-293: Update endpoint to CF protected
---
 src/Admin/Controllers/HomeController.cs | 47 ++++++++++++++++++-------
 src/Admin/Views/Home/Index.cshtml       |  7 ++--
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/src/Admin/Controllers/HomeController.cs b/src/Admin/Controllers/HomeController.cs
index 750c49dfd9..6f433797d2 100644
--- a/src/Admin/Controllers/HomeController.cs
+++ b/src/Admin/Controllers/HomeController.cs
@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 
 namespace Bit.Admin.Controllers
 {
@@ -42,26 +43,22 @@ namespace Bit.Admin.Controllers
             });
         }
 
-        public async Task<IActionResult> GetLatestDockerHubVersion(string repository, CancellationToken cancellationToken)
+
+        public async Task<IActionResult> GetLatestVersion(ProjectType project, CancellationToken cancellationToken)
         {
-            var requestUri = $"https://hub.docker.com/v2/repositories/bitwarden/{repository}/tags/";
+            var requestUri = $"https://selfhost.bitwarden.com/version.json";
             try
             {
                 var response = await _httpClient.GetAsync(requestUri, cancellationToken);
                 if (response.IsSuccessStatusCode)
                 {
-                    using var jsonDocument = await JsonDocument.ParseAsync(await response.Content.ReadAsStreamAsync(cancellationToken), cancellationToken: cancellationToken);
-                    var root = jsonDocument.RootElement;
-
-                    var results = root.GetProperty("results");
-                    foreach (var result in results.EnumerateArray())
+                    var latestVersions = JsonConvert.DeserializeObject<LatestVersions>(await response.Content.ReadAsStringAsync());
+                    return project switch
                     {
-                        var name = result.GetProperty("name").GetString();
-                        if (!string.IsNullOrWhiteSpace(name) && name.Length > 0 && char.IsNumber(name[0]))
-                        {
-                            return new JsonResult(name);
-                        }
-                    }
+                        ProjectType.Core => new JsonResult(latestVersions.Versions.WebVersion),
+                        ProjectType.Web => new JsonResult(latestVersions.Versions.CoreVersion),
+                        _ => throw new System.NotImplementedException(),
+                    };
                 }
             }
             catch (HttpRequestException e)
@@ -94,5 +91,29 @@ namespace Bit.Admin.Controllers
 
             return new JsonResult("-");
         }
+
+        private class LatestVersions
+        {
+            [JsonProperty("versions")]
+            public Versions Versions { get; set; }
+        }
+
+        private class Versions
+        {
+            [JsonProperty("coreVersion")]
+            public string CoreVersion { get; set; }
+
+            [JsonProperty("webVersion")]
+            public string WebVersion { get; set; }
+
+            [JsonProperty("keyConnectorVersion")]
+            public string KeyConnectorVersion { get; set; }
+        }
+    }
+
+    public enum ProjectType
+    {
+        Core,
+        Web,
     }
 }
diff --git a/src/Admin/Views/Home/Index.cshtml b/src/Admin/Views/Home/Index.cshtml
index 3de2f74c88..9e2ddd1118 100644
--- a/src/Admin/Views/Home/Index.cshtml
+++ b/src/Admin/Views/Home/Index.cshtml
@@ -1,4 +1,5 @@
-@model HomeModel
+@using Bit.Admin.Controllers
+@model HomeModel
 @{
     ViewData["Title"] = "Dashboard";
 }
@@ -9,7 +10,7 @@
             let loadedWebLatest = false;
             let loadedWebInstalled = false;
 
-            fetch('@Url.Action("GetLatestDockerHubVersion", new { repository = "web" })').then((response) => {
+            fetch('@Url.Action("GetLatestVersion", new { project = @ProjectType.Web })').then((response) => {
                 return response.json();
             }).then((version) => {
                 document.getElementById('web-latest').innerText = version;
@@ -19,7 +20,7 @@
                 }
             });
 
-            fetch('@Url.Action("GetLatestDockerHubVersion", new { repository = "api" })').then((response) => {
+            fetch('@Url.Action("GetLatestVersion", new { project = @ProjectType.Core })').then((response) => {
                 return response.json();
             }).then((version) => {
                 document.getElementById('server-latest').innerText = version;