User get getting "bindingsource cannot be its own data source" error. Can't repro locally. Adding SyncBindingSource for datagrid views to attempt to solve it

* new ext method to simplify api access in file liberator

AaxDecrypter/AaxDecrypter.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AAXClean" Version="0.1.8" />
-    <PackageReference Include="Dinah.Core" Version="1.1.0.1" />
+    <PackageReference Include="AAXClean" Version="0.1.9" />
+    <PackageReference Include="Dinah.Core" Version="1.1.1.2" />
   </ItemGroup>
 
 </Project>

AaxDecrypter/AaxcDownloadConverter.cs

@@ -144,7 +144,7 @@ namespace AaxDecrypter
             if (File.Exists(outputFileName))
                 FileExt.SafeDelete(outputFileName);
 
-            FileStream outFile = File.OpenWrite(outputFileName);
+            FileStream outFile = File.Open(outputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
 
             aaxFile.SetDecryptionKey(downloadLicense.AudibleKey, downloadLicense.AudibleIV);
 

AppScaffolding/AppScaffolding.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>5.7.2.1</Version>
+    <Version>6.0.5.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

AppScaffolding/UNSAFE_MigrationHelper.cs

@@ -61,7 +61,16 @@ namespace AppScaffolding
 				return;
 
 			var startingContents = File.ReadAllText(APPSETTINGS_JSON);
-			var jObj = JObject.Parse(startingContents);
+
+			JObject jObj;
+			try
+			{
+				jObj = JObject.Parse(startingContents);
+			}
+			catch
+			{
+				return;
+			}
 
 			action(jObj);
 
@@ -130,7 +139,16 @@ namespace AppScaffolding
 				return;
 
 			var startingContents = File.ReadAllText(SettingsJsonPath);
-			var jObj = JObject.Parse(startingContents);
+
+			JObject jObj;
+			try
+			{
+				jObj = JObject.Parse(startingContents);
+			}
+			catch
+			{
+				return;
+			}
 
 			action(jObj);
 

ApplicationServices/LibraryCommands.cs

@@ -16,7 +16,7 @@ namespace ApplicationServices
 	{
 		private static LibraryOptions.ResponseGroupOptions LibraryResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS;
 
-		public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, ILoginCallback> loginCallbackFactoryFunc, List<LibraryBook> existingLibrary, params Account[] accounts)
+		public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, List<LibraryBook> existingLibrary, params Account[] accounts)
 		{
 			logRestart();
 
@@ -33,7 +33,7 @@ namespace ApplicationServices
 			try
 			{
 				logTime($"pre {nameof(scanAccountsAsync)} all");
-				var libraryItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
+				var libraryItems = await scanAccountsAsync(apiExtendedfunc, accounts);
 				logTime($"post {nameof(scanAccountsAsync)} all");
 
 				var totalCount = libraryItems.Count;
@@ -75,7 +75,7 @@ namespace ApplicationServices
 		}
 
 		#region FULL LIBRARY scan and import
-		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, params Account[] accounts)
+		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, params Account[] accounts)
 		{
 			logRestart();
 
@@ -85,7 +85,7 @@ namespace ApplicationServices
 			try
 			{
 				logTime($"pre {nameof(scanAccountsAsync)} all");
-				var importItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
+				var importItems = await scanAccountsAsync(apiExtendedfunc, accounts);
 				logTime($"post {nameof(scanAccountsAsync)} all");
 
 				var totalCount = importItems.Count;
@@ -129,18 +129,16 @@ namespace ApplicationServices
 			}
 		}
 
-		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, Account[] accounts)
+		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, Account[] accounts)
 		{
 			var tasks = new List<Task<List<ImportItem>>>();
 			foreach (var account in accounts)
 			{
-				var callback = loginCallbackFactoryFunc(account);
-
-				// get APIs in serial, esp b/c of logins
-				var api = await AudibleApiActions.GetApiAsync(callback, account);
+				// get APIs in serial b/c of logins. do NOT move inside of parallel (Task.WhenAll)
+				var apiExtended = await apiExtendedfunc(account);
 
 				// add scanAccountAsync as a TASK: do not await
-				tasks.Add(scanAccountAsync(api, account));
+				tasks.Add(scanAccountAsync(apiExtended, account));
 			}
 
 			// import library in parallel
@@ -149,7 +147,7 @@ namespace ApplicationServices
 			return importItems;
 		}
 
-		private static async Task<List<ImportItem>> scanAccountAsync(Api api, Account account)
+		private static async Task<List<ImportItem>> scanAccountAsync(ApiExtended apiExtended, Account account)
 		{
 			ArgumentValidator.EnsureNotNull(account, nameof(account));
 
@@ -160,7 +158,7 @@ namespace ApplicationServices
 
 			logTime($"pre scanAccountAsync {account.AccountName}");
 
-			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api, LibraryResponseGroups);
+			var dtoItems = await apiExtended.GetLibraryValidatedAsync(LibraryResponseGroups);
 
 			logTime($"post scanAccountAsync {account.AccountName} qty: {dtoItems.Count}");
 

ApplicationServices/LibraryExporter.cs

@@ -114,7 +114,7 @@ namespace ApplicationServices
 				Publisher = a.Book.Publisher,
 				HasPdf = a.Book.HasPdf,
 				SeriesNames = a.Book.SeriesNames,
-				SeriesOrder = a.Book.SeriesLink.Any() ? a.Book.SeriesLink?.Select(sl => $"{sl.Index} : {sl.Series.Name}").Aggregate((a, b) => $"{a}, {b}") : "",
+				SeriesOrder = a.Book.SeriesLink.Any() ? a.Book.SeriesLink?.Select(sl => $"{sl.Order} : {sl.Series.Name}").Aggregate((a, b) => $"{a}, {b}") : "",
 				CommunityRatingOverall = a.Book.Rating?.OverallRating,
 				CommunityRatingPerformance = a.Book.Rating?.PerformanceRating,
 				CommunityRatingStory = a.Book.Rating?.StoryRating,

DataLayer/DataLayer.csproj

@@ -12,13 +12,13 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="1.0.5.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.9">
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="1.0.5.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

DataLayer/EfClasses/Book.cs

@@ -100,7 +100,7 @@ namespace DataLayer
 
             // simple assigns
             Title = title.Trim();
-            Description = description.Trim();
+            Description = description?.Trim();
             LengthInMinutes = lengthInMinutes;
             ContentType = contentType;
 
@@ -203,7 +203,7 @@ namespace DataLayer
             }
         }
 
-        public void UpsertSeries(Series series, float? index = null, DbContext context = null)
+        public void UpsertSeries(Series series, string order, DbContext context = null)
         {
             ArgumentValidator.EnsureNotNull(series, nameof(series));
 
@@ -214,9 +214,9 @@ namespace DataLayer
 
 			var singleSeriesBook = _seriesLink.SingleOrDefault(sb => sb.Series == series);
             if (singleSeriesBook == null)
-                _seriesLink.Add(new SeriesBook(series, this, index));
+                _seriesLink.Add(new SeriesBook(series, this, order));
             else
-                singleSeriesBook.UpdateIndex(index);
+                singleSeriesBook.UpdateOrder(order);
         }
         #endregion
 

DataLayer/EfClasses/Series.cs

@@ -48,25 +48,6 @@ namespace DataLayer
                 Name = name;
         }
 
-        public void AddBook(Book book, float? index = null, DbContext context = null)
-        {
-            ArgumentValidator.EnsureNotNull(book, nameof(book));
-
-            // our add() is conditional upon what's already included in the collection.
-            // therefore if not loaded, a trip is required. might as well just load it
-            if (_booksLink == null)
-            {
-                ArgumentValidator.EnsureNotNull(context, nameof(context));
-                if (!context.Entry(this).IsKeySet)
-                    throw new InvalidOperationException("Could not add series");
-
-                context.Entry(this).Collection(s => s.BooksLink).Load();
-            }
-
-            if (_booksLink.SingleOrDefault(sb => sb.Book == book) == null)
-                _booksLink.Add(new SeriesBook(this, book, index));
-        }
-
 		public override string ToString() => Name;
 	}
 }

DataLayer/EfClasses/SeriesBook.cs

@@ -7,32 +7,27 @@ namespace DataLayer
         internal int SeriesId { get; private set; }
         internal int BookId { get; private set; }
 
-        /// <summary>
-        /// <para>"index" not "order". This is both for sequence and display</para>
-        /// <para>Float allows for in-between books. eg: 2.5</para>
-        /// <para>To show 2 editions as the same book in a series, give them the same index</para>
-        /// <para>null IS NOT the same as 0. Some series call a book "book 0"</para>
-        /// </summary>
-        public float? Index { get; private set; }
+        public string Order { get; private set; }
+        public float Index => StringLib.ExtractFirstNumber(Order);
 
         public Series Series { get; private set; }
         public Book Book { get; private set; }
 
         private SeriesBook() { }
-        internal SeriesBook(Series series, Book book, float? index = null)
+        internal SeriesBook(Series series, Book book, string order)
         {
             ArgumentValidator.EnsureNotNull(series, nameof(series));
             ArgumentValidator.EnsureNotNull(book, nameof(book));
 
             Series = series;
             Book = book;
-            Index = index;
+            Order = order;
         }
 
-        public void UpdateIndex(float? index)
+        public void UpdateOrder(string order)
         {
-            if (index.HasValue)
-                Index = index.Value;
+            if (!string.IsNullOrWhiteSpace(order))
+                Order = order;
         }
 
 		public override string ToString() => $"Series={Series} Book={Book}";

DataLayer/Migrations/20210922154900_AddSeriesOrderString.Designer.cs

@@ -0,0 +1,390 @@
+// <auto-generated />
+using System;
+using DataLayer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace DataLayer.Migrations
+{
+    [DbContext(typeof(LibationContext))]
+    [Migration("20210922154900_AddSeriesOrderString")]
+    partial class AddSeriesOrderString
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "5.0.10");
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentCategoryCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.HasIndex("ParentCategoryCategoryId");
+
+                    b.ToTable("Categories");
+
+                    b.HasData(
+                        new
+                        {
+                            CategoryId = -1,
+                            AudibleCategoryId = "",
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.HasOne("DataLayer.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("INTEGER");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Category");
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.HasOne("DataLayer.Category", "ParentCategory")
+                        .WithMany()
+                        .HasForeignKey("ParentCategoryCategoryId");
+
+                    b.Navigation("ParentCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DataLayer/Migrations/20210922154900_AddSeriesOrderString.cs

@@ -0,0 +1,33 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace DataLayer.Migrations
+{
+    public partial class AddSeriesOrderString : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Index",
+                table: "SeriesBook");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Order",
+                table: "SeriesBook",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Order",
+                table: "SeriesBook");
+
+            migrationBuilder.AddColumn<float>(
+                name: "Index",
+                table: "SeriesBook",
+                type: "REAL",
+                nullable: true);
+        }
+    }
+}

DataLayer/Migrations/LibationContextModelSnapshot.cs

@@ -14,7 +14,7 @@ namespace DataLayer.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "5.0.9");
+                .HasAnnotation("ProductVersion", "5.0.10");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
@@ -185,8 +185,8 @@ namespace DataLayer.Migrations
                     b.Property<int>("BookId")
                         .HasColumnType("INTEGER");
 
-                    b.Property<float?>("Index")
-                        .HasColumnType("REAL");
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
 
                     b.HasKey("SeriesId", "BookId");
 

DtoImporterService/BookImporter.cs

@@ -165,18 +165,7 @@ namespace DtoImporterService
 				foreach (var seriesEntry in item.Series)
 				{
 					var series = DbContext.Series.Local.Single(s => seriesEntry.SeriesId == s.AudibleSeriesId);
-
-					var index = 0f;
-					try
-					{
-						index = seriesEntry.Index;
-					}
-					catch (Exception ex)
-					{
-						Serilog.Log.Logger.Error(ex, $"Error parsing series index. Title: {item.Title}. ASIN: {item.Asin}. Series index: {seriesEntry.Sequence}");
-					}
-
-					book.UpsertSeries(series, index);
+					book.UpsertSeries(series, seriesEntry.Sequence);
 				}
 			}
 		}

DtoImporterService/ImportItem.cs

@@ -1,7 +1,7 @@
 using System;
 using AudibleApi.Common;
 
-namespace InternalUtilities
+namespace DtoImporterService
 {
 	public class ImportItem
 	{

FileLiberator/DownloadDecryptBook.cs

@@ -84,8 +84,7 @@ namespace FileLiberator
             {
                 validate(libraryBook);
 
-                var api = await InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
-
+                var api = await libraryBook.GetApiAsync();
                 var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
 
                 var aaxcDecryptDlLic = new DownloadLicense
@@ -93,7 +92,7 @@ namespace FileLiberator
                     contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
                     contentLic?.Voucher?.Key,
                     contentLic?.Voucher?.Iv,
-                    Resources.UserAgent
+                    Resources.USER_AGENT
                     );
 
                 if (Configuration.Instance.AllowLibationFixup)

FileLiberator/DownloadPdf.cs

@@ -59,7 +59,7 @@ namespace FileLiberator
 
 		private async Task<string> downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
 		{
-			var api = await GetApiAsync(libraryBook);
+			var api = await libraryBook.GetApiAsync();
 			var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
 
 			var client = new HttpClient();

FileLiberator/DownloadableBase.cs

@@ -40,9 +40,6 @@ namespace FileLiberator
             }
         }
 
-		protected static Task<AudibleApi.Api> GetApiAsync(LibraryBook libraryBook)
-			=> InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
-
 		protected async Task<string> PerformDownloadAsync(string proposedDownloadFilePath, Func<Progress<DownloadProgress>, Task<string>> func)
 		{
 			var progress = new Progress<DownloadProgress>();

FileLiberator/UtilityExtensions.cs

@@ -1,16 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading.Tasks;
 using DataLayer;
 using Dinah.Core;
-using Dinah.Core.ErrorHandling;
 
 namespace FileLiberator
 {
-	public static class LoggerUtilities
+	public static class UtilityExtensions
 	{
 		public static (string id, string title, string locale, string account) LogFriendly(this LibraryBook libraryBook)
 			=> (
@@ -19,5 +16,11 @@ namespace FileLiberator
 			locale: libraryBook.Book.Locale,
 			account: libraryBook.Account.ToMask()
 			);
+
+		public static async Task<AudibleApi.Api> GetApiAsync(this LibraryBook libraryBook)
+		{
+			var apiExtended = await InternalUtilities.ApiExtended.CreateAsync(libraryBook.Account, libraryBook.Book.Locale);
+			return apiExtended.Api;
+		}
 	}
 }

FileManager/FileManager.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="1.1.0.1" />
+    <PackageReference Include="Dinah.Core" Version="1.1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="Polly" Version="7.2.2" />
   </ItemGroup>

InternalUtilities/ApiExtended.cs

@@ -10,36 +10,95 @@ using Polly.Retry;
 
 namespace InternalUtilities
 {
-	public static class AudibleApiActions
+	/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
+	public class ApiExtended
 	{
-		/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
-		public static Task<Api> GetApiAsync(string username, string localeName, ILoginCallback loginCallback = null)
+		public Api Api { get; private set; }
+
+		private ApiExtended(Api api) => Api = api;
+
+		/// <summary>Get api from existing tokens else login with 'eager' choice. External browser url is provided. Response can be external browser login or continuing with native api callbacks.</summary>
+		public static async Task<ApiExtended> CreateAsync(Account account, ILoginChoiceEager loginChoiceEager)
 		{
-			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				LoginType = nameof(ILoginChoiceEager),
+				Account = account?.MaskedLogEntry ?? "[null]",
+				LocaleName = account?.Locale?.Name
+			});
+
+			var api = await EzApiCreator.GetApiAsync(
+				loginChoiceEager,
+				account.Locale,
+				AudibleApiStorage.AccountsSettingsFile,
+				account.GetIdentityTokensJsonPath());
+			return new ApiExtended(api);
+		}
+
+		/// <summary>Get api from existing tokens else login with native api callbacks.</summary>
+		public static async Task<ApiExtended> CreateAsync(Account account, ILoginCallback loginCallback)
+		{
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				LoginType = nameof(ILoginCallback),
+				Account = account?.MaskedLogEntry ?? "[null]",
+				LocaleName = account?.Locale?.Name
+			});
+
+			var api = await EzApiCreator.GetApiAsync(
+				loginCallback,
+				account.Locale,
+				AudibleApiStorage.AccountsSettingsFile,
+				account.GetIdentityTokensJsonPath());
+			return new ApiExtended(api);
+		}
+
+		/// <summary>Get api from existing tokens else login with external browser</summary>
+		public static async Task<ApiExtended> CreateAsync(Account account, ILoginExternal loginExternal)
+		{
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				LoginType = nameof(ILoginExternal),
+				Account = account?.MaskedLogEntry ?? "[null]",
+				LocaleName = account?.Locale?.Name
+			});
+
+			var api = await EzApiCreator.GetApiAsync(
+				loginExternal,
+				account.Locale,
+				AudibleApiStorage.AccountsSettingsFile,
+				account.GetIdentityTokensJsonPath());
+			return new ApiExtended(api);
+		}
+
+		/// <summary>Get api from existing tokens. Assumes you have valid login tokens. Else exception</summary>
+		public static async Task<ApiExtended> CreateAsync(Account account)
+		{
+			ArgumentValidator.EnsureNotNull(account, nameof(account));
+			ArgumentValidator.EnsureNotNull(account.Locale, nameof(account.Locale));
+
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				AccountMaskedLogEntry = account.MaskedLogEntry
+			});
+
+			return await CreateAsync(account.AccountId, account.Locale.Name);
+		}
+
+		/// <summary>Get api from existing tokens. Assumes you have valid login tokens. Else exception</summary>
+		public static async Task<ApiExtended> CreateAsync(string username, string localeName)
+		{
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
 			{
 				Username = username.ToMask(),
 				LocaleName = localeName,
 			});
-			return EzApiCreator.GetApiAsync(
-				Localization.Get(localeName),
-				AudibleApiStorage.AccountsSettingsFile,
-				AudibleApiStorage.GetIdentityTokensJsonPath(username, localeName),
-				loginCallback);
-		}
 
-		/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
-		public static Task<Api> GetApiAsync(ILoginCallback loginCallback, Account account)
-		{
-			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
-			{
-				Account = account?.MaskedLogEntry ?? "[null]",
-				LocaleName = account?.Locale?.Name
-			});
-			return EzApiCreator.GetApiAsync(
-				account.Locale,
-				AudibleApiStorage.AccountsSettingsFile,
-				account.GetIdentityTokensJsonPath(),
-				loginCallback);
+			var api = await EzApiCreator.GetApiAsync(
+					Localization.Get(localeName),
+					AudibleApiStorage.AccountsSettingsFile,
+					AudibleApiStorage.GetIdentityTokensJsonPath(username, localeName));
+			return new ApiExtended(api);
 		}
 
 		private static AsyncRetryPolicy policy { get; }
@@ -47,16 +106,16 @@ namespace InternalUtilities
 			// 2 retries == 3 total
 			.RetryAsync(2);
 
-		public static Task<List<Item>> GetLibraryValidatedAsync(Api api, LibraryOptions.ResponseGroupOptions responseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS)
+		public Task<List<Item>> GetLibraryValidatedAsync(LibraryOptions.ResponseGroupOptions responseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS)
 		{
 			// bug on audible's side. the 1st time after a long absence, a query to get library will return without titles or authors. a subsequent identical query will be successful. this is true whether or tokens are refreshed
 			// worse, this 1st dummy call doesn't seem to help:
 			//    var page = await api.GetLibraryAsync(new AudibleApi.LibraryOptions { NumberOfResultPerPage = 1, PageNumber = 1, PurchasedAfter = DateTime.Now.AddYears(-20), ResponseGroups = AudibleApi.LibraryOptions.ResponseGroupOptions.ALL_OPTIONS });
 			// i don't want to incur the cost of making a full dummy call every time because it fails sometimes
-			return policy.ExecuteAsync(() => getItemsAsync(api, responseGroups));
+			return policy.ExecuteAsync(() => getItemsAsync(responseGroups));
 		}
 
-		private static async Task<List<Item>> getItemsAsync(Api api, LibraryOptions.ResponseGroupOptions responseGroups)
+		private async Task<List<Item>> getItemsAsync(LibraryOptions.ResponseGroupOptions responseGroups)
 		{
 			var items = new List<Item>();
 #if DEBUG
@@ -68,12 +127,12 @@ namespace InternalUtilities
 //}
 #endif
 			if (!items.Any())
-				items = await api.GetAllLibraryItemsAsync(responseGroups);
+				items = await Api.GetAllLibraryItemsAsync(responseGroups);
 #if DEBUG
 //System.IO.File.WriteAllText("library.json", AudibleApi.Common.Converter.ToJson(items));
 #endif
 
-			await manageEpisodesAsync(api, items);
+			await manageEpisodesAsync(items);
 
 			var validators = new List<IValidator>();
 			validators.AddRange(getValidators());
@@ -88,7 +147,7 @@ namespace InternalUtilities
 		}
 
 		#region episodes and podcasts
-		private static async Task manageEpisodesAsync(Api api, List<Item> items)
+		private async Task manageEpisodesAsync(List<Item> items)
 		{
 			// add podcasts and episodes to list. If fail, don't let it de-rail the rest of the import
 			try
@@ -110,7 +169,7 @@ namespace InternalUtilities
 				items.RemoveAll(i => i.IsEpisodes);
 
 				// add children
-				var children = await getEpisodesAsync(api, parents);
+				var children = await getEpisodesAsync(parents);
 				Serilog.Log.Logger.Information($"{children.Count} episodes of shows/podcasts found");
 				items.AddRange(children);
 			}
@@ -120,13 +179,13 @@ namespace InternalUtilities
 			}
 		}
 
-		private static async Task<List<Item>> getEpisodesAsync(Api api, List<Item> parents)
+		private async Task<List<Item>> getEpisodesAsync(List<Item> parents)
 		{
 			var results = new List<Item>();
 
 			foreach (var parent in parents)
 			{
-				var children = await getEpisodeChildrenAsync(api, parent);
+				var children = await getEpisodeChildrenAsync(parent);
 
 				foreach (var child in children)
 				{
@@ -159,7 +218,7 @@ namespace InternalUtilities
 			return results;
 		}
 
-		private static async Task<List<Item>> getEpisodeChildrenAsync(Api api, Item parent)
+		private async Task<List<Item>> getEpisodeChildrenAsync(Item parent)
 		{
 			var childrenIds = parent.Relationships
 				.Where(r => r.RelationshipToProduct == RelationshipToProduct.Child && r.RelationshipType == RelationshipType.Episode)
@@ -180,7 +239,7 @@ namespace InternalUtilities
 				List<Item> childrenBatch;
 				try
 				{
-					childrenBatch = await api.GetCatalogProductsAsync(idBatch, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
+					childrenBatch = await Api.GetCatalogProductsAsync(idBatch, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
 #if DEBUG
 //var childrenBatchDebug = childrenBatch.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
 //System.IO.File.WriteAllText($"children of {parent.Asin}.json", childrenBatchDebug);
@@ -222,7 +281,7 @@ namespace InternalUtilities
 
 			return results;
 		}
-#endregion
+		#endregion
 
 		private static List<IValidator> getValidators()
 		{

InternalUtilities/AudibleApiValidators.cs

@@ -33,8 +33,10 @@ namespace InternalUtilities
 
 			if (items.Any(i => string.IsNullOrWhiteSpace(i.ProductId)))
 				exceptions.Add(new ArgumentException($"Collection contains item(s) with blank {nameof(Item.ProductId)}", nameof(items)));
-			if (items.Any(i => string.IsNullOrWhiteSpace(i.Title)))
-				exceptions.Add(new ArgumentException($"Collection contains item(s) with blank {nameof(Item.Title)}", nameof(items)));
+
+			// this can happen with podcast episodes
+			foreach (var i in items.Where(i => string.IsNullOrWhiteSpace(i.Title)))
+				i.Title = "[blank title]";
 
 			return exceptions;
 		}
@@ -76,9 +78,9 @@ namespace InternalUtilities
 
 			var distinct = items.GetSeriesDistinct();
 			if (distinct.Any(s => s.SeriesId is null))
-				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(AudibleApi.Common.Series.SeriesId)}", nameof(items)));
+				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesId)}", nameof(items)));
 			if (distinct.Any(s => s.SeriesName is null))
-				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(AudibleApi.Common.Series.SeriesName)}", nameof(items)));
+				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesName)}", nameof(items)));
 
 			return exceptions;
 		}

InternalUtilities/InternalUtilities.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="1.2.1.2" />
+    <PackageReference Include="AudibleApi" Version="2.1.3.1" />
   </ItemGroup>
 
   <ItemGroup>

Libation.sln

@@ -36,6 +36,9 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine", "LibationSearchEngine\LibationSearchEngine.csproj", "{2E1F5DB4-40CC-4804-A893-5DCE0193E598}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationWinForms", "LibationWinForms\LibationWinForms.csproj", "{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{428163C3-D558-4914-B570-A92069521877} = {428163C3-D558-4914-B570-A92069521877}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DtoImporterService", "DtoImporterService\DtoImporterService.csproj", "{401865F5-1942-4713-B230-04544C0A97B0}"
 EndProject

LibationCli/LibationCli.csproj

@@ -12,6 +12,14 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
 
+  <!--
+  When LibationWinForms and LibationCli output to the same dir, LibationCli must build before LibationWinForms
+  
+  VS > rt-clik solution > Project Build Order...
+  Dependencies [tab]
+  Projects: LibationWinForms
+  manually check LibationCli
+  -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\LibationWinForms\bin\Debug</OutputPath>
   </PropertyGroup>

LibationCli/Options/ScanOptions.cs

@@ -32,9 +32,7 @@ namespace LibationCli
 				: $"Scanning Audible library: {_accounts.Length} accounts. This may take a few minutes per account.";
 			Console.WriteLine(intro);
 
-			var (TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync(
-				(account) => null,
-				_accounts);
+			var (TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((a) => ApiExtended.CreateAsync(a), _accounts);
 
 			Console.WriteLine("Scan complete.");
 			Console.WriteLine($"Total processed: {TotalBooksProcessed}\r\nNew: {NewBooksAdded}");

LibationCli/Program.cs

@@ -35,7 +35,7 @@ namespace LibationCli
 			string input = null;
 
 			//input = "  export --help";
-			//input = "  scan  cupidneedsglasses";
+			//input = "  scan  rmcrackan";
 			//input = "  liberate ";
 
 

LibationWinForms/Dialogs/IndexLibraryDialog.cs

@@ -32,7 +32,7 @@ namespace LibationWinForms.Dialogs
 
 				try
 				{
-					(TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((account) => new WinformResponder(account), _accounts);
+					(TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((account) => ApiExtended.CreateAsync(account, new WinformLoginChoiceEager(account)), _accounts);
 				}
 				catch (Exception ex)
 				{

LibationWinForms/Dialogs/Login/LoginCallbackDialog.Designer.cs

@@ -1,6 +1,6 @@
 namespace LibationWinForms.Dialogs.Login
 {
-	partial class AudibleLoginDialog
+	partial class LoginCallbackDialog
 	{
 		/// <summary>
 		/// Required designer variable.
@@ -38,25 +38,29 @@
 			// passwordLbl
 			// 
 			this.passwordLbl.AutoSize = true;
-			this.passwordLbl.Location = new System.Drawing.Point(12, 41);
+			this.passwordLbl.Location = new System.Drawing.Point(14, 47);
+			this.passwordLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.passwordLbl.Name = "passwordLbl";
-			this.passwordLbl.Size = new System.Drawing.Size(53, 13);
+			this.passwordLbl.Size = new System.Drawing.Size(57, 15);
 			this.passwordLbl.TabIndex = 2;
 			this.passwordLbl.Text = "Password";
 			// 
 			// passwordTb
 			// 
-			this.passwordTb.Location = new System.Drawing.Point(71, 38);
+			this.passwordTb.Location = new System.Drawing.Point(83, 44);
+			this.passwordTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.passwordTb.Name = "passwordTb";
 			this.passwordTb.PasswordChar = '*';
-			this.passwordTb.Size = new System.Drawing.Size(200, 20);
+			this.passwordTb.Size = new System.Drawing.Size(233, 23);
 			this.passwordTb.TabIndex = 3;
 			// 
 			// submitBtn
 			// 
-			this.submitBtn.Location = new System.Drawing.Point(196, 64);
+			this.submitBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.submitBtn.Location = new System.Drawing.Point(229, 74);
+			this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.submitBtn.Name = "submitBtn";
-			this.submitBtn.Size = new System.Drawing.Size(75, 23);
+			this.submitBtn.Size = new System.Drawing.Size(88, 27);
 			this.submitBtn.TabIndex = 4;
 			this.submitBtn.Text = "Submit";
 			this.submitBtn.UseVisualStyleBackColor = true;
@@ -65,36 +69,39 @@
 			// localeLbl
 			// 
 			this.localeLbl.AutoSize = true;
-			this.localeLbl.Location = new System.Drawing.Point(12, 9);
+			this.localeLbl.Location = new System.Drawing.Point(14, 10);
+			this.localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.localeLbl.Name = "localeLbl";
-			this.localeLbl.Size = new System.Drawing.Size(59, 13);
+			this.localeLbl.Size = new System.Drawing.Size(61, 15);
 			this.localeLbl.TabIndex = 0;
 			this.localeLbl.Text = "Locale: {0}";
 			// 
 			// usernameLbl
 			// 
 			this.usernameLbl.AutoSize = true;
-			this.usernameLbl.Location = new System.Drawing.Point(12, 22);
+			this.usernameLbl.Location = new System.Drawing.Point(14, 25);
+			this.usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.usernameLbl.Name = "usernameLbl";
-			this.usernameLbl.Size = new System.Drawing.Size(75, 13);
+			this.usernameLbl.Size = new System.Drawing.Size(80, 15);
 			this.usernameLbl.TabIndex = 1;
 			this.usernameLbl.Text = "Username: {0}";
 			// 
-			// AudibleLoginDialog
+			// LoginCallbackDialog
 			// 
 			this.AcceptButton = this.submitBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(283, 99);
+			this.ClientSize = new System.Drawing.Size(330, 114);
 			this.Controls.Add(this.usernameLbl);
 			this.Controls.Add(this.localeLbl);
 			this.Controls.Add(this.submitBtn);
 			this.Controls.Add(this.passwordLbl);
 			this.Controls.Add(this.passwordTb);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.MaximizeBox = false;
 			this.MinimizeBox = false;
-			this.Name = "AudibleLoginDialog";
+			this.Name = "LoginCallbackDialog";
 			this.ShowIcon = false;
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "Audible Login";

LibationWinForms/Dialogs/Login/LoginCallbackDialog.cs

@@ -1,28 +1,25 @@
-using Dinah.Core;
-using InternalUtilities;
-using System;
-using System.Linq;
+using System;
 using System.Windows.Forms;
+using Dinah.Core;
+using InternalUtilities;
 
 namespace LibationWinForms.Dialogs.Login
 {
-	public partial class AudibleLoginDialog : Form
+	public partial class LoginCallbackDialog : Form
 	{
-		private string locale { get; }
 		private string accountId { get; }
 
 		public string Email { get; private set; }
 		public string Password { get; private set; }
 
-		public AudibleLoginDialog(Account account)
+		public LoginCallbackDialog(Account account)
 		{
 			InitializeComponent();
 
-			locale = account.Locale.Name;
 			accountId = account.AccountId;
 
 			// do not allow user to change login id here. if they do then jsonpath will fail
-			this.localeLbl.Text = string.Format(this.localeLbl.Text, locale);
+			this.localeLbl.Text = string.Format(this.localeLbl.Text, account.Locale.Name);
 			this.usernameLbl.Text = string.Format(this.usernameLbl.Text, accountId);
 		}
 

LibationWinForms/Dialogs/Login/LoginCallbackDialog.resx

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.Designer.cs

@@ -0,0 +1,161 @@
+namespace LibationWinForms.Dialogs.Login
+{
+	partial class LoginChoiceEagerDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.passwordLbl = new System.Windows.Forms.Label();
+			this.passwordTb = new System.Windows.Forms.TextBox();
+			this.submitBtn = new System.Windows.Forms.Button();
+			this.localeLbl = new System.Windows.Forms.Label();
+			this.usernameLbl = new System.Windows.Forms.Label();
+			this.externalLoginLink = new System.Windows.Forms.LinkLabel();
+			this.externalLoginLbl2 = new System.Windows.Forms.Label();
+			this.externalLoginLbl1 = new System.Windows.Forms.Label();
+			this.SuspendLayout();
+			// 
+			// passwordLbl
+			// 
+			this.passwordLbl.AutoSize = true;
+			this.passwordLbl.Location = new System.Drawing.Point(14, 47);
+			this.passwordLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.passwordLbl.Name = "passwordLbl";
+			this.passwordLbl.Size = new System.Drawing.Size(57, 15);
+			this.passwordLbl.TabIndex = 2;
+			this.passwordLbl.Text = "Password";
+			// 
+			// passwordTb
+			// 
+			this.passwordTb.Location = new System.Drawing.Point(83, 44);
+			this.passwordTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.passwordTb.Name = "passwordTb";
+			this.passwordTb.PasswordChar = '*';
+			this.passwordTb.Size = new System.Drawing.Size(233, 23);
+			this.passwordTb.TabIndex = 3;
+			// 
+			// submitBtn
+			// 
+			this.submitBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.submitBtn.Location = new System.Drawing.Point(293, 176);
+			this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.submitBtn.Name = "submitBtn";
+			this.submitBtn.Size = new System.Drawing.Size(88, 27);
+			this.submitBtn.TabIndex = 7;
+			this.submitBtn.Text = "Submit";
+			this.submitBtn.UseVisualStyleBackColor = true;
+			this.submitBtn.Click += new System.EventHandler(this.submitBtn_Click);
+			// 
+			// localeLbl
+			// 
+			this.localeLbl.AutoSize = true;
+			this.localeLbl.Location = new System.Drawing.Point(14, 10);
+			this.localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.localeLbl.Name = "localeLbl";
+			this.localeLbl.Size = new System.Drawing.Size(61, 15);
+			this.localeLbl.TabIndex = 0;
+			this.localeLbl.Text = "Locale: {0}";
+			// 
+			// usernameLbl
+			// 
+			this.usernameLbl.AutoSize = true;
+			this.usernameLbl.Location = new System.Drawing.Point(14, 25);
+			this.usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.usernameLbl.Name = "usernameLbl";
+			this.usernameLbl.Size = new System.Drawing.Size(80, 15);
+			this.usernameLbl.TabIndex = 1;
+			this.usernameLbl.Text = "Username: {0}";
+			// 
+			// externalLoginLink
+			// 
+			this.externalLoginLink.AutoSize = true;
+			this.externalLoginLink.Location = new System.Drawing.Point(14, 93);
+			this.externalLoginLink.Name = "externalLoginLink";
+			this.externalLoginLink.Size = new System.Drawing.Size(107, 15);
+			this.externalLoginLink.TabIndex = 4;
+			this.externalLoginLink.TabStop = true;
+			this.externalLoginLink.Text = "Or click here to log";
+			this.externalLoginLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.externalLoginLink_LinkClicked);
+			// 
+			// externalLoginLbl2
+			// 
+			this.externalLoginLbl2.AutoSize = true;
+			this.externalLoginLbl2.Location = new System.Drawing.Point(14, 108);
+			this.externalLoginLbl2.Name = "externalLoginLbl2";
+			this.externalLoginLbl2.Size = new System.Drawing.Size(352, 45);
+			this.externalLoginLbl2.TabIndex = 6;
+			this.externalLoginLbl2.Text = "This more advanced login is recommended if you\'re experiencing\r\nerrors logging in" +
+    " the conventional way above or if you\'re not\r\ncomfortable typing your password h" +
+    "ere.";
+			// 
+			// externalLoginLbl1
+			// 
+			this.externalLoginLbl1.AutoSize = true;
+			this.externalLoginLbl1.Location = new System.Drawing.Point(83, 93);
+			this.externalLoginLbl1.Name = "externalLoginLbl1";
+			this.externalLoginLbl1.Size = new System.Drawing.Size(158, 15);
+			this.externalLoginLbl1.TabIndex = 5;
+			this.externalLoginLbl1.Text = "to log in using your browser.";
+			// 
+			// LoginChoiceEagerDialog
+			// 
+			this.AcceptButton = this.submitBtn;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(394, 216);
+			this.Controls.Add(this.externalLoginLbl2);
+			this.Controls.Add(this.externalLoginLbl1);
+			this.Controls.Add(this.externalLoginLink);
+			this.Controls.Add(this.usernameLbl);
+			this.Controls.Add(this.localeLbl);
+			this.Controls.Add(this.submitBtn);
+			this.Controls.Add(this.passwordLbl);
+			this.Controls.Add(this.passwordTb);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "LoginChoiceEagerDialog";
+			this.ShowIcon = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Audible Login";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label passwordLbl;
+		private System.Windows.Forms.TextBox passwordTb;
+		private System.Windows.Forms.Button submitBtn;
+		private System.Windows.Forms.Label localeLbl;
+		private System.Windows.Forms.Label usernameLbl;
+		private System.Windows.Forms.LinkLabel externalLoginLink;
+		private System.Windows.Forms.Label externalLoginLbl2;
+		private System.Windows.Forms.Label externalLoginLbl1;
+	}
+}

LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Windows.Forms;
+using Dinah.Core;
+using InternalUtilities;
+
+namespace LibationWinForms.Dialogs.Login
+{
+	public partial class LoginChoiceEagerDialog : Form
+	{
+		private string accountId { get; }
+
+		public AudibleApi.LoginMethod LoginMethod { get; private set; }
+
+		public string Email { get; private set; }
+		public string Password { get; private set; }
+
+		public LoginChoiceEagerDialog(Account account)
+		{
+			InitializeComponent();
+
+			accountId = account.AccountId;
+
+			// do not allow user to change login id here. if they do then jsonpath will fail
+			this.localeLbl.Text = string.Format(this.localeLbl.Text, account.Locale.Name);
+			this.usernameLbl.Text = string.Format(this.usernameLbl.Text, accountId);
+		}
+
+		private void externalLoginLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+		{
+			LoginMethod = AudibleApi.LoginMethod.External;
+			DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void submitBtn_Click(object sender, EventArgs e)
+		{
+			Email = accountId;
+			Password = this.passwordTb.Text;
+
+			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new { email = Email?.ToMask(), passwordLength = Password.Length });
+
+			LoginMethod = AudibleApi.LoginMethod.Api;
+			DialogResult = DialogResult.OK;
+			// Close() not needed for AcceptButton
+		}
+	}
+}

LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

LibationWinForms/Dialogs/Login/LoginExternalDialog.Designer.cs

@@ -0,0 +1,179 @@
+namespace LibationWinForms.Dialogs.Login
+{
+	partial class LoginExternalDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LoginExternalDialog));
+			this.submitBtn = new System.Windows.Forms.Button();
+			this.localeLbl = new System.Windows.Forms.Label();
+			this.usernameLbl = new System.Windows.Forms.Label();
+			this.loginUrlLbl = new System.Windows.Forms.Label();
+			this.loginUrlTb = new System.Windows.Forms.TextBox();
+			this.copyBtn = new System.Windows.Forms.Button();
+			this.launchBrowserBtn = new System.Windows.Forms.Button();
+			this.instructionsLbl = new System.Windows.Forms.Label();
+			this.responseUrlTb = new System.Windows.Forms.TextBox();
+			this.SuspendLayout();
+			// 
+			// submitBtn
+			// 
+			this.submitBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.submitBtn.Location = new System.Drawing.Point(665, 400);
+			this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.submitBtn.Name = "submitBtn";
+			this.submitBtn.Size = new System.Drawing.Size(88, 27);
+			this.submitBtn.TabIndex = 8;
+			this.submitBtn.Text = "Submit";
+			this.submitBtn.UseVisualStyleBackColor = true;
+			this.submitBtn.Click += new System.EventHandler(this.submitBtn_Click);
+			// 
+			// localeLbl
+			// 
+			this.localeLbl.AutoSize = true;
+			this.localeLbl.Location = new System.Drawing.Point(14, 10);
+			this.localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.localeLbl.Name = "localeLbl";
+			this.localeLbl.Size = new System.Drawing.Size(61, 15);
+			this.localeLbl.TabIndex = 0;
+			this.localeLbl.Text = "Locale: {0}";
+			// 
+			// usernameLbl
+			// 
+			this.usernameLbl.AutoSize = true;
+			this.usernameLbl.Location = new System.Drawing.Point(14, 25);
+			this.usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.usernameLbl.Name = "usernameLbl";
+			this.usernameLbl.Size = new System.Drawing.Size(80, 15);
+			this.usernameLbl.TabIndex = 1;
+			this.usernameLbl.Text = "Username: {0}";
+			// 
+			// loginUrlLbl
+			// 
+			this.loginUrlLbl.AutoSize = true;
+			this.loginUrlLbl.Location = new System.Drawing.Point(14, 61);
+			this.loginUrlLbl.Name = "loginUrlLbl";
+			this.loginUrlLbl.Size = new System.Drawing.Size(180, 15);
+			this.loginUrlLbl.TabIndex = 2;
+			this.loginUrlLbl.Text = "Paste this URL into your browser:";
+			// 
+			// loginUrlTb
+			// 
+			this.loginUrlTb.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.loginUrlTb.Location = new System.Drawing.Point(14, 79);
+			this.loginUrlTb.Multiline = true;
+			this.loginUrlTb.Name = "loginUrlTb";
+			this.loginUrlTb.ReadOnly = true;
+			this.loginUrlTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+			this.loginUrlTb.Size = new System.Drawing.Size(739, 92);
+			this.loginUrlTb.TabIndex = 3;
+			// 
+			// copyBtn
+			// 
+			this.copyBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.copyBtn.Location = new System.Drawing.Point(14, 177);
+			this.copyBtn.Name = "copyBtn";
+			this.copyBtn.Size = new System.Drawing.Size(165, 23);
+			this.copyBtn.TabIndex = 4;
+			this.copyBtn.Text = "Copy URL to clipboard";
+			this.copyBtn.UseVisualStyleBackColor = true;
+			this.copyBtn.Click += new System.EventHandler(this.copyBtn_Click);
+			// 
+			// launchBrowserBtn
+			// 
+			this.launchBrowserBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.launchBrowserBtn.Location = new System.Drawing.Point(588, 177);
+			this.launchBrowserBtn.Name = "launchBrowserBtn";
+			this.launchBrowserBtn.Size = new System.Drawing.Size(165, 23);
+			this.launchBrowserBtn.TabIndex = 5;
+			this.launchBrowserBtn.Text = "Launch in browser";
+			this.launchBrowserBtn.UseVisualStyleBackColor = true;
+			this.launchBrowserBtn.Click += new System.EventHandler(this.launchBrowserBtn_Click);
+			// 
+			// instructionsLbl
+			// 
+			this.instructionsLbl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.instructionsLbl.AutoSize = true;
+			this.instructionsLbl.Location = new System.Drawing.Point(14, 203);
+			this.instructionsLbl.Name = "instructionsLbl";
+			this.instructionsLbl.Size = new System.Drawing.Size(436, 90);
+			this.instructionsLbl.TabIndex = 6;
+			this.instructionsLbl.Text = resources.GetString("instructionsLbl.Text");
+			// 
+			// responseUrlTb
+			// 
+			this.responseUrlTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.responseUrlTb.Location = new System.Drawing.Point(14, 296);
+			this.responseUrlTb.Multiline = true;
+			this.responseUrlTb.Name = "responseUrlTb";
+			this.responseUrlTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+			this.responseUrlTb.Size = new System.Drawing.Size(739, 98);
+			this.responseUrlTb.TabIndex = 7;
+			// 
+			// LoginExternalDialog
+			// 
+			this.AcceptButton = this.submitBtn;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(766, 440);
+			this.Controls.Add(this.responseUrlTb);
+			this.Controls.Add(this.instructionsLbl);
+			this.Controls.Add(this.launchBrowserBtn);
+			this.Controls.Add(this.copyBtn);
+			this.Controls.Add(this.loginUrlTb);
+			this.Controls.Add(this.loginUrlLbl);
+			this.Controls.Add(this.usernameLbl);
+			this.Controls.Add(this.localeLbl);
+			this.Controls.Add(this.submitBtn);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "LoginExternalDialog";
+			this.ShowIcon = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Audible External Login";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+		private System.Windows.Forms.Button submitBtn;
+		private System.Windows.Forms.Label localeLbl;
+		private System.Windows.Forms.Label usernameLbl;
+		private System.Windows.Forms.Label loginUrlLbl;
+		private System.Windows.Forms.TextBox loginUrlTb;
+		private System.Windows.Forms.Button copyBtn;
+		private System.Windows.Forms.Button launchBrowserBtn;
+		private System.Windows.Forms.Label instructionsLbl;
+		private System.Windows.Forms.TextBox responseUrlTb;
+	}
+}

LibationWinForms/Dialogs/Login/LoginExternalDialog.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Windows.Forms;
+using Dinah.Core;
+using InternalUtilities;
+
+namespace LibationWinForms.Dialogs.Login
+{
+	public partial class LoginExternalDialog : Form
+	{
+		public string ResponseUrl { get; private set; }
+
+		public LoginExternalDialog(Account account, string loginUrl)
+		{
+			InitializeComponent();
+
+			// do not allow user to change login id here. if they do then jsonpath will fail
+			this.localeLbl.Text = string.Format(this.localeLbl.Text, account.Locale.Name);
+			this.usernameLbl.Text = string.Format(this.usernameLbl.Text, account.AccountId);
+
+			this.loginUrlTb.Text = loginUrl;
+		}
+
+		private void copyBtn_Click(object sender, EventArgs e) => Clipboard.SetText(this.loginUrlTb.Text);
+
+		private void launchBrowserBtn_Click(object sender, EventArgs e) => Go.To.Url(this.loginUrlTb.Text);
+
+		private void submitBtn_Click(object sender, EventArgs e)
+		{
+			ResponseUrl = this.responseUrlTb.Text?.Trim();
+
+			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new { ResponseUrl });
+			if (!Uri.TryCreate(ResponseUrl, UriKind.Absolute, out var result))
+			{
+				MessageBox.Show("Invalid response URL");
+				return;
+			}
+
+			DialogResult = DialogResult.OK;
+			// Close() not needed for AcceptButton
+		}
+	}
+}

LibationWinForms/Dialogs/Login/LoginExternalDialog.resx

@@ -0,0 +1,68 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="instructionsLbl.Text" xml:space="preserve">
+    <value>Login with your Amazon/Audible credentials.
+After login is complete, your browser will show you an error page similar to:
+     Looking for Something?
+     We're sorry. The Web address you entered is not a functioning page on our site
+Don't worry -- this is ACTUALLY A SUCCESSFUL LOGIN.
+Copy the current url from your browser's address bar and paste it here:</value>
+  </data>
+</root>

LibationWinForms/Dialogs/Login/WinformLoginBase.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace LibationWinForms.Dialogs.Login
+{
+	public abstract class WinformLoginBase
+	{
+		/// <returns>True if ShowDialog's DialogResult == OK</returns>
+		protected static bool ShowDialog(System.Windows.Forms.Form dialog)
+		{
+			var result = dialog.ShowDialog();
+			Serilog.Log.Logger.Debug("{@DebugInfo}", new { DialogResult = result });
+			return result == System.Windows.Forms.DialogResult.OK;
+		}
+	}
+}

LibationWinForms/Dialogs/Login/WinformLoginCallback.cs

@@ -1,16 +1,15 @@
-using AudibleApi;
+using System;
+using AudibleApi;
 using InternalUtilities;
 using LibationWinForms.Dialogs.Login;
-using System;
-using System.Linq;
 
 namespace LibationWinForms.Login
 {
-	public class WinformResponder : ILoginCallback
+	public class WinformLoginCallback : WinformLoginBase, ILoginCallback
 	{
 		private Account _account { get; }
 
-		public WinformResponder(Account account)
+		public WinformLoginCallback(Account account)
 		{
 			_account = Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
 		}
@@ -18,7 +17,7 @@ namespace LibationWinForms.Login
 		public string Get2faCode()
 		{
 			using var dialog = new _2faCodeDialog();
-			if (showDialog(dialog))
+			if (ShowDialog(dialog))
 				return dialog.Code;
 			return null;
 		}
@@ -26,7 +25,7 @@ namespace LibationWinForms.Login
 		public string GetCaptchaAnswer(byte[] captchaImage)
 		{
 			using var dialog = new CaptchaDialog(captchaImage);
-			if (showDialog(dialog))
+			if (ShowDialog(dialog))
 				return dialog.Answer;
 			return null;
 		}
@@ -34,15 +33,15 @@ namespace LibationWinForms.Login
 		public (string name, string value) GetMfaChoice(MfaConfig mfaConfig)
 		{
 			using var dialog = new MfaDialog(mfaConfig);
-			if (showDialog(dialog))
+			if (ShowDialog(dialog))
 				return (dialog.SelectedName, dialog.SelectedValue);
 			return (null, null);
 		}
 
 		public (string email, string password) GetLogin()
 		{
-			using var dialog = new AudibleLoginDialog(_account);
-			if (showDialog(dialog))
+			using var dialog = new LoginCallbackDialog(_account);
+			if (ShowDialog(dialog))
 				return (dialog.Email, dialog.Password);
 			return (null, null);
 		}
@@ -50,15 +49,7 @@ namespace LibationWinForms.Login
 		public void ShowApprovalNeeded()
 		{
 			using var dialog = new ApprovalNeededDialog();
-			showDialog(dialog);
-		}
-
-		/// <returns>True if ShowDialog's DialogResult == OK</returns>
-		private static bool showDialog(System.Windows.Forms.Form dialog)
-		{
-			var result = dialog.ShowDialog();
-			Serilog.Log.Logger.Debug("{@DebugInfo}", new { DialogResult = result });
-			return result == System.Windows.Forms.DialogResult.OK;
+			ShowDialog(dialog);
 		}
 	}
 }

LibationWinForms/Dialogs/Login/WinformLoginChoiceEager.cs

@@ -0,0 +1,43 @@
+using System;
+using AudibleApi;
+using InternalUtilities;
+using LibationWinForms.Dialogs.Login;
+
+namespace LibationWinForms.Login
+{
+	public class WinformLoginChoiceEager : WinformLoginBase, ILoginChoiceEager
+	{
+		public ILoginCallback LoginCallback { get; private set; }
+
+		private Account _account { get; }
+
+		public WinformLoginChoiceEager(Account account)
+		{
+			_account = Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
+			LoginCallback = new WinformLoginCallback(_account);
+		}
+
+		public ChoiceOut Start(ChoiceIn choiceIn)
+		{
+			using var dialog = new LoginChoiceEagerDialog(_account);
+
+			if (!ShowDialog(dialog))
+				return null;
+
+			switch (dialog.LoginMethod)
+			{
+				case LoginMethod.Api:
+					return ChoiceOut.WithApi(dialog.Email, dialog.Password);
+				case LoginMethod.External:
+				{
+					using var externalDialog = new LoginExternalDialog(_account, choiceIn.LoginUrl);
+					return ShowDialog(externalDialog)
+						? ChoiceOut.External(externalDialog.ResponseUrl)
+						: null;
+				}
+				default:
+					throw new Exception($"Unknown {nameof(LoginMethod)} value");
+			}
+		}
+	}
+}

LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.cs

@@ -33,10 +33,37 @@ namespace LibationWinForms.Dialogs
 		}
 
 		private void githubLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-			=> Go.To.Url("https://github.com/rmcrackan/Libation/issues");
+		{
+			var url = "https://github.com/rmcrackan/Libation/issues";
+			try
+			{
+				Go.To.Url(url);
+			}
+			catch
+			{
+				MessageBox.Show($"Error opening url\r\n{url}", "Error opening url", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+		}
 
 		private void logsLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-			=> Go.To.Folder(FileManager.Configuration.Instance.LibationFiles);
+		{
+			string dir = "";
+			try
+			{
+				dir = FileManager.Configuration.Instance.LibationFiles;
+			}
+			catch { }
+
+			try
+			{
+				Go.To.Folder(dir);
+			}
+			catch
+			{
+				MessageBox.Show($"Error opening folder\r\n{dir}", "Error opening folder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+		}
+
 
 		private void okBtn_Click(object sender, EventArgs e)
 		{

LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs

@@ -38,7 +38,7 @@ namespace LibationWinForms.Dialogs
 			this.authorsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.miscDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.purchaseDateGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
+			this.gridEntryBindingSource = new LibationWinForms.SyncBindingSource(this.components);
 			this.btnRemoveBooks = new System.Windows.Forms.Button();
 			this.label1 = new System.Windows.Forms.Label();
 			((System.ComponentModel.ISupportInitialize)(this._dataGridView)).BeginInit();
@@ -176,7 +176,7 @@ namespace LibationWinForms.Dialogs
         #endregion
 
         private System.Windows.Forms.DataGridView _dataGridView;
-        private System.Windows.Forms.BindingSource gridEntryBindingSource;
+        private LibationWinForms.SyncBindingSource gridEntryBindingSource;
         private System.Windows.Forms.Button btnRemoveBooks;
         private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.DataGridViewCheckBoxColumn removeDataGridViewCheckBoxColumn;

LibationWinForms/Dialogs/RemoveBooksDialog.cs

@@ -62,7 +62,7 @@ namespace LibationWinForms.Dialogs
 				return;
 			try
 			{
-				var removedBooks = await LibraryCommands.FindInactiveBooks((account) => new WinformResponder(account), _libraryBooks, _accounts);
+				var removedBooks = await LibraryCommands.FindInactiveBooks((account) => ApiExtended.CreateAsync(account, new WinformLoginChoiceEager(account)), _libraryBooks, _accounts);
 
 				var removable = _removableGridEntries.Where(rge => removedBooks.Any(rb => rb.Book.AudibleProductId == rge.AudibleProductId)).ToList();
 

LibationWinForms/LibationWinForms.csproj

@@ -18,8 +18,18 @@
     <!-- Version is now in AppScaffolding.csproj -->
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!--
+    HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
+    - Not using SatelliteResourceLanguages will load all language packs: works
+    - Specifying 'en' semicolon 1 more should load 1 language pack: works
+    - Specifying only 'en' should load no language packs: broken, still loads all
+    -->
+    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="1.1.0.2" />
+    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="1.1.1.1" />
   </ItemGroup>
 
   <ItemGroup>

LibationWinForms/MessageBoxAlertAdmin.cs

@@ -1,6 +1,5 @@
-using LibationWinForms.Dialogs;
-using System;
-using System.Linq;
+using System;
+using LibationWinForms.Dialogs;
 
 namespace LibationWinForms
 {
@@ -15,7 +14,11 @@ namespace LibationWinForms
 		/// <returns>One of the System.Windows.Forms.DialogResult values.</returns>
 		public static System.Windows.Forms.DialogResult Show(string text, string caption, Exception exception)
 		{
-			Serilog.Log.Logger.Error(exception, "Alert admin error: {@DebugText}", new { text, caption });
+			try
+			{
+				Serilog.Log.Logger.Error(exception, "Alert admin error: {@DebugText}", new { text, caption });
+			}
+			catch { }
 
 			using var form = new MessageBoxAlertAdminDialog(text, caption, exception);
 			return form.ShowDialog();

LibationWinForms/ProductsGrid.Designer.cs

@@ -30,7 +30,7 @@
 		{
             this.components = new System.ComponentModel.Container();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.gridEntryBindingSource = new LibationWinForms.SyncBindingSource(this.components);
             this.gridEntryDataGridView = new System.Windows.Forms.DataGridView();
             this.dataGridViewImageButtonBoxColumn1 = new LibationWinForms.LiberateDataGridViewImageButtonColumn();
             this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn();
@@ -222,7 +222,7 @@
 
 		#endregion
 
-		private System.Windows.Forms.BindingSource gridEntryBindingSource;
+		private LibationWinForms.SyncBindingSource gridEntryBindingSource;
 		private System.Windows.Forms.DataGridView gridEntryDataGridView;
         private LiberateDataGridViewImageButtonColumn dataGridViewImageButtonBoxColumn1;
         private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1;

LibationWinForms/Program.cs

@@ -24,36 +24,54 @@ namespace LibationWinForms
 		[STAThread]
 		static void Main()
 		{
-			//// Uncomment to see Console. Must be called before anything writes to Console.
-			//// Only use while debugging. Acts erratically in the wild
-			//AllocConsole();
+			try
+			{
+				//// Uncomment to see Console. Must be called before anything writes to Console.
+				//// Only use while debugging. Acts erratically in the wild
+				//AllocConsole();
 
-			Application.SetHighDpiMode(HighDpiMode.SystemAware);
-			Application.EnableVisualStyles();
-			Application.SetCompatibleTextRenderingDefault(false);
+				Application.SetHighDpiMode(HighDpiMode.SystemAware);
+				Application.EnableVisualStyles();
+				Application.SetCompatibleTextRenderingDefault(false);
 
-			//***********************************************//
-			//                                               //
-			//   do not use Configuration before this line   //
-			//                                               //
-			//***********************************************//
-			// Migrations which must occur before configuration is loaded for the first time. Usually ones which alter the Configuration
-			var config = AppScaffolding.LibationScaffolding.RunPreConfigMigrations();
+				//***********************************************//
+				//                                               //
+				//   do not use Configuration before this line   //
+				//                                               //
+				//***********************************************//
+				// Migrations which must occur before configuration is loaded for the first time. Usually ones which alter the Configuration
+				var config = AppScaffolding.LibationScaffolding.RunPreConfigMigrations();
 
-			RunInstaller(config);
+				RunInstaller(config);
 
-			// most migrations go in here
-			AppScaffolding.LibationScaffolding.RunPostConfigMigrations();
+				// most migrations go in here
+				AppScaffolding.LibationScaffolding.RunPostConfigMigrations();
 
-			// migrations which require Forms or are long-running
-			RunWindowsOnlyMigrations(config);
+				// migrations which require Forms or are long-running
+				RunWindowsOnlyMigrations(config);
 
-			MessageBoxVerboseLoggingWarning.ShowIfTrue();
+				MessageBoxVerboseLoggingWarning.ShowIfTrue();
 
 #if !DEBUG
 			checkForUpdate();
 #endif
 
+			}
+			catch (Exception ex)
+			{
+				var title = "Fatal error, pre-logging";
+				var body = "An unrecoverable error occurred. Since this error happened before logging could be initialized, this error can not be written to the log file.";
+				try
+				{
+					MessageBoxAlertAdmin.Show(body, title, ex);
+				}
+				catch
+				{
+					MessageBox.Show($"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+				return;
+			}
+
 			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding();
 
 			Application.Run(new Form1());
@@ -183,7 +201,8 @@ namespace LibationWinForms
 					authorize.DeregisterAsync(identity.ExistingAccessToken, identity.Cookies.ToKeyValuePair()).GetAwaiter().GetResult();
 					identity.Invalidate();
 
-					var api = AudibleApiActions.GetApiAsync(new LibationWinForms.Login.WinformResponder(account), account).GetAwaiter().GetResult();
+					// re-registers device
+					ApiExtended.CreateAsync(account, new Login.WinformLoginChoiceEager(account)).GetAwaiter().GetResult();
 				}
                 catch
                 {
@@ -299,14 +318,14 @@ namespace LibationWinForms
 			if (result != DialogResult.Yes)
 				return;
 
-			using var fileSelector = new SaveFileDialog { FileName = zipName, Filter = "Zip Files (*.zip)|*.zip|All files (*.*)|*.*" };
-			if (fileSelector.ShowDialog() != DialogResult.OK)
-				return;
-			var selectedPath = fileSelector.FileName;
-
 			try
 			{
-				LibationWinForms.BookLiberation.ProcessorAutomationController.DownloadFile(zipUrl, selectedPath, true);
+				using var fileSelector = new SaveFileDialog { FileName = zipName, Filter = "Zip Files (*.zip)|*.zip|All files (*.*)|*.*" };
+				if (fileSelector.ShowDialog() != DialogResult.OK)
+					return;
+				var selectedPath = fileSelector.FileName;
+
+				BookLiberation.ProcessorAutomationController.DownloadFile(zipUrl, selectedPath, true);
 			}
 			catch (Exception ex)
 			{

LibationWinForms/SyncBindingSource.cs

@@ -0,0 +1,28 @@
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Windows.Forms;
+
+// https://stackoverflow.com/a/32886415
+namespace LibationWinForms
+{
+    public class SyncBindingSource : BindingSource
+    {
+        private SynchronizationContext syncContext { get; }
+
+        public SyncBindingSource() : base()
+            => syncContext = SynchronizationContext.Current;
+        public SyncBindingSource(IContainer container) : base(container)
+            => syncContext = SynchronizationContext.Current;
+        public SyncBindingSource(object dataSource, string dataMember) : base(dataSource, dataMember)
+            => syncContext = SynchronizationContext.Current;
+
+        protected override void OnListChanged(ListChangedEventArgs e)
+        {
+            if (syncContext != null)
+                syncContext.Send(_ => base.OnListChanged(e), null);
+            else
+                base.OnListChanged(e);
+        }
+    }
+}