Merge pull request #782 from openziti/release-2.5.2.5

make 2.5.2.5
openziti · Jan 10, 2025 · 7bb578b · 7bb578b
2 parents ebbfea7 + 8c4f47f
commit 7bb578b
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 16 deletions.
diff --git a/DesktopEdge/Views/Controls/StyledButton.xaml b/DesktopEdge/Views/Controls/StyledButton.xaml
@@ -28,7 +28,7 @@
         </Grid.RowDefinitions>
 
         <Rectangle x:Name="ButtonBg"
-                   Opacity="0.8" RadiusX="7" Grid.Row="8" 
+                   Opacity="0.8" RadiusX="7"
                    RadiusY="7" ClipToBounds="True" Height="30" 
                    VerticalAlignment="Bottom" MouseUp="DoClick" 
                    Cursor="Hand" MouseEnter="Hover" 
@@ -38,15 +38,15 @@
         />
 
         <Rectangle x:Name="ButtonBgDarken"
-                   Opacity="0.0" RadiusX="7" Grid.Row="8" 
+                   Opacity="0.0" RadiusX="7"
                    RadiusY="7" ClipToBounds="True" Height="30"
                    VerticalAlignment="Bottom" MouseUp="DoClick"
                    Cursor="Hand" MouseEnter="Hover" 
                    MouseLeave="Leave" MouseDown="Down"
                    Style="{StaticResource Dark}"
                    Margin="{Binding ButtonMargin, RelativeSource={RelativeSource AncestorType=local:StyledButton}}"
         />
-        <Label x:Name="ButtonLabel" HorizontalAlignment="Center" 
+        <Label x:Name="ButtonLabel" HorizontalAlignment="Center"
                IsHitTestVisible="False" Foreground="#FFFFFF" Grid.Row="8"></Label>
     </Grid>
 </UserControl>
diff --git a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs
@@ -462,6 +462,8 @@ private void ShowExtAuthList(object sender, System.Windows.Input.MouseEventArgs
                         menuItem.Template = controlTemplate;
                         contextMenu.Items.Add(menuItem);
                     }
+                } else if (_identity?.ExtAuthProviders?.Count == 1) {
+                    this.CompleteExternalAuth.Invoke(this.Identity, _identity?.ExtAuthProviders[0]);
                 }
                 fe.ContextMenu.PlacementTarget = fe;
                 fe.ContextMenu.IsOpen = true;

diff --git a/DesktopEdge/Views/Screens/IdentityDetails.xaml b/DesktopEdge/Views/Screens/IdentityDetails.xaml
@@ -252,8 +252,9 @@
                                 IsTabStop="True"
                                 ButtonMargin="10,0,10,0"
                                 Margin="20,0,20,0"
-                                MouseUp="ExtAuthProvider"
+                                MouseUp="AuthenticateWithExtAuthProvider"
                                 VerticalAlignment="Center"
+                                Visibility="Collapsed"
                             />
                         </StackPanel>
                     </Border>

diff --git a/DesktopEdge/Views/Screens/IdentityDetails.xaml.cs b/DesktopEdge/Views/Screens/IdentityDetails.xaml.cs
@@ -238,7 +238,6 @@ public void UpdateView() {
 
             if (Identity.NeedsExtAuth) {
                 ExternalProviderPanel.Visibility = Visibility.Visible;
-                AuthenticateWithProvider.Visibility = Visibility.Visible;
                 ExternalProviderLabel.Visibility = Visibility.Visible;
             } else if (Identity.IsMFANeeded) {
                 TOTPPanel.Visibility = Visibility.Visible;
@@ -488,7 +487,7 @@ private void ExtAuthTOTP(object sender, MouseButtonEventArgs e) {
             }
         }
 
-        private void ExtAuthProvider(object sender, MouseButtonEventArgs e) {
+        private void AuthenticateWithExtAuthProvider(object sender, MouseButtonEventArgs e) {
             if (_identity.NeedsExtAuth) {
                 if(ProviderList.SelectedItem == null) {
                     Logger.Warn("no provider selected");
@@ -621,6 +620,11 @@ private void DoMFA(object sender, MouseButtonEventArgs e) {
 
         private bool userInitiatedChange = false;
         private void ProviderList_SelectionChanged(object sender, SelectionChangedEventArgs e) {
+            if (ProviderList.SelectedItem != null) {
+                AuthenticateWithProvider.Visibility = Visibility.Visible;
+            } else {
+                AuthenticateWithProvider.Visibility = Visibility.Collapsed;
+            }
             IsDefaultProvider.IsChecked = Identity.IsDefaultProvider(ProviderList.SelectedItem?.ToString());
             userInitiatedChange = false;
         }

diff --git a/Installer/build.ps1 b/Installer/build.ps1
@@ -28,7 +28,7 @@ $ADV_INST_HOME = "C:\Program Files (x86)\Caphyon\Advanced Installer ${ADV_INST_V
 $SIGNTOOL="${ADV_INST_HOME}\third-party\winsdk\x64\signtool.exe"
 $ADVINST = "${ADV_INST_HOME}\bin\x86\AdvancedInstaller.com"
 $ADVPROJECT = "${scriptPath}\ZitiDesktopEdge.aip"
-$ZITI_EDGE_TUNNEL_VERSION="v1.3.5"
+$ZITI_EDGE_TUNNEL_VERSION="v1.3.7"
 
 echo "Cleaning previous build folder if it exists"
 Remove-Item "${buildPath}" -r -ErrorAction Ignore

diff --git a/build-test-release.ps1 b/build-test-release.ps1
@@ -85,9 +85,14 @@ if($revertGitAfter) {
 
 Write-Host ""
 Write-Host "Dependencies from ziti-edge-tunnel:"
-Write-Host "---------------------------------------------" 
-& '.\Installer\build\service\ziti-edge-tunnel.exe' version -v
-Write-Host "" 
+Write-Host "---------------------------------------------"
+& '.\Installer\build\service\ziti-edge-tunnel.exe' version -v | ForEach-Object {
+    if ($_ -notmatch "StartServiceCtrlDispatcher failed") {
+        "* $_"
+    }
+}
+Write-Host ""
+
 
 Write-Host "Start a python server in this location with:"
 Write-Host "" 

diff --git a/release-notes.md b/release-notes.md
@@ -1,3 +1,19 @@
+# Release 2.5.2.5
+## What's New
+* nothing - bugfix
+
+## Other changes
+* dependency update
+
+## Bugs fixed:
+* none
+
+## Dependencies
+
+* ziti-tunneler: v1.3.7
+* ziti-sdk:      1.3.5
+* tlsuv:         v0.33.2[OpenSSL 3.3.1 4 Jun 2024]
+
 # Release 2.5.2.4
 ## What's New
 * nothing - bugfix

diff --git a/release-streams/beta.json b/release-streams/beta.json
@@ -1,12 +1,12 @@
 {
-  "name": "2.5.2.4",
-  "tag_name": "2.5.2.4",
-  "published_at": "2025-01-08T04:13:51Z",
+  "name": "2.5.2.5",
+  "tag_name": "2.5.2.5",
+  "published_at": "2025-01-10T08:16:11Z",
   "installation_critical": false,
   "assets": [
     {
-      "name": "Ziti.Desktop.Edge.Client-2.5.2.4.exe",
-      "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.5.2.4/Ziti.Desktop.Edge.Client-2.5.2.4.exe"
+      "name": "Ziti.Desktop.Edge.Client-2.5.2.5.exe",
+      "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.5.2.5/Ziti.Desktop.Edge.Client-2.5.2.5.exe"
     }
   ]
 }
diff --git a/version b/version
@@ -1 +1 @@
-2.5.2.4
+2.5.2.5