update libs. support favs, extras, and skipping shared

bitwarden · Feb 22, 2023 · bc5b795 · bc5b795
1 parent d02fe9a
commit bc5b795
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 15 deletions.
diff --git a/Importer/App.xaml.cs b/Importer/App.xaml.cs
@@ -15,7 +15,7 @@ protected override Window CreateWindow(IActivationState activationState)
     {
         var window = base.CreateWindow(activationState);
         window.Width = 650;
-        window.Height = 1100;
+        window.Height = 1150;
         window.Title = "Bitwarden Importer";
         return window;
     }

diff --git a/Importer/Importer.csproj b/Importer/Importer.csproj
@@ -58,7 +58,7 @@
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="30.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-    <PackageReference Include="PasswordManagerAccess" Version="10.2.1" />
+    <PackageReference Include="PasswordManagerAccess" Version="10.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Importer/MainPage.xaml b/Importer/MainPage.xaml
@@ -121,6 +121,16 @@
                         x:Name="LastPassPassword"
                         IsPassword="True" />
                 </VerticalStackLayout>
+
+                <HorizontalStackLayout>
+                    <CheckBox
+                        x:Name="LastPassSkipShared"
+                        VerticalOptions="Center" />
+                    <Label
+                        x:Name="LastPassSkipSharedLabel"
+                        Text="Skip items from shared folders"
+                        VerticalOptions="Center" />
+                </HorizontalStackLayout>
             </VerticalStackLayout>
 
             <HorizontalStackLayout

diff --git a/Importer/MainPage.xaml.cs b/Importer/MainPage.xaml.cs
@@ -202,10 +202,14 @@ private async Task<(bool, string)> CreateLastpassCsvAsync()
                 PasswordManagerAccess.LastPass.Platform.Desktop,
                 Guid.NewGuid().ToString().ToLower(),
                 "Importer");
-            var vault = Vault.Open(LastPassEmail?.Text, LastPassPassword?.Text, clientInfo, ui);
+            var vault = Vault.Open(LastPassEmail?.Text, LastPassPassword?.Text, clientInfo, ui,
+                new ParserOptions { ParseSecureNotesToAccount = false });
+
+            // Filter accounts
+            var filteredAccounts = vault.Accounts.Where(a => !a.IsShared || (a.IsShared && !LastPassSkipShared.IsChecked));
 
             // Massage it to expected CSV format
-            var exportAccounts = vault.Accounts.Select(a => new Services.LastPass.ExportedAccount(a));
+            var exportAccounts = filteredAccounts.Select(a => new Services.LastPass.ExportedAccount(a));
 
             // Create CSV string
             using var writer = new StringWriter();
@@ -350,26 +354,29 @@ public static void ExecBash(string cmd)
 
     private void ClearInputs()
     {
-        BitwardenServerUrl.Text = string.Empty;
-        BitwardenApiKeyClientId.Text = string.Empty;
-        BitwardenApiKeySecret.Text = string.Empty;
-        BitwardenKeyConnector.IsChecked = false;
-        BitwardenPassword.Text = string.Empty;
-        LastPassEmail.Text = string.Empty;
-        LastPassPassword.Text = string.Empty;
+        Dispatcher.Dispatch(() =>
+        {
+            BitwardenServerUrl.Text = string.Empty;
+            BitwardenApiKeyClientId.Text = string.Empty;
+            BitwardenApiKeySecret.Text = string.Empty;
+            BitwardenKeyConnector.IsChecked = false;
+            BitwardenPassword.Text = string.Empty;
+            LastPassEmail.Text = string.Empty;
+            LastPassPassword.Text = string.Empty;
+        });
     }
 
     private void ParseCommandlineDefaults()
     {
         var args = Environment.GetCommandLineArgs();
         foreach (var arg in args)
         {
-            if (!arg.Contains("="))
+            if (!arg.Contains('='))
             {
                 continue;
             }
 
-            var argParts = arg.Split('=');
+            var argParts = arg.Split(new[] { '=' }, 2);
             if (argParts.Length < 2)
             {
                 continue;
@@ -416,6 +423,12 @@ private void ParseCommandlineDefaults()
                 LastPassPassword.Text = argParts[1];
                 continue;
             }
+
+            if (argParts[0] == "lastpassSkipShared")
+            {
+                LastPassSkipShared.IsChecked = argParts[1] == "1";
+                continue;
+            }
         }
     }
 }
diff --git a/Importer/Services/LastPass/ExportedAccount.cs b/Importer/Services/LastPass/ExportedAccount.cs
@@ -13,10 +13,10 @@ public ExportedAccount(Account account)
         Username = account.Username;
         Password = account.Password;
         // Totp not supported
-        // Extra = account.Notes;
+        Extra = account.Notes;
         Name = account.Name;
         Grouping = account.Path == "(none)" ? null : account.Path;
-        // Fav = account.Favorite == "1" ? 1 : 0;
+        Fav = account.IsFavorite ? 1 : 0;
     }
 
     [Name("url")]