- better logging for LoginFailedException

- upgrade nuget pkg.s

ApplicationServices/ApplicationServices.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="15.0.5" />
+    <PackageReference Include="CsvHelper" Version="15.0.6" />
     <PackageReference Include="NPOI" Version="2.5.1" />
   </ItemGroup>
 

ApplicationServices/UNTESTED/LibraryCommands.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using AudibleApi;
 using DataLayer;
+using Dinah.Core;
 using DtoImporterService;
 using InternalUtilities;
 using Serilog;
@@ -32,6 +33,24 @@ namespace ApplicationServices
 
 				return (totalCount, newCount);
 			}
+			catch (AudibleApi.Authentication.LoginFailedException lfEx)
+			{
+				lfEx.MoveResponseBodyFile(FileManager.Configuration.Instance.LibationFiles);
+
+				// nuget Serilog.Exceptions would automatically log custom properties
+				//   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
+				//   https://github.com/RehanSaeed/Serilog.Exceptions
+				// work-around: use 3rd param. don't just put exception object in 3rd param -- info overload: stack trace, etc
+				Log.Logger.Error(lfEx, "Error importing library. Login failed. {@DebugInfo}", new {
+					lfEx.RequestInputFields,
+					lfEx.RequestUrl,
+					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
+					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
+					lfEx.ResponseInputFields,
+					lfEx.ResponseBodyFilePath
+				});
+				throw;
+			}
 			catch (Exception ex)
 			{
 				Log.Logger.Error(ex, "Error importing library");
@@ -61,13 +80,13 @@ namespace ApplicationServices
 
 		private static async Task<List<ImportItem>> scanAccountAsync(Api api, Account account)
 		{
-			Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
+			ArgumentValidator.EnsureNotNull(account, nameof(account));
 
 			var localeName = account.Locale?.Name;
 			Log.Logger.Information("ImportLibraryAsync. {@DebugInfo}", new
 			{
-				account.AccountName,
-				account.AccountId,
+				AccountName = account.AccountName.ToMask(),
+				AccountId = account.AccountId.ToMask(),
 				LocaleName = localeName,
 			});
 

FileLiberator/UNTESTED/IProcessableExt.cs

@@ -46,7 +46,7 @@ namespace FileLiberator
 
         private static async Task<StatusHandler> processBookAsync(IProcessable processable, LibraryBook libraryBook)
         {
-            Serilog.Log.Information("Begin " + nameof(processBookAsync) + " {@DebugInfo}", new
+            Serilog.Log.Logger.Information("Begin " + nameof(processBookAsync) + " {@DebugInfo}", new
             {
                 libraryBook.Book.Title,
                 libraryBook.Book.AudibleProductId,

InternalUtilities/UNTESTED/AudibleApiActions.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using AudibleApi;
 using AudibleApiDTOs;
+using Dinah.Core;
 using Polly;
 using Polly.Retry;
 
@@ -16,7 +17,7 @@ namespace InternalUtilities
 		{
 			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
 			{
-				username,
+				Username = username.ToMask(),
 				LocaleName = localeName,
 			});
 			return EzApiCreator.GetApiAsync(
@@ -31,7 +32,7 @@ namespace InternalUtilities
 		{
 			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
 			{
-				AccountId = account?.AccountId ?? "[empty]",
+				AccountId = account?.AccountId.ToMask() ?? "[empty]",
 				LocaleName = account?.Locale?.Name
 			});
 			return EzApiCreator.GetApiAsync(

LibationLauncher/LibationLauncher.csproj

@@ -13,7 +13,7 @@
     <!-- <PublishSingleFile>true</PublishSingleFile> -->
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 
-    <Version>4.0.8.1</Version>
+    <Version>4.0.12.4</Version>
   </PropertyGroup>
 
   <ItemGroup>

LibationLauncher/UNTESTED/Program.cs

@@ -323,8 +323,8 @@ namespace LibationLauncher
 				.AddJsonFile(config.SettingsFilePath)
 				.Build();
 			Log.Logger = new LoggerConfiguration()
-			  .ReadFrom.Configuration(configuration)
-			  .CreateLogger();
+				.ReadFrom.Configuration(configuration)
+				.CreateLogger();
 
 			//// MANUAL HARD CODED
 			//Log.Logger = new LoggerConfiguration()

LibationWinForms/UNTESTED/BookLiberation/ProcessorAutomationController.cs

@@ -10,7 +10,7 @@ namespace LibationWinForms.BookLiberation
     {
         public static async Task BackupSingleBookAsync(string productId, EventHandler<LibraryBook> completedAction = null)
         {
-            Serilog.Log.Information("Begin " + nameof(BackupSingleBookAsync) + " {@DebugInfo}", new { productId });
+            Serilog.Log.Logger.Information("Begin " + nameof(BackupSingleBookAsync) + " {@DebugInfo}", new { productId });
 
             var backupBook = getWiredUpBackupBook(completedAction);
 
@@ -22,7 +22,7 @@ namespace LibationWinForms.BookLiberation
 
         public static async Task BackupAllBooksAsync(EventHandler<LibraryBook> completedAction = null)
         {
-            Serilog.Log.Information("Begin " + nameof(BackupAllBooksAsync));
+            Serilog.Log.Logger.Information("Begin " + nameof(BackupAllBooksAsync));
 
             var backupBook = getWiredUpBackupBook(completedAction);
 
@@ -100,7 +100,7 @@ namespace LibationWinForms.BookLiberation
 
         public static async Task BackupAllPdfsAsync(EventHandler<LibraryBook> completedAction = null)
         {
-            Serilog.Log.Information("Begin " + nameof(BackupAllPdfsAsync));
+            Serilog.Log.Logger.Information("Begin " + nameof(BackupAllPdfsAsync));
 
             var downloadPdf = getWiredUpDownloadPdf(completedAction);
 

LibationWinForms/UNTESTED/Form1.cs

@@ -335,7 +335,7 @@ namespace LibationWinForms
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, "Error attempting to export library");
+                Serilog.Log.Logger.Error(ex, "Error attempting to export library");
                 MessageBox.Show("Error attempting to export your library. Error message:\r\n\r\n" + ex.Message, "Error exporting", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }

_Tests/InternalUtilities.Tests/InternalUtilities.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
     <PackageReference Include="coverlet.collector" Version="1.3.0">