UI: use password fields for EAB key and Account Key

Author: webprofusion-chrisc

src/Certify.UI.Shared/Windows/EditAccountDialog.xaml

@@ -172,13 +172,12 @@
                                 Margin="0,0,8,0"
                                 VerticalAlignment="Top"
                                 Content="Key (HMAC)" />
-                            <TextBox
+                            <PasswordBox
+                                x:Name="EabKey"
                                 Width="300"
                                 Height="23"
                                 HorizontalAlignment="Left"
-                                VerticalAlignment="Top"
-                                Text="{Binding Item.EabKey}"
-                                TextWrapping="NoWrap" />
+                                VerticalAlignment="Top" />
                         </StackPanel>
                         <StackPanel
                             Margin="0,0,0,4"
@@ -228,15 +227,12 @@
                                 Margin="0,0,8,0"
                                 VerticalAlignment="Top"
                                 Content="Account Key" />
-                            <TextBox
+                            <PasswordBox
                                 x:Name="AccountKey"
                                 Width="300"
                                 Height="48"
                                 HorizontalAlignment="Left"
-                                VerticalAlignment="Top"
-                                AcceptsReturn="True"
-                                Text="{Binding Item.ImportedAccountKey}"
-                                TextWrapping="Wrap" />
+                                VerticalAlignment="Top" />
 
 
                         </StackPanel>

src/Certify.UI.Shared/Windows/EditAccountDialog.xaml.cs

@@ -4,8 +4,6 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Input;
 using Certify.Models;
 using Org.BouncyCastle.Crypto.EC;
@@ -102,6 +100,17 @@ private async void Save_Click(object sender, RoutedEventArgs e)
                 }
             }
 
+            // use password fields (account key and eab key) if set
+            if (!string.IsNullOrWhiteSpace(EabKey.Password))
+            {
+                Item.EabKey = EabKey.Password;
+            }
+
+            if (!string.IsNullOrWhiteSpace(AccountKey.Password))
+            {
+                Item.ImportedAccountKey = AccountKey.Password;
+            }
+
             // if EAB is required and not importing an existing account, show CA specific instructions or general prompt for EAB
             if (ca.RequiresExternalAccountBinding && (string.IsNullOrEmpty(Item.ImportedAccountKey) || string.IsNullOrEmpty(Item.ImportedAccountURI)))
             {
@@ -191,7 +200,7 @@ private void AccountKeyGenerate_Click(object sender, RoutedEventArgs e)
 
             Item.ImportedAccountKey = pem;
 
-            BindingOperations.GetBindingExpressionBase((TextBox)AccountKey, TextBox.TextProperty).UpdateTarget();
+            AccountKey.Password = pem;
         }
     }
 }