Allow auto upgrade url set

DesktopEdge/App.xaml.cs

@@ -34,7 +34,6 @@ protected override void OnStartup(StartupEventArgs e) {
 
 			bool createdNew;
 
-
 			_mutex = new Mutex(true, appName, out createdNew);
 
 			if (!createdNew) {
@@ -59,8 +58,8 @@ protected override void OnStartup(StartupEventArgs e) {
 #pragma warning disable 4014 //This async method lacks 'await'
 				StartServer();
 #pragma warning restore 4014 //This async method lacks 'await'
-			}
-		}
+            }
+        }
 
 		async public Task StartServer() {
 			logger.Debug("Starting IPC server to listen for other instances of the app");

DesktopEdge/MainWindow.xaml.cs

@@ -800,8 +800,9 @@ private void MonitorClient_OnServiceStatusEvent(object sender, MonitorServiceSta
 						notifyIcon.Icon.Dispose();
 						notifyIcon.Dispose();
 						Application.Current.Shutdown();
-					}
+                    }
 					state.AutomaticUpdatesEnabledFromString(evt.AutomaticUpgradeDisabled);
+					state.AutomaticUpdateURL = evt.AutomaticUpgradeURL;
 					MainMenu.ShowUpdateAvailable();
 					logger.Debug("MonitorClient_OnServiceStatusEvent: {0}", evt.Status);
 					Application.Current.Properties["ReleaseStream"] = evt.ReleaseStream;
@@ -956,19 +957,6 @@ async private void StartZitiService(object sender, RoutedEventArgs e) {
 		private void ShowServiceNotStarted() {
 			TunnelConnected(false);
 			LoadIdentities(true);
-			/*
-			this.Dispatcher.Invoke(() => {
-				semaphoreSlim.Wait(); //make sure the event is only added to the button once
-				CloseErrorButton.Click -= CloseError;
-				if (!startZitiButtonVisible) {
-					CloseErrorButton.Content = "Start Service";
-					startZitiButtonVisible = true;
-					CloseErrorButton.Click += StartZitiService;
-				}
-				semaphoreSlim.Release();
-				SetCantDisplay("Service Not Started", "Do you want to start the data service now?", Visibility.Visible);
-			});
-			*/
 		}
 
 		private void MonitorClient_OnClientConnected(object sender, object e) {

DesktopEdge/Models/ViewState.cs

@@ -6,45 +6,45 @@
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace Ziti.Desktop.Edge.Models
-{
-    public class ZDEWViewState
-    {
+namespace Ziti.Desktop.Edge.Models {
+    public class ZDEWViewState {
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         private bool automaticUpdatesDisabled = false;
-        public bool AutomaticUpdatesDisabled
-        {
-            get
-            {
+        private string updateUrl = "not set yet";
+        public bool AutomaticUpdatesDisabled {
+            get {
                 return automaticUpdatesDisabled;
             }
-            set
-            {
+            set {
                 automaticUpdatesDisabled = value;
             }
         }
+        public string AutomaticUpdateURL {
+            get {
+                return updateUrl;
+            }
+            set {
+                updateUrl = value;
+            }
+        }
 
         public UpdateInfo PendingUpdate { get; set; } = new UpdateInfo();
 
-        internal void AutomaticUpdatesEnabledFromString(string automaticUpgradeDisabled)
-        {
+        internal void AutomaticUpdatesEnabledFromString(string automaticUpgradeDisabled) {
             bool disabled = bool.TrueString.ToLower() == automaticUpgradeDisabled?.ToLower().Trim();
             this.AutomaticUpdatesDisabled = disabled;
         }
     }
-    public class UpdateInfo
-    {
+    public class UpdateInfo {
         public DateTime InstallTime { get; set; } = DateTime.MinValue;
         public string Version { get; set; } = "0.0.0.0";
 
-        public double TimeLeft
-        {
-            get
-            {
+        public double TimeLeft {
+            get {
                 double timeLeft = (InstallTime - DateTime.Now).TotalSeconds;
                 return timeLeft;
             }
         }
     }
-}
+}

DesktopEdge/Views/Screens/MainMenu.xaml

@@ -99,9 +99,26 @@
                     </StackPanel>
                 </StackPanel>
                 <StackPanel Name="AutomaticUpgradesItems" Visibility="Collapsed" Orientation="Vertical" HorizontalAlignment="Stretch">
+                    <Label FontWeight="Bold" FontSize="16" Margin="0,20,0,0">Automatic upgrades:</Label>
+                    <Rectangle HorizontalAlignment="Stretch" Height="1" Fill="#7d8faf" Opacity="0.2"></Rectangle>
                     <local:SubOptionItem x:Name="AutomaticUpgradesItemOn" HorizontalAlignment="Stretch" Width="Auto" Label="Enabled" MouseUp="SetAutomaticUpgradesMenuAction"></local:SubOptionItem>
                     <local:SubOptionItem x:Name="AutomaticUpgradesItemOff" HorizontalAlignment="Stretch" Width="Auto" Label="Disabled" MouseUp="SetAutomaticUpgradesMenuAction"></local:SubOptionItem>
+
+                    <Label FontWeight="Bold" FontSize="16" Margin="0,20,0,0">URL used to discover new upgrades:</Label>
+
+                    <Rectangle HorizontalAlignment="Stretch" Height="1" Fill="#7d8faf" Opacity="0.2"></Rectangle>
+                    <Label Opacity="0.6">Do not change unless you understand the result</Label>
+
+                    <TextBox x:Name="UpdateUrl" Padding="10" Margin="10,10,10,10" Width="325" BorderThickness="1" TextAlignment="Left" FontSize="14" Foreground="Black" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans">
+                        <TextBox.Resources>
+                            <Style TargetType="{x:Type Border}">
+                                <Setter Property="CornerRadius" Value="7"/>
+                            </Style>
+                        </TextBox.Resources>
+                    </TextBox>
+                    <local:StyledButton x:Name="SetUpdateUrlButton" OnClick="SetUpdateUrlButton_Click" Label="Set Update URL" Grid.Row="8"></local:StyledButton>
                 </StackPanel>
+
                 <StackPanel Name="ConfigItems" Visibility="Collapsed" Orientation="Vertical" HorizontalAlignment="Stretch">
                     <local:MenuEditItem x:Name="ConfigIp" HorizontalAlignment="Stretch" Width="Auto" Label="IPv4 Address:"></local:MenuEditItem>
                     <local:MenuEditItem x:Name="ConfigSubnet" HorizontalAlignment="Stretch" Width="Auto" Label="Subnet Mask:"></local:MenuEditItem>
@@ -118,7 +135,7 @@
                 <TextBox Name="LogsItems" Height="400" Width="{Binding ActualWidth, ElementName=MainStack}" TextWrapping="Wrap" Visibility="Collapsed" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Auto"></TextBox>
 
                 <StackPanel Name="AboutItemsArea" Orientation="Vertical" HorizontalAlignment="Stretch" Visibility="Collapsed">
-                    <Label Name="VersionInfo" HorizontalAlignment="Center" FontSize="10" Height="50" Padding="0,30,0,0" Foreground="#638190" Margin="0,-20,0,0" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans"></Label>
+                    <Label Name="VersionInfo" HorizontalAlignment="Center" FontSize="10" Height="50" Padding="0,30,0,0" Foreground="#638190" Margin="0,-20,0,0" FontFamily="pack:Up//application:,,,/Assets/Fonts/#Open Sans"></Label>
 
                     <Label Name="VersionOlder" Content=" checking version information " HorizontalAlignment="Center" FontSize="10" Height="50" Padding="0,30,0,0" Foreground="#F4044D" Margin="0,-20,0,0" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans"></Label>
                     <Label Name="VersionNewer" Content="" HorizontalAlignment="Center" FontSize="10" Height="50" Padding="0,30,0,0" Foreground="#0069FF" Margin="0,-20,0,0" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans"></Label>

DesktopEdge/Views/Screens/MainMenu.xaml.cs

@@ -47,7 +47,7 @@ private bool isBeta {
 
 		public void ShowUpdateAvailable() {
 			ForceUpdate.Visibility = Visibility.Visible;
-			if (state.PendingUpdate.TimeLeft>0) {
+			if (state.PendingUpdate.TimeLeft > 0) {
 				UpdateTimeLeft.Visibility = Visibility.Visible;
 				if (!state.AutomaticUpdatesDisabled) {
 					UpdateTimeLeft.Content = $"Automatic update to {state.PendingUpdate.Version} will occur on or after {state.PendingUpdate.InstallTime.ToString("g")}";
@@ -177,7 +177,7 @@ async private void SetAutomaticUpgradesMenuAction(object sender, MouseButtonEven
 			var monitorClient = (MonitorClient)Application.Current.Properties["MonitorClient"];
 
 			SvcResponse r = await monitorClient.SetAutomaticUpgradeDisabledAsync(disableAutomaticUpgrades);
-			if(r.Code != 0) {
+			if (r.Code != 0) {
 				logger.Error(r?.Error);
 			}
 			SetAutomaticUpgradesState();
@@ -214,7 +214,7 @@ private void UpdateState() {
 			LogLevelItems.Visibility = Visibility.Collapsed;
 			ReleaseStreamItems.Visibility = Visibility.Collapsed;
 			AutomaticUpgradesItems.Visibility = Visibility.Collapsed;
-			
+
 			if (menuState == "About") {
 				MenuTitle.Content = "About";
 				AboutItemsArea.Visibility = Visibility.Visible;
@@ -277,8 +277,8 @@ private void UpdateState() {
 				ConfigItems.Visibility = Visibility.Visible;
 				BackArrow.Visibility = Visibility.Visible;
 
-				ConfigPageSize.Value = ((Application.Current.Properties.Contains("ApiPageSize"))?Application.Current.Properties["ApiPageSize"].ToString(): "25");
-                ConfigIp.Value = Application.Current.Properties["ip"]?.ToString();
+				ConfigPageSize.Value = ((Application.Current.Properties.Contains("ApiPageSize")) ? Application.Current.Properties["ApiPageSize"].ToString() : "25");
+				ConfigIp.Value = Application.Current.Properties["ip"]?.ToString();
 				ConfigSubnet.Value = Application.Current.Properties["subnet"]?.ToString();
 				ConfigMtu.Value = Application.Current.Properties["mtu"]?.ToString();
 				ConfigDns.Value = Application.Current.Properties["dns"]?.ToString();
@@ -436,7 +436,8 @@ private void SetAutomaticUpgradesState() {
 			bool disabled = state.AutomaticUpdatesDisabled;
 			this.AutomaticUpgradesItemOn.IsSelected = !disabled;
 			this.AutomaticUpgradesItemOff.IsSelected = disabled;
-		}
+            this.UpdateUrl.Text = state.AutomaticUpdateURL;
+        }
 
 		async private void CheckForUpdate_Click(object sender, RoutedEventArgs e) {
 			logger.Info("checking for update...");
@@ -745,6 +746,18 @@ private void CheckRange() {
 			}
 			if (value < 10 || value > 500) value = defaultVal;
 			ConfigePageSizeNew.Text = value.ToString();
-		}
+        }
+
+        private async void SetUpdateUrlButton_Click() {
+            var monitorClient = (MonitorClient)Application.Current.Properties["MonitorClient"];
+
+            SvcResponse r = await monitorClient.SetAutomaticUpgradeURLAsync(UpdateUrl.Text);
+            if (r.Code != 0) {
+                logger.Error(r?.Error);
+                MainWindow.ShowError("Could not set url", r?.Error);
+            } else {
+                this.OnShowBlurb?.Invoke("Config Saved.");
+            }
+        }
     }
 }