From 60ca5ff76836343f70765d2cdc9279be29f912ff Mon Sep 17 00:00:00 2001
From: Sacha Bruttin <sacha@bruttin.com>
Date: Fri, 5 May 2023 09:12:10 +0200
Subject: [PATCH] 98 encrypt connection string when entered with characters
 (#100)

* #98 Show * when password is entered
* Remove old Textbox replaced by PasswordBox
* Add format validation on AccountEndpoint
---
 src/CosmosDbExplorer/App.xaml                 |  18 +-
 .../Styles/CosmosControls.xaml                |  86 +++++++---
 src/CosmosDbExplorer/Styles/Icons.xaml        | 129 +++++++-------
 src/CosmosDbExplorer/Styles/MetroWindow.xaml  |   4 +-
 src/CosmosDbExplorer/Styles/TextBlock.xaml    |  47 ++++--
 .../Styles/Themes/Dark.Blue.xaml              |  25 ++-
 .../Styles/Themes/Light.Blue.xaml             |  25 ++-
 src/CosmosDbExplorer/Styles/_Thickness.xaml   |  12 +-
 .../ViewModels/AccountSettingsViewModel.cs    |   5 +
 .../Views/AccountSettingsPage.xaml            | 158 ++++++++++++------
 10 files changed, 326 insertions(+), 183 deletions(-)

diff --git a/src/CosmosDbExplorer/App.xaml b/src/CosmosDbExplorer/App.xaml
index 856231c..05ac986 100644
--- a/src/CosmosDbExplorer/App.xaml
+++ b/src/CosmosDbExplorer/App.xaml
@@ -3,16 +3,16 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converters="clr-namespace:CosmosDbExplorer.Converters"
-    Startup="OnStartup"
-    Exit="OnExit"
     xmlns:theming="clr-namespace:CosmosDbExplorer.Styles"
-    DispatcherUnhandledException="OnDispatcherUnhandledException">
+    DispatcherUnhandledException="OnDispatcherUnhandledException"
+    Exit="OnExit"
+    Startup="OnStartup">
 
     <Application.Resources>
         <ResourceDictionary>
             <theming:CosmosDbExplorerThemeProvider x:Key="{x:Static theming:CosmosDbExplorerThemeProvider.DefaultInstance}" />
 
-            <!-- Converters -->
+            <!--  Converters  -->
             <converters:BoolToVisibilityConverter x:Key="boolToVisibilityConverter" />
             <converters:NullToVisibilityConverter x:Key="nullToVisibilityConverter" />
             <converters:ActiveDocumentConverter x:Key="ActiveDocumentConverter" />
@@ -23,7 +23,7 @@
             <converters:BytesToGigaBytesConverter x:Key="BytesToGigaBytesConverter" />
             <!--<converters:QueryMetricsToStringConverter x:Key="queryMetricsToStringConverter" />-->
             <!--<converters:QueryMetricsToDocumentConverter x:Key="queryMetricsToDocumentConverter" />-->
-            
+
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/Styles/_FontSizes.xaml" />
                 <ResourceDictionary Source="/Styles/_Thickness.xaml" />
@@ -31,16 +31,16 @@
                 <ResourceDictionary Source="/Styles/TextBlock.xaml" />
                 <ResourceDictionary Source="/Styles/Icons.xaml" />
                 <!--
-                MahApps.Metro resource dictionaries.
-                Learn more about using MahApps.Metro at https://mahapps.com/
+                    MahApps.Metro resource dictionaries.
+                    Learn more about using MahApps.Metro at https://mahapps.com/
                 -->
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
-                <!-- Accent and AppTheme setting -->
+                <!--  Accent and AppTheme setting  -->
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Blue.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Fluent;component/Themes/Generic.xaml" />
-                <!-- Cosmos resource dictionaries -->
+                <!--  Cosmos resource dictionaries  -->
                 <ResourceDictionary Source="pack://application:,,,/CosmosDbExplorer;component/Styles/CosmosControls.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/CosmosDbExplorer;component/Styles/Themes/Dark.Blue.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/CosmosDbExplorer;component/Styles/Themes/Light.Blue.xaml" />
diff --git a/src/CosmosDbExplorer/Styles/CosmosControls.xaml b/src/CosmosDbExplorer/Styles/CosmosControls.xaml
index 956a4ce..8aa1c00 100644
--- a/src/CosmosDbExplorer/Styles/CosmosControls.xaml
+++ b/src/CosmosDbExplorer/Styles/CosmosControls.xaml
@@ -1,37 +1,54 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:avalonEdit="http://icsharpcode.net/sharpdevelop/avalonedit"
-                    xmlns:converters="clr-namespace:CosmosDbExplorer.Converters"
-                    xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-                    xmlns:properties="clr-namespace:CosmosDbExplorer.Properties">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:avalonEdit="http://icsharpcode.net/sharpdevelop/avalonedit"
+    xmlns:converters="clr-namespace:CosmosDbExplorer.Converters"
+    xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+    xmlns:properties="clr-namespace:CosmosDbExplorer.Properties">
 
     <converters:ColorToBrushConverter x:Key="colorToBrushConverter" />
     <converters:NullToVisibilityConverter x:Key="nullToVisibilityConverter" />
 
-    <Style BasedOn="{StaticResource {x:Type mah:MetroProgressBar}}" TargetType="{x:Type mah:MetroProgressBar}"
-           x:Key="TreeViewProgress">
+    <Style
+        x:Key="TreeViewProgress"
+        BasedOn="{StaticResource {x:Type mah:MetroProgressBar}}"
+        TargetType="{x:Type mah:MetroProgressBar}">
         <Setter Property="Foreground" Value="{StaticResource Fluent.Ribbon.Brushes.LabelTextBrush}" />
         <Setter Property="Margin" Value="0,0,0,-4" />
         <Setter Property="IsIndeterminate" Value="True" />
         <Setter Property="VerticalAlignment" Value="Bottom" />
         <Setter Property="IsEnabled" Value="True" />
     </Style>
-    
-    <Style BasedOn="{StaticResource {x:Type UserControl}}"
-           TargetType="{x:Type UserControl}"
-           x:Key="CosmosUserControl">
+
+    <Style
+        x:Key="CosmosUserControl"
+        BasedOn="{StaticResource {x:Type UserControl}}"
+        TargetType="{x:Type UserControl}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
     </Style>
 
     <DataTemplate x:Key="AvalonDockHeaderTemplate">
-        <StackPanel Orientation="Horizontal" Margin="0" VerticalAlignment="Center">
-            <Canvas Height="14" Width="14" Margin="0" Visibility="{Binding Content.AccentColor, Converter={StaticResource nullToVisibilityConverter}, FallbackValue=Collapsed}">
-                <Ellipse Fill="{Binding Content.AccentColor, Converter={StaticResource colorToBrushConverter}}" Width="14" Height="14" />
+        <StackPanel
+            Margin="0"
+            VerticalAlignment="Center"
+            Orientation="Horizontal">
+            <Canvas
+                Width="14"
+                Height="14"
+                Margin="0"
+                Visibility="{Binding Content.AccentColor, Converter={StaticResource nullToVisibilityConverter}, FallbackValue=Collapsed}">
+                <Ellipse
+                    Width="14"
+                    Height="14"
+                    Fill="{Binding Content.AccentColor, Converter={StaticResource colorToBrushConverter}}" />
             </Canvas>
 
-            <Image Source="{Binding IconSource}" Height="14" Margin="3,0"/>
-            <TextBlock Text="{Binding Title}" VerticalAlignment="Bottom" />
+            <Image
+                Height="14"
+                Margin="3,0"
+                Source="{Binding IconSource}" />
+            <TextBlock VerticalAlignment="Bottom" Text="{Binding Title}" />
         </StackPanel>
     </DataTemplate>
 
@@ -40,30 +57,47 @@
             <Border BorderBrush="DarkRed" BorderThickness="0,0,0,1.5">
                 <AdornedElementPlaceholder />
             </Border>
-            <TextBlock Foreground="DarkRed" FontFamily="Segoe MDL2 Assets" Text="" VerticalAlignment="Top" Margin="-2,4,0,0" />
+            <TextBlock
+                Margin="-2,4,0,0"
+                VerticalAlignment="Top"
+                FontFamily="Segoe MDL2 Assets"
+                Foreground="DarkRed"
+                Text="" />
         </StackPanel>
     </ControlTemplate>
 
     <ContextMenu x:Key="JsonEditorContextMenu">
-        <MenuItem Header="Cut" Command="ApplicationCommands.Cut">
+        <MenuItem Command="ApplicationCommands.Cut" Header="Cut">
             <MenuItem.Icon>
-                <Image Source="{StaticResource CutIcon}" Height="16" Width="16" />
+                <Image
+                    Width="16"
+                    Height="16"
+                    Source="{StaticResource CutIcon}" />
             </MenuItem.Icon>
         </MenuItem>
-        <MenuItem Header="Copy" Command="ApplicationCommands.Copy">
+        <MenuItem Command="ApplicationCommands.Copy" Header="Copy">
             <MenuItem.Icon>
-                <Image Source="{StaticResource CopyIcon}" Height="16" Width="16" />
+                <Image
+                    Width="16"
+                    Height="16"
+                    Source="{StaticResource CopyIcon}" />
             </MenuItem.Icon>
         </MenuItem>
-        <MenuItem Header="Paste" Command="ApplicationCommands.Paste">
+        <MenuItem Command="ApplicationCommands.Paste" Header="Paste">
             <MenuItem.Icon>
-                <Image Source="{StaticResource PasteIcon}" Height="16" Width="16" />
+                <Image
+                    Width="16"
+                    Height="16"
+                    Source="{StaticResource PasteIcon}" />
             </MenuItem.Icon>
         </MenuItem>
         <Separator />
-        <MenuItem Header="Find..." Command="ApplicationCommands.Find">
+        <MenuItem Command="ApplicationCommands.Find" Header="Find...">
             <MenuItem.Icon>
-                <Image Source="{StaticResource SearchIcon}" Height="16" Width="16" />
+                <Image
+                    Width="16"
+                    Height="16"
+                    Source="{StaticResource SearchIcon}" />
             </MenuItem.Icon>
         </MenuItem>
     </ContextMenu>
diff --git a/src/CosmosDbExplorer/Styles/Icons.xaml b/src/CosmosDbExplorer/Styles/Icons.xaml
index d46af43..a8dd890 100644
--- a/src/CosmosDbExplorer/Styles/Icons.xaml
+++ b/src/CosmosDbExplorer/Styles/Icons.xaml
@@ -1,24 +1,29 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="IconText" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="Segoe MDL2 Assets" />
         <Setter Property="FontSize" Value="24" />
     </Style>
 
-    <!-- Refresh icon -->
-    <Style x:Key="RefreshIcon" BasedOn="{StaticResource IconText}" TargetType="TextBlock">
+    <!--  Refresh icon  -->
+    <Style
+        x:Key="RefreshIcon"
+        BasedOn="{StaticResource IconText}"
+        TargetType="TextBlock">
         <Setter Property="Text" Value="" />
     </Style>
     <TextBlock x:Key="RefreshIconText" Style="{StaticResource RefreshIcon}" />
 
-    <!-- Edit icon -->
-    <Style x:Key="EditIcon" BasedOn="{StaticResource IconText}" TargetType="TextBlock">
+    <!--  Edit icon  -->
+    <Style
+        x:Key="EditIcon"
+        BasedOn="{StaticResource IconText}"
+        TargetType="TextBlock">
         <Setter Property="Text" Value="" />
     </Style>
     <TextBlock x:Key="EditIconText" Style="{StaticResource EditIcon}" />
-    
-    <!-- Connection icon -->
+
+    <!--  Connection icon  -->
     <DrawingImage x:Key="ConnectionIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -30,14 +35,17 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- Delete icon -->
-    <Style x:Key="DeleteIcon" BasedOn="{StaticResource IconText}" TargetType="TextBlock">
+
+    <!--  Delete icon  -->
+    <Style
+        x:Key="DeleteIcon"
+        BasedOn="{StaticResource IconText}"
+        TargetType="TextBlock">
         <Setter Property="Text" Value="" />
     </Style>
-    <TextBlock x:Key="DeleteIconText" Style="{StaticResource DeleteIcon}"  />
-    
-    <!-- Database Icon -->
+    <TextBlock x:Key="DeleteIconText" Style="{StaticResource DeleteIcon}" />
+
+    <!--  Database Icon  -->
     <DrawingImage x:Key="DatabaseIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -50,8 +58,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- Collection Icon -->
+
+    <!--  Collection Icon  -->
     <DrawingImage x:Key="CollectionIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -65,8 +73,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- SqlQuery Icon -->
+
+    <!--  SqlQuery Icon  -->
     <DrawingImage x:Key="SqlQueryIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -83,7 +91,7 @@
         </DrawingImage.Drawing>
     </DrawingImage>
 
-    <!-- Stored Procedure Icon -->
+    <!--  Stored Procedure Icon  -->
     <DrawingImage x:Key="StoredProcedureIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -101,8 +109,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- Udf Icon -->
+
+    <!--  Udf Icon  -->
     <DrawingImage x:Key="UdfIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -116,8 +124,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- Trigger Icon -->
+
+    <!--  Trigger Icon  -->
     <DrawingImage x:Key="TriggerIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -132,14 +140,17 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- Import Icon -->
-    <Style x:Key="ImportDocumentIcon" BasedOn="{StaticResource IconText}" TargetType="TextBlock">
+
+    <!--  Import Icon  -->
+    <Style
+        x:Key="ImportDocumentIcon"
+        BasedOn="{StaticResource IconText}"
+        TargetType="TextBlock">
         <Setter Property="Text" Value="" />
     </Style>
     <TextBlock x:Key="ImportIcon" Style="{StaticResource ImportDocumentIcon}" />
-       
-    <!-- Remove All Icon-->
+
+    <!--  Remove All Icon  -->
     <DrawingImage x:Key="RemoveAllIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -151,8 +162,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- Users Icon-->
+
+    <!--  Users Icon  -->
     <DrawingImage x:Key="UsersIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -168,8 +179,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- User Icon -->
+
+    <!--  User Icon  -->
     <DrawingImage x:Key="UserIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -181,8 +192,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- Persmission Icon -->
+
+    <!--  Persmission Icon  -->
     <DrawingImage x:Key="PermissionIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -196,8 +207,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-   
-    <!-- ScaleSettings Icon -->
+
+    <!--  ScaleSettings Icon  -->
     <DrawingImage x:Key="ScaleSettingsIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -210,8 +221,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- DocumentIcon -->
+
+    <!--  DocumentIcon  -->
     <DrawingImage x:Key="DocumentIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -225,8 +236,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- Chart Icon -->
+
+    <!--  Chart Icon  -->
     <DrawingImage x:Key="ChartIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -239,7 +250,7 @@
         </DrawingImage.Drawing>
     </DrawingImage>
 
-    <!-- ResultPane Icon -->
+    <!--  ResultPane Icon  -->
     <DrawingImage x:Key="ResultPaneIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -253,7 +264,7 @@
         </DrawingImage.Drawing>
     </DrawingImage>
 
-    <!-- Statistics Icon -->
+    <!--  Statistics Icon  -->
     <DrawingImage x:Key="StatisticsIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -266,8 +277,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- HTTP Icon -->
+
+    <!--  HTTP Icon  -->
     <DrawingImage x:Key="HttpIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -289,7 +300,7 @@
         </DrawingImage.Drawing>
     </DrawingImage>
 
-    <!-- Copy Icon -->
+    <!--  Copy Icon  -->
     <DrawingImage x:Key="CopyIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -302,8 +313,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- Cut Icon -->
+
+    <!--  Cut Icon  -->
     <DrawingImage x:Key="CutIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -316,8 +327,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- Paste Icon -->
+
+    <!--  Paste Icon  -->
     <DrawingImage x:Key="PasteIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -333,8 +344,8 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
-    <!-- Search Icon -->
+
+    <!--  Search Icon  -->
     <DrawingImage x:Key="SearchIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -351,7 +362,7 @@
         </DrawingImage.Drawing>
     </DrawingImage>
 
-    <!-- Comment Code Icon -->
+    <!--  Comment Code Icon  -->
     <DrawingImage x:Key="CommentCodeIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -365,7 +376,7 @@
         </DrawingImage.Drawing>
     </DrawingImage>
 
-    <!-- UnComment Code Icon -->
+    <!--  UnComment Code Icon  -->
     <DrawingImage x:Key="UncommentCodeIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -439,7 +450,10 @@
         </DrawingImage.Drawing>
     </DrawingImage>
 
-    <Style x:Key="NextPageIcon" BasedOn="{StaticResource IconText}" TargetType="TextBlock">
+    <Style
+        x:Key="NextPageIcon"
+        BasedOn="{StaticResource IconText}"
+        TargetType="TextBlock">
         <Setter Property="Text" Value="" />
     </Style>
 
@@ -488,7 +502,7 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-    
+
     <DrawingImage x:Key="ParameterIcon">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -503,7 +517,10 @@
         </DrawingImage.Drawing>
     </DrawingImage>
 
-    <Style x:Key="AddIcon" BasedOn="{StaticResource IconText}" TargetType="TextBlock">
+    <Style
+        x:Key="AddIcon"
+        BasedOn="{StaticResource IconText}"
+        TargetType="TextBlock">
         <Setter Property="Text" Value="" />
     </Style>
 
diff --git a/src/CosmosDbExplorer/Styles/MetroWindow.xaml b/src/CosmosDbExplorer/Styles/MetroWindow.xaml
index 2ddb27e..98260e8 100644
--- a/src/CosmosDbExplorer/Styles/MetroWindow.xaml
+++ b/src/CosmosDbExplorer/Styles/MetroWindow.xaml
@@ -5,8 +5,8 @@
 
     <Style
         x:Key="CustomMetroWindow"
-        TargetType="{x:Type controls:MetroWindow}"
-        BasedOn="{StaticResource {x:Type controls:MetroWindow}}">
+        BasedOn="{StaticResource {x:Type controls:MetroWindow}}"
+        TargetType="{x:Type controls:MetroWindow}">
         <Setter Property="ShowTitleBar" Value="True" />
         <Setter Property="Height" Value="450" />
         <Setter Property="Width" Value="800" />
diff --git a/src/CosmosDbExplorer/Styles/TextBlock.xaml b/src/CosmosDbExplorer/Styles/TextBlock.xaml
index e8ad872..e284806 100644
--- a/src/CosmosDbExplorer/Styles/TextBlock.xaml
+++ b/src/CosmosDbExplorer/Styles/TextBlock.xaml
@@ -1,8 +1,6 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <!--Base Styles-->
+    <!--  Base Styles  -->
     <Style x:Key="BaseTextBlockStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="{StaticResource MediumFontSize}" />
         <Setter Property="TextWrapping" Value="Wrap" />
@@ -16,38 +14,61 @@
         <Setter Property="TextAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="PageTitleStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlockStyle}">
+    <Style
+        x:Key="PageTitleStyle"
+        BasedOn="{StaticResource BaseTextBlockStyle}"
+        TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="{StaticResource XLargeFontSize}" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Margin" Value="{StaticResource MediumLeftMargin}" />
     </Style>
 
-    <Style x:Key="SubtitleTextStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlockStyle}">
+    <Style
+        x:Key="SubtitleTextStyle"
+        BasedOn="{StaticResource BaseTextBlockStyle}"
+        TargetType="{x:Type TextBlock}">
         <Setter Property="FontWeight" Value="SemiBold" />
         <Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
     </Style>
 
-    <Style x:Key="BodyTextStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlockStyle}">
-    </Style>
+    <Style
+        x:Key="BodyTextStyle"
+        BasedOn="{StaticResource BaseTextBlockStyle}"
+        TargetType="{x:Type TextBlock}" />
 
-    <Style x:Key="ListTitleStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlockStyle}">
+    <Style
+        x:Key="ListTitleStyle"
+        BasedOn="{StaticResource BaseTextBlockStyle}"
+        TargetType="{x:Type TextBlock}">
         <Setter Property="TextWrapping" Value="NoWrap" />
         <Setter Property="FontWeight" Value="Bold" />
     </Style>
 
-    <Style x:Key="ListSubTitleStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlockStyle}">
+    <Style
+        x:Key="ListSubTitleStyle"
+        BasedOn="{StaticResource BaseTextBlockStyle}"
+        TargetType="{x:Type TextBlock}">
         <Setter Property="TextWrapping" Value="NoWrap" />
     </Style>
 
-    <Style x:Key="SmallIconStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseIconStyle}">
+    <Style
+        x:Key="SmallIconStyle"
+        BasedOn="{StaticResource BaseIconStyle}"
+        TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="16" />
     </Style>
 
-    <Style x:Key="MediumIconStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseIconStyle}">
+    <Style
+        x:Key="MediumIconStyle"
+        BasedOn="{StaticResource BaseIconStyle}"
+        TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="24" />
     </Style>
 
-    <Style x:Key="BigIconStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseIconStyle}">
+    <Style
+        x:Key="BigIconStyle"
+        BasedOn="{StaticResource BaseIconStyle}"
+        TargetType="TextBlock">
         <Setter Property="FontSize" Value="48" />
     </Style>
 
diff --git a/src/CosmosDbExplorer/Styles/Themes/Dark.Blue.xaml b/src/CosmosDbExplorer/Styles/Themes/Dark.Blue.xaml
index 4f58f50..1f1bd38 100644
--- a/src/CosmosDbExplorer/Styles/Themes/Dark.Blue.xaml
+++ b/src/CosmosDbExplorer/Styles/Themes/Dark.Blue.xaml
@@ -1,9 +1,10 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
-                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
-                    mc:Ignorable="options">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+    mc:Ignorable="options">
 
     <!--  Metadata  -->
     <system:String x:Key="Theme.Name">Dark.Blue</system:String>
@@ -14,10 +15,16 @@
     <system:String x:Key="Theme.AlternativeColorScheme">Blue</system:String>
 
     <Color x:Key="Theme.PrimaryAccentColor">#FF0078D7</Color>
-    <SolidColorBrush x:Key="Theme.ShowcaseBrush" Color="#FF0078D7" options:Freeze="True" />
+    <SolidColorBrush
+        x:Key="Theme.ShowcaseBrush"
+        options:Freeze="True"
+        Color="#FF0078D7" />
     <system:Boolean x:Key="Theme.IsHighContrast">False</system:Boolean>
 
 
-    <SolidColorBrush x:Key="CosmosDbExplorer.AvalonEdit.LinkTextForegroundBrush" Color="Teal" options:Freeze="True" />
-    
+    <SolidColorBrush
+        x:Key="CosmosDbExplorer.AvalonEdit.LinkTextForegroundBrush"
+        options:Freeze="True"
+        Color="Teal" />
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/CosmosDbExplorer/Styles/Themes/Light.Blue.xaml b/src/CosmosDbExplorer/Styles/Themes/Light.Blue.xaml
index c5301c6..1fe2009 100644
--- a/src/CosmosDbExplorer/Styles/Themes/Light.Blue.xaml
+++ b/src/CosmosDbExplorer/Styles/Themes/Light.Blue.xaml
@@ -1,9 +1,10 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
-                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    mc:Ignorable="options">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+    mc:Ignorable="options">
 
     <!--  Metadata  -->
     <system:String x:Key="Theme.Name">Light.Blue</system:String>
@@ -14,10 +15,16 @@
     <system:String x:Key="Theme.AlternativeColorScheme">Blue</system:String>
 
     <Color x:Key="Theme.PrimaryAccentColor">#FF0078D7</Color>
-    <SolidColorBrush x:Key="Theme.ShowcaseBrush" Color="#FF0078D7" options:Freeze="True" />
+    <SolidColorBrush
+        x:Key="Theme.ShowcaseBrush"
+        options:Freeze="True"
+        Color="#FF0078D7" />
     <system:Boolean x:Key="Theme.IsHighContrast">False</system:Boolean>
 
 
-    <SolidColorBrush x:Key="CosmosDbExplorer.AvalonEdit.LinkTextForegroundBrush" Color="Blue" options:Freeze="True" />
-    
+    <SolidColorBrush
+        x:Key="CosmosDbExplorer.AvalonEdit.LinkTextForegroundBrush"
+        options:Freeze="True"
+        Color="Blue" />
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/CosmosDbExplorer/Styles/_Thickness.xaml b/src/CosmosDbExplorer/Styles/_Thickness.xaml
index 49abd94..14423cb 100644
--- a/src/CosmosDbExplorer/Styles/_Thickness.xaml
+++ b/src/CosmosDbExplorer/Styles/_Thickness.xaml
@@ -1,8 +1,6 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <!--Medium size margins-->
+    <!--  Medium size margins  -->
     <Thickness x:Key="MediumLeftMargin">24,0,0,0</Thickness>
     <Thickness x:Key="MediumLeftTopRightMargin">24,24,24,0</Thickness>
     <Thickness x:Key="MediumTopMargin">0,24,0,0</Thickness>
@@ -10,7 +8,7 @@
     <Thickness x:Key="MediumBottomMargin">0, 0, 0, 24</Thickness>
     <Thickness x:Key="MediumLeftTopRightBottomMargin">24,24,24,24</Thickness>
 
-    <!--Small size margins-->
+    <!--  Small size margins  -->
     <Thickness x:Key="SmallLeftMargin">12, 0, 0, 0</Thickness>
     <Thickness x:Key="SmallLeftTopMargin">12, 12, 0, 0</Thickness>
     <Thickness x:Key="SmallLeftRightMargin">12, 0, 12, 0</Thickness>
@@ -19,12 +17,12 @@
     <Thickness x:Key="SmallTopBottomMargin">0, 12, 0, 12</Thickness>
     <Thickness x:Key="SmallLeftTopRightBottomMargin">12, 12, 12, 12</Thickness>
 
-    <!--Extra Small size margins-->
+    <!--  Extra Small size margins  -->
     <Thickness x:Key="XSmallLeftMargin">8, 0, 0, 0</Thickness>
     <Thickness x:Key="XSmallTopMargin">0, 8, 0, 0</Thickness>
     <Thickness x:Key="XSmallLeftTopRightBottomMargin">8, 8, 8, 8</Thickness>
 
-    <!--Extra Extra Small size margins-->
+    <!--  Extra Extra Small size margins  -->
     <Thickness x:Key="XXSmallTopMargin">0, 4, 0, 0</Thickness>
 
 </ResourceDictionary>
diff --git a/src/CosmosDbExplorer/ViewModels/AccountSettingsViewModel.cs b/src/CosmosDbExplorer/ViewModels/AccountSettingsViewModel.cs
index 19dba6e..161f773 100644
--- a/src/CosmosDbExplorer/ViewModels/AccountSettingsViewModel.cs
+++ b/src/CosmosDbExplorer/ViewModels/AccountSettingsViewModel.cs
@@ -143,6 +143,11 @@ public class AccountSettingsViewModelValidator : AbstractValidator<AccountSettin
         public AccountSettingsViewModelValidator()
         {
             RuleFor(x => x.AccountEndpoint).NotEmpty().When(x => !x.UseLocalEmulator);
+            RuleFor(x => x.AccountEndpoint)
+                .Must(uri => Uri.TryCreate(uri, UriKind.Absolute, out _))
+                .When(x => !string.IsNullOrWhiteSpace(x.AccountEndpoint))
+                .WithMessage("'{PropertyName}' must be a valid URI.");
+
             RuleFor(x => x.AccountSecret).NotEmpty().When(x => !x.UseLocalEmulator);
             RuleFor(x => x.Label).NotEmpty();
         }
diff --git a/src/CosmosDbExplorer/Views/AccountSettingsPage.xaml b/src/CosmosDbExplorer/Views/AccountSettingsPage.xaml
index 1b1b577..a0ff500 100644
--- a/src/CosmosDbExplorer/Views/AccountSettingsPage.xaml
+++ b/src/CosmosDbExplorer/Views/AccountSettingsPage.xaml
@@ -1,25 +1,27 @@
-<Page x:Class="CosmosDbExplorer.Views.AccountSettingsPage"
-      Style="{DynamicResource MahApps.Styles.Page}"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:CosmosDbExplorer.Views" 
-      xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-      xmlns:markup="clr-namespace:CosmosDbExplorer.MarkupExtensions" 
-      xmlns:viewmodels="clr-namespace:CosmosDbExplorer.ViewModels" 
-      xmlns:models="clr-namespace:CosmosDbExplorer.Core.Models;assembly=CosmosDbExplorer.Core" xmlns:converters="clr-namespace:CosmosDbExplorer.Converters"
-      d:DataContext="{d:DesignInstance Type=viewmodels:AccountSettingsViewModel}"
-      mc:Ignorable="d" 
-      Width="850"
-      Height="350"
-      d:DesignHeight="350" d:DesignWidth="850"
-      Title="{Binding Title}"
-      >
+<Page
+    x:Class="CosmosDbExplorer.Views.AccountSettingsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:CosmosDbExplorer.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:CosmosDbExplorer.Views"
+    xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+    xmlns:markup="clr-namespace:CosmosDbExplorer.MarkupExtensions"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="clr-namespace:CosmosDbExplorer.Core.Models;assembly=CosmosDbExplorer.Core"
+    xmlns:viewmodels="clr-namespace:CosmosDbExplorer.ViewModels"
+    Title="{Binding Title}"
+    Width="850"
+    Height="350"
+    d:DataContext="{d:DesignInstance Type=viewmodels:AccountSettingsViewModel}"
+    d:DesignHeight="350"
+    d:DesignWidth="850"
+    Style="{DynamicResource MahApps.Styles.Page}"
+    mc:Ignorable="d">
     <Page.Resources>
         <converters:InvertBoolConverter x:Key="InvertBoolConverter" />
     </Page.Resources>
-    
+
     <Grid Margin="{StaticResource SmallLeftTopRightBottomMargin}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -27,11 +29,13 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        
-        <TextBlock Style="{StaticResource SubtitleTextStyle}" Grid.Row="0" 
-                   Text="Please enter your Azure DocumentDB endpoint and secret key."/>
-        
-        <StackPanel Margin="{StaticResource SmallTopBottomMargin}" Grid.Row="1">
+
+        <TextBlock
+            Grid.Row="0"
+            Style="{StaticResource SubtitleTextStyle}"
+            Text="Please enter your Azure DocumentDB endpoint and secret key." />
+
+        <StackPanel Grid.Row="1" Margin="{StaticResource SmallTopBottomMargin}">
 
             <Grid Margin="{StaticResource XSmallTopMargin}">
                 <Grid.ColumnDefinitions>
@@ -39,9 +43,11 @@
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
 
-                <TextBlock Style="{StaticResource BodyTextStyle}" Grid.Column="0" Text="Label" />
-                <TextBox Grid.Column="1"
-                         Text="{Binding Label, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                <TextBlock
+                    Grid.Column="0"
+                    Style="{StaticResource BodyTextStyle}"
+                    Text="Label" />
+                <TextBox Grid.Column="1" Text="{Binding Label, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
             </Grid>
 
             <Grid Margin="{StaticResource XSmallTopMargin}">
@@ -50,10 +56,17 @@
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
 
-                <TextBlock Style="{StaticResource BodyTextStyle}" Grid.Row="1" Grid.Column="0" Text="Account Endpoint"/>
-                <TextBox Grid.Row="1" Grid.Column="1" 
-                     Text="{Binding AccountEndpoint, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}"
-                     IsReadOnly="{Binding UseLocalEmulator}" IsEnabled="{Binding UseLocalEmulator, Converter={StaticResource InvertBoolConverter}}"/>
+                <TextBlock
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Style="{StaticResource BodyTextStyle}"
+                    Text="Account Endpoint" />
+                <TextBox
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    IsEnabled="{Binding UseLocalEmulator, Converter={StaticResource InvertBoolConverter}}"
+                    IsReadOnly="{Binding UseLocalEmulator}"
+                    Text="{Binding AccountEndpoint, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
             </Grid>
 
             <Grid Margin="{StaticResource XSmallTopMargin}">
@@ -62,9 +75,19 @@
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
 
-                <TextBlock Grid.Row="2" Grid.Column="0" Text="Account Secret" />
-                <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding AccountSecret, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}"
-                     IsReadOnly="{Binding UseLocalEmulator}" IsEnabled="{Binding UseLocalEmulator, Converter={StaticResource InvertBoolConverter}}"/>
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="0"
+                    Text="Account Secret" />
+
+                <PasswordBox
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    mah:PasswordBoxBindingBehavior.Password="{Binding AccountSecret, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}"
+                    mah:PasswordBoxHelper.CapsLockIcon="{StaticResource MahApps.Controls.CapsLockIcon}"
+                    IsEnabled="{Binding UseLocalEmulator, Converter={StaticResource InvertBoolConverter}}"
+                    PasswordChar="*"
+                    Style="{StaticResource MahApps.Styles.PasswordBox.Button.Revealed}" />
             </Grid>
 
             <Grid Margin="{StaticResource XSmallTopMargin}">
@@ -73,10 +96,16 @@
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
 
-                <TextBlock Style="{StaticResource BodyTextStyle}" Grid.Row="3" Grid.Column="0" Text="Connection Type"/>
-                <ComboBox Grid.Row="3" Grid.Column="1" 
-                      ItemsSource="{Binding Source={markup:EnumBindingSource {x:Type models:ConnectionType}}}"
-                      SelectedValue="{Binding ConnectionType}" />
+                <TextBlock
+                    Grid.Row="3"
+                    Grid.Column="0"
+                    Style="{StaticResource BodyTextStyle}"
+                    Text="Connection Type" />
+                <ComboBox
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    ItemsSource="{Binding Source={markup:EnumBindingSource {x:Type models:ConnectionType}}}"
+                    SelectedValue="{Binding ConnectionType}" />
             </Grid>
 
             <Grid Margin="{StaticResource XSmallTopMargin}">
@@ -84,10 +113,16 @@
                     <ColumnDefinition Width="200px" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                
-                <TextBlock Style="{StaticResource BodyTextStyle}" Grid.Row="4" Grid.Column="0" Text="Accent Color" />
-                <mah:ColorPicker Grid.Row="4" Grid.Column="1" 
-                             SelectedColor="{Binding AccentColor}"/>
+
+                <TextBlock
+                    Grid.Row="4"
+                    Grid.Column="0"
+                    Style="{StaticResource BodyTextStyle}"
+                    Text="Accent Color" />
+                <mah:ColorPicker
+                    Grid.Row="4"
+                    Grid.Column="1"
+                    SelectedColor="{Binding AccentColor}" />
             </Grid>
 
             <Grid Margin="{StaticResource XSmallTopMargin}">
@@ -96,20 +131,39 @@
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
 
-                <TextBlock Style="{StaticResource BodyTextStyle}" Grid.Row="5" Grid.Column="0" Text="Enable Endpoint Discovery" />
-                <CheckBox Grid.Row="5" Grid.Column="1" 
-                              IsChecked="{Binding EnableEndpointDiscovery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                <TextBlock
+                    Grid.Row="5"
+                    Grid.Column="0"
+                    Style="{StaticResource BodyTextStyle}"
+                    Text="Enable Endpoint Discovery" />
+                <CheckBox
+                    Grid.Row="5"
+                    Grid.Column="1"
+                    IsChecked="{Binding EnableEndpointDiscovery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             </Grid>
         </StackPanel>
 
-        <mah:ToggleSwitch Content="Use local emulator" Grid.Row="2" 
-                          Margin="{StaticResource XSmallTopMargin}"
-                          IsOn="{Binding UseLocalEmulator, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        <mah:ToggleSwitch
+            Grid.Row="2"
+            Margin="{StaticResource XSmallTopMargin}"
+            Content="Use local emulator"
+            IsOn="{Binding UseLocalEmulator, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" 
-                    Margin="{StaticResource SmallTopBottomMargin}" Grid.Row="3">
-            <Button Content="Save" IsDefault="True" Width="80" Command="{Binding SaveAccountCommand}"  />
-            <Button Content="Cancel" IsCancel="True" Width="80" Margin="20,0,0,0" />
+        <StackPanel
+            Grid.Row="3"
+            Margin="{StaticResource SmallTopBottomMargin}"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal">
+            <Button
+                Width="80"
+                Command="{Binding SaveAccountCommand}"
+                Content="Save"
+                IsDefault="True" />
+            <Button
+                Width="80"
+                Margin="20,0,0,0"
+                Content="Cancel"
+                IsCancel="True" />
         </StackPanel>
     </Grid>
 </Page>