Merge pull request #784 from openziti/release-2.5.2.6

Release 2.5.2.6
openziti · Jan 13, 2025 · 0e2f505 · 0e2f505
2 parents 7bb578b + 9937fe2
commit 0e2f505
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 20 deletions.
diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml
@@ -12,6 +12,7 @@ on:
       - main
   pull_request:
     branches:
+      - main
       - 'release-*'
       - 'beta-release-*'
 

diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs
@@ -1868,9 +1868,7 @@ private void CloseError(object sender, RoutedEventArgs e) {
             });
         }
 
-        private void CloseApp(object sender, RoutedEventArgs e) {
-            if (!UIUtils.IsLeftClick(e)) return;
-            if (!UIUtils.MouseUpForMouseDown(e)) return;
+        private void CloseApp(object sender, RoutedEventArgs e) {
             Application.Current.Shutdown();
         }
 
@@ -2038,20 +2036,17 @@ void OnAddIdentityAction(EnrollIdentifierPayload payload, UserControl toClose) {
         private async void CompleteExternalAuthEvent(ZitiIdentity identity, string provider) {
             try {
                 DataClient client = (DataClient)Application.Current.Properties["ServiceClient"];
-                if (identity?.ExtAuthProviders?.Count > 0) {
-                    ExternalAuthLoginResponse resp = await serviceClient.ExternalAuthLogin(identity.Identifier, provider);
-                    if (resp?.Error == null) {
-                        if (resp?.Data?.url != null) {
-                            Console.WriteLine(resp.Data?.url);
-                            Process.Start(resp.Data.url);
-                        } else {
-                            Console.WriteLine("The response contained no url???");
-                        }
+                ExternalAuthLoginResponse resp = await serviceClient.ExternalAuthLogin(identity.Identifier, provider);
+                if (resp?.Error == null) {
+                    if (resp?.Data?.url != null) {
+                        Console.WriteLine(resp.Data?.url);
+                        Process.Start(resp.Data.url);
                     } else {
-                        ShowError("Failed to Authenticate", resp.Error);
+                        Console.WriteLine("The response contained no url???");
                     }
                 } else {
-                    ShowError("Failed to Authenticate", "No external providers found! This is a configuration error. Inform your network administrator.");
+                    logger.Error("external auth failed: [{}]", resp.Error);
+                    ShowError("Failed to Authenticate", "External authentication could not start. This is likely a configuration error. Inform your network administrator.");
                 }
             } catch (Exception ex) {
                 logger.Error("unexpected error!", ex);

diff --git a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs
@@ -464,6 +464,8 @@ private void ShowExtAuthList(object sender, System.Windows.Input.MouseEventArgs
                     }
                 } else if (_identity?.ExtAuthProviders?.Count == 1) {
                     this.CompleteExternalAuth.Invoke(this.Identity, _identity?.ExtAuthProviders[0]);
+                } else {
+                    this.CompleteExternalAuth.Invoke(this.Identity, null);
                 }
                 fe.ContextMenu.PlacementTarget = fe;
                 fe.ContextMenu.IsOpen = true;

diff --git a/release-notes.md b/release-notes.md
@@ -1,3 +1,20 @@
+# Release 2.5.2.6
+
+## What's New
+* properly handle secondary auth by ext jwt 
+
+## Other changes
+* n/a
+
+## Bugs fixed:
+* n/a
+
+## 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.5
 ## 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.5",
-  "tag_name": "2.5.2.5",
-  "published_at": "2025-01-10T08:16:11Z",
+  "name": "2.5.2.6",
+  "tag_name": "2.5.2.6",
+  "published_at": "2025-01-13T07:08:38Z",
   "installation_critical": false,
   "assets": [
     {
-      "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"
+      "name": "Ziti.Desktop.Edge.Client-2.5.2.6.exe",
+      "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.5.2.6/Ziti.Desktop.Edge.Client-2.5.2.6.exe"
     }
   ]
 }
diff --git a/version b/version
@@ -1 +1 @@
-2.5.2.5
+2.5.2.6