Apply key store options to the key store origin as well during publish

leosac · Mar 8, 2024 · 75180c9 · 75180c9
1 parent 0dc5f0a
commit 75180c9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/KeyManager.Library.UI/PublishKeyStoreDialog.xaml b/KeyManager.Library.UI/PublishKeyStoreDialog.xaml
@@ -35,7 +35,7 @@
  <ToggleButton IsChecked="{Binding Options.DryRun}" Style="{StaticResource MaterialDesignSwitchLightToggleButton}" />
  <TextBlock Text="{x:Static properties:Resources.DryRun}" Padding="3" />
  </StackPanel>
- <TextBox Text="{Binding Options.PublishVariable}" Margin="5,5,5,15"
+ <TextBox Text="{Binding Options.PublishVariable, UpdateSourceTrigger=PropertyChanged}" Margin="5,5,5,15"
  materialDesign:HintAssist.HelperText="{x:Static properties:Resources.PublishVariableHelper}"
  materialDesign:HintAssist.Hint="{x:Static properties:Resources.PublishVariable}"/>
  <Expander HorizontalAlignment="Stretch" Header="{x:Static properties:Resources.WrappingKey}" Margin="5">

diff --git a/KeyManager.Library/KeyStore/KeyStore.cs b/KeyManager.Library/KeyStore/KeyStore.cs
@@ -276,7 +276,7 @@ public virtual async Task Publish(KeyStore store, Func<string, KeyStore?> getFav
  {
  var cryptogram = new KeyEntryCryptogram
  {
- Identifier = id
+ Identifier = entry.Identifier
  // TODO: we may want to have a different wrapping key per Cryptogram later on
  };
 

diff --git a/KeyManager/Domain/EditKeyStoreControlViewModel.cs b/KeyManager/Domain/EditKeyStoreControlViewModel.cs
@@ -257,6 +257,7 @@ public async Task Publish()
  deststore.KeyEntryRetrieved += (sender, e) => ProgressValue++;
  deststore.KeyEntryUpdated += (sender, e) => ProgressValue++;
  deststore.Options = model.Options;
+ KeyStore.Options = model.Options; // Options object contains information for source and destination key stores, this should probably be splitted...
  var initCallback = new Action<KeyStore, KeyEntryClass, int>((_, _, nbentries) =>
  {
  ProgressMaximum = nbentries * 2;