Add refresh button and deterministic sort

cricketthomas · cricketthomas · commit bda841d5ebe3 · 2026-03-21T11:52:15.000-04:00
Add AuthService consent to avoid admins from manually adding permissions
diff --git a/src/uno/AzureKeyVaultStudio.slnx b/src/uno/AzureKeyVaultStudio.slnx
@@ -6,7 +6,5 @@
     <File Path="Directory.Packages.props" />
     <File Path="global.json" />
   </Folder>
-  <Project Path="../../../AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj">
-    <Deploy />
-  </Project>
+  <Project Path="AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj" />
 </Solution>
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/App.xaml.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/App.xaml.cs
@@ -200,7 +200,6 @@ private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
                     new ("Main", View: views.FindByViewModel<MainViewModel>(), IsDefault:true),
                     new ("SettingsPage", View: views.FindByViewModel<SettingsViewModel>()),
                     new ("SubscriptionsPage", View: views.FindByViewModel<SubscriptionViewModel>()),
-                    //new ("Second", View: views.FindByViewModel<SecondViewModel>()),
                 ]
             )
         );
@@ -209,7 +208,7 @@ private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
     private static void EnsureEarlyWindow(Window window)
     {
 #if WINDOWS && !HAS_UNO
-        window.AppWindow.Resize(new SizeInt32 { Width = 1000, Height = 600 });
+        window.AppWindow.Resize(new SizeInt32 { Width = 1100, Height = 640 });
         window.AppWindow.Move(new PointInt32 { X = 150, Y = 150 });
 
         window.ExtendsContentIntoTitleBar = true;
@@ -218,10 +217,11 @@ private static void EnsureEarlyWindow(Window window)
         window.AppWindow.TitleBar.PreferredTheme = theme.Theme switch
         {
             AppTheme.Light => TitleBarTheme.Light,
-            AppTheme.Dark => TitleBarTheme.Light,
+            AppTheme.Dark => TitleBarTheme.Dark,
             _ => TitleBarTheme.UseDefaultAppMode,
         };
 
+
         //window.AppWindow.TitleBar.ButtonBackgroundColor = Microsoft.UI.Colors.Transparent;
 
         window.SystemBackdrop = new MicaBackdrop()
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs
@@ -53,10 +53,12 @@ public static KeyVaultItemProperties FromSecretProperties(SecretProperties prope
           properties.Enabled,
           properties.RecoverableDays,
           properties.RecoveryLevel,
-          properties.Managed);
+          KeyVaultItemType.Secret,
+          properties.Managed
+          );
 
     public static IReadOnlyList<KeyVaultItemProperties> FromSecretProperties(IEnumerable<SecretProperties>? properties)
-        => properties is null ? Array.Empty<KeyVaultItemProperties>() : [.. properties.Select(FromSecretProperties)];
+        => properties is null ? [] : [.. properties.Select(FromSecretProperties)];
 
     public static KeyVaultItemProperties FromKeyProperties(KeyProperties properties)
         => Create(
@@ -73,10 +75,11 @@ public static KeyVaultItemProperties FromKeyProperties(KeyProperties properties)
             properties.Enabled,
             properties.RecoverableDays,
             properties.RecoveryLevel,
+            KeyVaultItemType.Key,
             properties.Managed);
 
     public static IReadOnlyList<KeyVaultItemProperties> FromKeyProperties(IEnumerable<KeyProperties>? properties)
-        => properties is null ? Array.Empty<KeyVaultItemProperties>() : [.. properties.Select(FromKeyProperties)];
+        => properties is null ?[] : [.. properties.Select(FromKeyProperties)];
 
     public static KeyVaultItemProperties FromCertificateProperties(CertificateProperties properties)
         => Create(
@@ -92,10 +95,12 @@ public static KeyVaultItemProperties FromCertificateProperties(CertificateProper
             properties.NotBefore,
             properties.Enabled,
             properties.RecoverableDays,
-            properties.RecoveryLevel);
+            properties.RecoveryLevel,
+            KeyVaultItemType.Certificate);
+
 
     public static IReadOnlyList<KeyVaultItemProperties> FromCertificateProperties(IEnumerable<CertificateProperties>? properties)
-        => properties is null ? Array.Empty<KeyVaultItemProperties>() : [.. properties.Select(FromCertificateProperties)];
+        => properties is null ? [] : [.. properties.Select(FromCertificateProperties)];
 
     public SecretProperties ToSecretProperties()
     {
@@ -134,12 +139,10 @@ public KeyProperties ToKeyProperties()
         return properties;
     }
 
-
     public CertificateProperties ToCertificateProperties()
     {
         var properties = new CertificateProperties(Id);
         properties.Enabled = Enabled;
-
         if (Tags != null && Tags.Count > 0)
         {
             foreach (var tag in Tags)
@@ -165,7 +168,9 @@ private static KeyVaultItemProperties Create(
         bool? enabled,
         int? recoverableDays,
         string? recoveryLevel,
-        bool? managed = null)
+        KeyVaultItemType type,
+        bool? managed = null
+        )
     {
         return new KeyVaultItemProperties
         {
@@ -183,7 +188,8 @@ private static KeyVaultItemProperties Create(
             RecoverableDays = recoverableDays,
             RecoveryLevel = recoveryLevel,
             Managed = managed,
-            Tags = tags is null ? new Dictionary<string, string>() : new Dictionary<string, string>(tags)
+            Tags = tags is null ? new Dictionary<string, string>() : new Dictionary<string, string>(tags),
+            Type = type
         };
     }
 
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Package.appxmanifest b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Package.appxmanifest
@@ -6,7 +6,7 @@
   xmlns:uap18="http://schemas.microsoft.com/appx/manifest/uap/windows10/18"
   IgnorableNamespaces="uap rescap uap18">
 
-  <Identity Version="2.0.0.0" Publisher="CN=FE9032D7-9FA7-4DED-9087-469BC45B4D99" Name="ArthurThomasIV.AzureKeyVaultExplorer-forAzure"/>
+  <Identity Version="2.0.1.0" Publisher="CN=FE9032D7-9FA7-4DED-9087-469BC45B4D99" Name="ArthurThomasIV.AzureKeyVaultExplorer-forAzure"/>
   <Properties>
     <DisplayName>Key Vault Explorer</DisplayName>
     <PublisherDisplayName>Arthur Thomas IV</PublisherDisplayName>
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/MainPage.xaml.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/MainPage.xaml.cs
@@ -37,7 +37,9 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
 
         try
         {
-            currentWindow.SetTitleBar(DefaultOverrideTitleBar);
+            //currentWindow.SetTitleBar(DefaultOverrideTitleBar);
+            currentWindow.SetTitleBar(DefaultOverrideTitleBar.TitleBarElement);
+
         }
         catch (Exception ex)
         {
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/ViewModels/VaultViewModel.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/ViewModels/VaultViewModel.cs
@@ -722,7 +722,7 @@ await ExecuteOnDispatcherAsync(() =>
     }
 
     [RelayCommand]
-    private async void OpenInAzure(KeyVaultItemProperties keyVaultItem)
+    private async Task OpenInAzure(KeyVaultItemProperties keyVaultItem)
     {
         if (keyVaultItem is null) return;
 
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Services/AuthService.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Services/AuthService.cs
@@ -113,15 +113,16 @@ public AuthService(ILocalSettingsService localSettings, ILogger<AuthService> log
             //.WithSystemWebViewOptions(options)
             //#endif
             authenticationResult = await authenticationClient.AcquireTokenInteractive(Constants.Scopes)
-                //.WithExtraScopesToConsent(Constants.AzureRMScope)
-                /*
-                 * Not including extra scopes allows personal accounts to sign in, however, this will be thrown.
-                 (Windows Azure Service Management API) is configured for use by Azure Active Directory users only.
-                    Please do not use the /consumers endpoint to serve this request. T
-
-                https://stackoverflow.com/questions/66470333/error-azure-key-vault-is-configured-for-use-by-azure-active-directory-users-on
-                 */
-
+                       //.WithExtraScopesToConsent(Constants.AzureRMScope)
+                       /*
+                        * Not including extra scopes allows personal accounts to sign in, however, this will be thrown.
+                        (Windows Azure Service Management API) is configured for use by Azure Active Directory users only.
+                           Please do not use the /consumers endpoint to serve this request. T
+
+                       https://stackoverflow.com/questions/66470333/error-azure-key-vault-is-configured-for-use-by-azure-active-directory-users-on
+                        */
+                .WithPrompt(Prompt.Consent)
+                .WithExtraScopesToConsent(Constants.AzureRMScope)
                 .ExecuteAsync(cancellationToken);
 
             IsAuthenticated = true;
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/en/Resources.resw b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/en/Resources.resw
@@ -522,6 +522,9 @@
   <data name="ItemDetailsOpenAppBarButton.Label" xml:space="preserve">
     <value>Open</value>
   </data>
+  <data name="ItemDetailsRefreshAppBarButton.Label" xml:space="preserve">
+    <value>Refresh</value>
+  </data>
   <data name="ItemDetailsCopyAppBarButton.Label" xml:space="preserve">
     <value>Copy</value>
   </data>
@@ -663,4 +666,4 @@
   <data name="SavedChangesMessage" xml:space="preserve">
     <value>Your changes have been saved.</value>
   </data>
-</root>
+</root>
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/es/Resources.resw b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/es/Resources.resw
@@ -522,6 +522,9 @@
   <data name="ItemDetailsOpenAppBarButton.Label" xml:space="preserve">
     <value>Abrir</value>
   </data>
+  <data name="ItemDetailsRefreshAppBarButton.Label" xml:space="preserve">
+    <value>Actualizar</value>
+  </data>
   <data name="ItemDetailsCopyAppBarButton.Label" xml:space="preserve">
     <value>Copiar</value>
   </data>
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/fr/Resources.resw b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/fr/Resources.resw
@@ -522,6 +522,9 @@
   <data name="ItemDetailsOpenAppBarButton.Label" xml:space="preserve">
     <value>Ouvrir</value>
   </data>
+  <data name="ItemDetailsRefreshAppBarButton.Label" xml:space="preserve">
+    <value>Actualiser</value>
+  </data>
   <data name="ItemDetailsCopyAppBarButton.Label" xml:space="preserve">
     <value>Copier</value>
   </data>
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/pt-BR/Resources.resw b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/pt-BR/Resources.resw
@@ -522,6 +522,9 @@
   <data name="ItemDetailsOpenAppBarButton.Label" xml:space="preserve">
     <value>Abrir</value>
   </data>
+  <data name="ItemDetailsRefreshAppBarButton.Label" xml:space="preserve">
+    <value>Atualizar</value>
+  </data>
   <data name="ItemDetailsCopyAppBarButton.Label" xml:space="preserve">
     <value>Copiar</value>
   </data>
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
@@ -57,6 +57,11 @@
                     x:Uid="ItemDetailsOpenAppBarButton"
                     Command="{x:Bind ViewModel.OpenInAzureCommand, Mode=OneWay}"
                     Icon="OpenFile" />
+
+                <AppBarButton
+                    x:Uid="ItemDetailsRefreshAppBarButton"
+                    Command="{x:Bind ViewModel.RefreshCommand, Mode=OneWay}"
+                    Icon="Refresh" />
                 <AppBarButton
                     x:Uid="ItemDetailsCopyAppBarButton"
                     Command="{x:Bind ViewModel.CopyCommand, Mode=OneWay}"
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/OverrideTitlebar.xaml.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/OverrideTitlebar.xaml.cs
@@ -37,17 +37,22 @@ public string SecondaryTitle
 
     private AppWindow? _appWindow;
 
+
+#if WINDOWS && !MACCATALYST && !HAS_UNO
+    public UIElement? TitleBarElement =>  DefaultTitleBar;
+#endif
+
     public OverrideTitlebar()
     {
         this.InitializeComponent();
-        _appWindow = (Application.Current as App)?.MainWindow?.AppWindow;
-        _appWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
-
+        //_appWindow = (Application.Current as App)?.MainWindow?.AppWindow;
 
+        //if (_appWindow is not null)
+        //{
+        //    _appWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
+        //}
     }
 
-
-
     private async void BackButton_Click(object sender, RoutedEventArgs e)
     {
         await GoBack();
@@ -75,7 +80,7 @@ private async Task GoBack()
         try
         {
             if (await navigator.CanGoBack())
-                 await navigator.NavigateBackAsync(this);
+                await navigator.NavigateBackAsync(this);
         }
         catch (Exception ex)
         {
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/SharedWindow.xaml.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/SharedWindow.xaml.cs
@@ -17,13 +17,13 @@ public SharedWindow()
         this.InitializeComponent();
 #if WINDOWS && !HAS_UNO
         this.Activated += OnWindowActivated;
-#endif
 
         if (Microsoft.UI.Windowing.AppWindowTitleBar.IsCustomizationSupported())
         {
             AppWindow.TitleBar.ExtendsContentIntoTitleBar = true;
             AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
         }
+#endif
 
 
         AppWindow.SetIcon("Assets/AppIcon.png");
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/ItemPropertiesViewModel.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/ItemPropertiesViewModel.cs
@@ -126,6 +126,11 @@ private void ClearClipboard()
         }
     }
 
+    [RelayCommand]
+    private async Task Refresh()
+    {
+        await GetPropertiesForKeyVaultValue(OpenedItem);
+    }
 
     [RelayCommand]
     private async Task Copy(string? version = null)
@@ -264,25 +269,31 @@ public async Task GetPropertiesForKeyVaultValue(KeyVaultItemProperties model)
         {
             case KeyVaultItemType.Certificate:
                 var certificateProperties = await _vaultService.GetCertificateProperties(model.VaultUri, model.Name);
+                var latestCert = certificateProperties.OrderByDescending(x => x.UpdatedOn).First();
                 ItemPropertiesList = new ObservableCollection<KeyVaultItemProperties>(KeyVaultItemProperties.FromCertificateProperties(certificateProperties));
-                IsEnabled = certificateProperties.First().Enabled ?? false;
+                IsEnabled = latestCert.Enabled ?? false;
                 IsCertificate = true;
+                model = KeyVaultItemProperties.FromCertificateProperties(latestCert);
                 break;
 
             case KeyVaultItemType.Key:
                 var keyPropertiesList = await _vaultService.GetKeyProperties(model.VaultUri, model.Name);
-                IsManaged = keyPropertiesList.First().Managed;
-                IsEnabled = keyPropertiesList.First().Enabled ?? false;
+                var latestKey = keyPropertiesList.OrderByDescending(x => x.UpdatedOn).First();
+                IsManaged = latestKey.Managed;
+                IsEnabled = latestKey.Enabled ?? false;
                 ItemPropertiesList = new ObservableCollection<KeyVaultItemProperties>(KeyVaultItemProperties.FromKeyProperties(keyPropertiesList));
                 IsKey = true;
+                model = KeyVaultItemProperties.FromKeyProperties(latestKey);
                 break;
 
             case KeyVaultItemType.Secret:
                 var secretPropertiesList = await _vaultService.GetSecretProperties(model.VaultUri, model.Name);
-                IsManaged = secretPropertiesList.First().Managed;
-                IsEnabled = secretPropertiesList.First().Enabled ?? false;
+                var latestSecret = secretPropertiesList.OrderByDescending(x => x.UpdatedOn).First();
+                IsManaged = latestSecret.Managed;
+                IsEnabled = latestSecret.Enabled ?? false;
                 ItemPropertiesList = new ObservableCollection<KeyVaultItemProperties>(KeyVaultItemProperties.FromSecretProperties(secretPropertiesList));
                 IsSecret = true;
+                model = KeyVaultItemProperties.FromSecretProperties(latestSecret);
                 break;
 
             default:
@@ -291,15 +302,14 @@ public async Task GetPropertiesForKeyVaultValue(KeyVaultItemProperties model)
                 IsKey = false;
                 break;
         }
-
         OpenedItem = model;
         UpdateVisibilityFlags();
 
         Title = $"{model.Type} {model.Name} Properties";
     }
 
     [RelayCommand]
-    private async void OpenInAzure()
+    private async Task OpenInAzure()
     {
         if (OpenedItem is null) return;
         var uri = new Uri($"https://portal.azure.com/#@{_authService.TenantName}/asset/Microsoft_Azure_KeyVault/{OpenedItem.Type}/{OpenedItem.Id}");
diff --git a/src/uno/global.json b/src/uno/global.json
@@ -1,7 +1,7 @@
 {
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "6.6.0-dev.142"
+    "Uno.Sdk": "6.6.0-dev.148"
   },
   "sdk": {
     "allowPrerelease": false

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,9 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)`
`37`	`37`
`38`	`38`	`try`
`39`	`39`	`{`
`40`		`- currentWindow.SetTitleBar(DefaultOverrideTitleBar);`
	`40`	`+ //currentWindow.SetTitleBar(DefaultOverrideTitleBar);`
	`41`	`+ currentWindow.SetTitleBar(DefaultOverrideTitleBar.TitleBarElement);`
	`42`	`+`
`41`	`43`	`}`
`42`	`44`	`catch (Exception ex)`
`43`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -722,7 +722,7 @@ await ExecuteOnDispatcherAsync(() =>`
`722`	`722`	`}`
`723`	`723`
`724`	`724`	`[RelayCommand]`
`725`		`- private async void OpenInAzure(KeyVaultItemProperties keyVaultItem)`
	`725`	`+ private async Task OpenInAzure(KeyVaultItemProperties keyVaultItem)`
`726`	`726`	`{`
`727`	`727`	`if (keyVaultItem is null) return;`
`728`	`728`