Fix Default Key Entry persistent definition and related deep copy method

leosac · Jan 10, 2024 · 7ab5ebe · 7ab5ebe
1 parent 5508ffe
commit 7ab5ebe
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 18 deletions.
diff --git a/KeyManager.Library.UI/Domain/KeyEntriesControlViewModel.cs b/KeyManager.Library.UI/Domain/KeyEntriesControlViewModel.cs
@@ -59,7 +59,10 @@ public KeyEntriesControlViewModel(ISnackbarMessageQueue snackbarMessageQueue, Ke
                     {
                         DataContext = model
                     };
-                    await EditDefaultKeyEntry(dialog);
+                    if (await EditDefaultKeyEntry(dialog))
+                    {
+                        OnDefaultKeyEntryUpdated();
+                    }
                 });
 
             EditKeyEntryCommand = new AsyncRelayCommand<SelectableKeyEntryId>(
@@ -177,6 +180,12 @@ public KeyEntriesControlViewModel(ISnackbarMessageQueue snackbarMessageQueue, Ke
         private readonly ICollectionView _identifiersView;
         private string? _searchTerms;
 
+        public event EventHandler? DefaultKeyEntryUpdated;
+        protected void OnDefaultKeyEntryUpdated()
+        {
+            DefaultKeyEntryUpdated?.Invoke(this, new EventArgs());
+        }
+
         public ObservableCollection<SelectableKeyEntryId> Identifiers { get; }
 
         public ObservableCollection<WizardFactory> WizardFactories { get; }
@@ -274,16 +283,18 @@ private async Task GenerateKeyEntry(KeyEntryDialog dialog)
 
         public AsyncRelayCommand EditDefaultKeyEntryCommand { get; }
 
-        private async Task EditDefaultKeyEntry(KeyEntryDialog dialog)
+        private async Task<bool> EditDefaultKeyEntry(KeyEntryDialog dialog)
         {
             var ret = await DialogHelper.ForceShow(dialog, "RootDialog");
             if (ret != null && dialog.DataContext is KeyEntryDialogViewModel model)
             {
                 if (KeyStore != null && model.KeyEntry != null)
                 {
                     KeyStore.DefaultKeyEntries[KeyEntryClass] = model.KeyEntry;
+                    return true;
                 }
             }
+            return false;
         }
 
         public AsyncRelayCommand<SelectableKeyEntryId> EditKeyEntryCommand { get; }

diff --git a/KeyManager.Library/Key.cs b/KeyManager.Library/Key.cs
@@ -1,5 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Leosac.KeyManager.Library.Policy;
+using Newtonsoft.Json;
 using System.Collections.ObjectModel;
 using System.Text;
 
@@ -86,6 +87,7 @@ public uint KeySize
 
         public ObservableCollection<string> Tags { get; set; }
 
+        [JsonIgnore]
         public ObservableCollection<IKeyPolicy> Policies { get; set; }
 
         private KeyLink _link;

diff --git a/KeyManager.Library/KeyStore/KeyEntry.cs b/KeyManager.Library/KeyStore/KeyEntry.cs
@@ -87,8 +87,19 @@ protected KeyEntryVariant CreateVariantFromAlgo(string algo, uint keySize)
 
         public KeyEntry? DeepCopy()
         {
-            var serialized = JsonConvert.SerializeObject(this);
-            return serialized != null ? JsonConvert.DeserializeObject<KeyEntry>(serialized) : null;
+            var serialized = JsonConvert.SerializeObject(this, CreateJsonSerializerSettings());
+            return serialized != null ? JsonConvert.DeserializeObject(serialized, this.GetType(), CreateJsonSerializerSettings()) as KeyEntry : null;
+        }
+
+        public static JsonSerializerSettings CreateJsonSerializerSettings()
+        {
+            return new JsonSerializerSettings
+            {
+                TypeNameHandling = TypeNameHandling.Auto,
+                NullValueHandling = NullValueHandling.Ignore,
+                ObjectCreationHandling = ObjectCreationHandling.Replace,
+                Formatting = Formatting.Indented
+            };
         }
     }
 }
diff --git a/KeyManager.Library/KeyStore/KeyStore.cs b/KeyManager.Library/KeyStore/KeyStore.cs
@@ -14,13 +14,7 @@ public abstract class KeyStore
 
         protected KeyStore()
         {
-            _jsonSettings = new JsonSerializerSettings
-            {
-                TypeNameHandling = TypeNameHandling.Auto,
-                NullValueHandling = NullValueHandling.Ignore,
-                ObjectCreationHandling = ObjectCreationHandling.Replace,
-                Formatting = Formatting.Indented
-            };
+            _jsonSettings = KeyEntry.CreateJsonSerializerSettings();
             DefaultKeyEntries = new Dictionary<KeyEntryClass, KeyEntry?>();
             Attributes = new Dictionary<string, string>();
         }

diff --git a/KeyManager/Domain/EditKeyStoreControlViewModel.cs b/KeyManager/Domain/EditKeyStoreControlViewModel.cs
@@ -39,6 +39,17 @@ public EditKeyStoreControlViewModel(ISnackbarMessageQueue snackbarMessageQueue)
         protected ISnackbarMessageQueue _snackbarMessageQueue;
 
         protected IList<KeyEntriesControlViewModel> _keModels;
+        protected void OnKeyStoreUpdated()
+        {
+            if (Favorite != null)
+            {
+                var favorites = Favorites.GetSingletonInstance();
+                if (favorites != null)
+                {
+                    SaveToFavorite(favorites, Favorite);
+                }
+            }
+        }
 
         private KeyStore? _keyStore;
 
@@ -123,6 +134,10 @@ public async Task OpenKeyStore()
                     foreach (var kclass in classes)
                     {
                         var model = new KeyEntriesControlViewModel(_snackbarMessageQueue, kclass) { KeyStore = KeyStore };
+                        model.DefaultKeyEntryUpdated += (sender, e) =>
+                        {
+                            OnKeyStoreUpdated();
+                        };
                         _keModels.Add(model);
                         Tabs.Add(new TabItem
                         {
@@ -180,7 +195,6 @@ public static async Task EditFavorite(Favorites? favorites, Favorite fav)
             {
                 if (favorites != null)
                 {
-                    int favindex = favorites.KeyStores.IndexOf(fav);
                     var model = new KeyStoreSelectorDialogViewModel
                     {
                         Message = "Edit the Key Store Favorite"
@@ -196,19 +210,25 @@ public static async Task EditFavorite(Favorites? favorites, Favorite fav)
                         object? ret = await DialogHost.Show(dialog, "RootDialog");
                         if (ret != null)
                         {
-                            if (favindex > -1)
-                            {
-                                favorites.KeyStores.RemoveAt(favindex);
-                            }
                             fav.Properties = model.SelectedFactoryItem.DataContext.Properties;
-                            favorites.KeyStores.Add(fav);
-                            favorites.SaveToFile();
+                            SaveToFavorite(favorites, fav);
                         }
                     }
                 }
             }
         }
 
+        private static void SaveToFavorite(Favorites favorites, Favorite fav)
+        {
+            int favindex = favorites.KeyStores.IndexOf(fav);
+            if (favindex > -1)
+            {
+                favorites.KeyStores.RemoveAt(favindex);
+            }
+            favorites.KeyStores.Add(fav);
+            favorites.SaveToFile();
+        }
+
         public async Task Publish()
         {
             if (KeyStore != null)