Merge pull request #780 from openziti/issue-779-ext-provider-by-click

change the hover action to on click for ext providers
openziti · Jan 8, 2025 · 4f49e88 · 4f49e88
2 parents 53eef96 + d1ea224
commit 4f49e88
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 15 deletions.
diff --git a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml
@@ -122,8 +122,7 @@
                     VerticalAlignment="Stretch"
                     HorizontalAlignment="Stretch"
                     Cursor="Hand"
-                    MouseUp="DoMFAOrOpen"
-                    MouseEnter="ExternalIdpHover"
+                    MouseLeftButtonUp="DoMFAOrOpen"
                 >
                     <Rectangle.ContextMenu>
                         <ContextMenu Name="IconContext"

diff --git a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs
@@ -29,6 +29,7 @@ limitations under the License.
 using WinForms=System.Windows.Forms;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 
 namespace ZitiDesktopEdge {
@@ -389,7 +390,7 @@ private void DoMFAOrOpen(object sender, System.Windows.Input.MouseButtonEventArg
                 PostureTimedOut.Visibility == Visibility.Visible) {
                 MFAAuthenticate(sender, e);
             } else if (ExtAuthRequired.Visibility == Visibility.Visible) {
-                CompleteExtAuth(sender, e);
+                ShowExtAuthList(sender, e);
             } else {
                 OpenDetails(sender, e);
             }
@@ -433,7 +434,7 @@ async void performExtAuth() {
             }
         }
 
-        private void ExternalIdpHover(object sender, System.Windows.Input.MouseEventArgs e) {
+        private void ShowExtAuthList(object sender, System.Windows.Input.MouseEventArgs e) {
             if (!_identity.NeedsExtAuth) {
                 return;
             }
@@ -452,8 +453,7 @@ private void ExternalIdpHover(object sender, System.Windows.Input.MouseEventArgs
                     // Add menu items dynamically
                     foreach (var provider in _identity.ExtAuthProviders) {
                         var menuItem = new MenuItem();
-                        menuItem.Click += (s, mouseEventArgs) =>
-                        {
+                        menuItem.Click += (s, mouseEventArgs) => {
                             CompleteExternalAuth?.Invoke(Identity, provider);
                         };
                         menuItem.Header = provider;
@@ -465,6 +465,8 @@ private void ExternalIdpHover(object sender, System.Windows.Input.MouseEventArgs
                 }
                 fe.ContextMenu.PlacementTarget = fe;
                 fe.ContextMenu.IsOpen = true;
+            } else {
+                CompleteExtAuth(sender, e as MouseButtonEventArgs);
             }
         }
     }

diff --git a/DesktopEdge/Views/Screens/IdentityDetails.xaml b/DesktopEdge/Views/Screens/IdentityDetails.xaml
@@ -227,8 +227,8 @@
                                     Grid.Column="0"
                                     Fill="Purple"
                                 />
-                                <TextBox
-                                    Text="Default provider?"
+                                <Label
+                                    Content="Default provider?"
                                     Margin="0,5,0,5"
                                     Background="Transparent"
                                     VerticalAlignment="Center"

diff --git a/DesktopEdge/Views/Screens/IdentityDetails.xaml.cs b/DesktopEdge/Views/Screens/IdentityDetails.xaml.cs
@@ -647,6 +647,10 @@ private void IsDefaultProvider_Unchecked(object sender, RoutedEventArgs e) {
         }
 
         private void IsDefaultProvider_PreviewMouseDown(object sender, MouseButtonEventArgs e) {
+            if (ProviderList.SelectedItem == null) {
+                e.Handled = true;
+                return;
+            }
             userInitiatedChange = true;
         }
 

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.3"
+$ZITI_EDGE_TUNNEL_VERSION="v1.3.5"
 
 echo "Cleaning previous build folder if it exists"
 Remove-Item "${buildPath}" -r -ErrorAction Ignore

diff --git a/release-notes.md b/release-notes.md
@@ -1,3 +1,19 @@
+# Release 2.5.2.4
+## What's New
+* nothing - bugfix
+
+## Other changes
+* [issue 779 - changed on hover to on click for initiating external provider auth](https://github.com/openziti/desktop-edge-win/issues/779)
+
+## Bugs fixed:
+* none
+
+## Dependencies
+
+* ziti-tunneler: v1.3.5
+* ziti-sdk:      1.3.4
+* tlsuv:         v0.33.1[OpenSSL 3.3.1 4 Jun 2024]
+
 # Release 2.5.2.3
 ## 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.3",
-  "tag_name": "2.5.2.3",
-  "published_at": "2024-12-20T07:12:05Z",
+  "name": "2.5.2.4",
+  "tag_name": "2.5.2.4",
+  "published_at": "2025-01-08T04:13:51Z",
   "installation_critical": false,
   "assets": [
     {
-      "name": "Ziti.Desktop.Edge.Client-2.5.2.3.exe",
-      "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.5.2.3/Ziti.Desktop.Edge.Client-2.5.2.3.exe"
+      "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"
     }
   ]
 }
diff --git a/version b/version
@@ -1 +1 @@
-2.5.2.3
+2.5.2.4