diff --git a/ApplicationServices/UNTESTED/LibraryCommands.cs b/ApplicationServices/UNTESTED/LibraryCommands.cs index 75536a9f..06417e82 100644 --- a/ApplicationServices/UNTESTED/LibraryCommands.cs +++ b/ApplicationServices/UNTESTED/LibraryCommands.cs @@ -42,7 +42,6 @@ namespace ApplicationServices // 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, diff --git a/LibationLauncher/LibationLauncher.csproj b/LibationLauncher/LibationLauncher.csproj index 982c18f3..530b7d6a 100644 --- a/LibationLauncher/LibationLauncher.csproj +++ b/LibationLauncher/LibationLauncher.csproj @@ -13,7 +13,7 @@ win-x64 - 4.0.12.4 + 4.0.13.4 diff --git a/LibationWinForms/LibationWinForms.csproj b/LibationWinForms/LibationWinForms.csproj index 9ab8af74..494c66db 100644 --- a/LibationWinForms/LibationWinForms.csproj +++ b/LibationWinForms/LibationWinForms.csproj @@ -27,6 +27,10 @@ LibationFilesDialog.cs + + + ApprovalNeededDialog.cs + ScanAccountsDialog.cs diff --git a/LibationWinForms/UNTESTED/Dialogs/Login/ApprovalNeededDialog.Designer.cs b/LibationWinForms/UNTESTED/Dialogs/Login/ApprovalNeededDialog.Designer.cs new file mode 100644 index 00000000..ead126d9 --- /dev/null +++ b/LibationWinForms/UNTESTED/Dialogs/Login/ApprovalNeededDialog.Designer.cs @@ -0,0 +1,78 @@ +namespace LibationWinForms.Dialogs.Login +{ + partial class ApprovalNeededDialog + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.approvedBtn = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // approvedBtn + // + this.approvedBtn.Location = new System.Drawing.Point(15, 25); + this.approvedBtn.Name = "approvedBtn"; + this.approvedBtn.Size = new System.Drawing.Size(79, 23); + this.approvedBtn.TabIndex = 1; + this.approvedBtn.Text = "Approved"; + this.approvedBtn.UseVisualStyleBackColor = true; + this.approvedBtn.Click += new System.EventHandler(this.approvedBtn_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(104, 13); + this.label1.TabIndex = 0; + this.label1.Text = "Click after approving"; + // + // ApprovalNeededDialog + // + this.AcceptButton = this.approvedBtn; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(149, 60); + this.Controls.Add(this.label1); + this.Controls.Add(this.approvedBtn); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "ApprovalNeededDialog"; + this.ShowIcon = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Approval Needed"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private System.Windows.Forms.Button approvedBtn; + private System.Windows.Forms.Label label1; + } +} \ No newline at end of file diff --git a/LibationWinForms/UNTESTED/Dialogs/Login/ApprovalNeededDialog.cs b/LibationWinForms/UNTESTED/Dialogs/Login/ApprovalNeededDialog.cs new file mode 100644 index 00000000..d555d077 --- /dev/null +++ b/LibationWinForms/UNTESTED/Dialogs/Login/ApprovalNeededDialog.cs @@ -0,0 +1,18 @@ +using System; +using System.Windows.Forms; + +namespace LibationWinForms.Dialogs.Login +{ + public partial class ApprovalNeededDialog : Form + { + public ApprovalNeededDialog() + { + InitializeComponent(); + } + + private void approvedBtn_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.OK; + } + } +} diff --git a/LibationWinForms/UNTESTED/Dialogs/Login/WinformResponder.cs b/LibationWinForms/UNTESTED/Dialogs/Login/WinformResponder.cs index 661bcb88..d443f9d7 100644 --- a/LibationWinForms/UNTESTED/Dialogs/Login/WinformResponder.cs +++ b/LibationWinForms/UNTESTED/Dialogs/Login/WinformResponder.cs @@ -37,5 +37,11 @@ namespace LibationWinForms.Login return (dialog.Email, dialog.Password); return (null, null); } + + public void ShowApprovalNeeded() + { + using var dialog = new ApprovalNeededDialog(); + dialog.ShowDialog(); + } } } \ No newline at end of file diff --git a/WinFormsDesigner/Dialogs/Login/ApprovalNeededDialog.Designer.cs b/WinFormsDesigner/Dialogs/Login/ApprovalNeededDialog.Designer.cs new file mode 100644 index 00000000..6b26968c --- /dev/null +++ b/WinFormsDesigner/Dialogs/Login/ApprovalNeededDialog.Designer.cs @@ -0,0 +1,77 @@ +namespace WinFormsDesigner.Dialogs.Login +{ + partial class ApprovalNeededDialog + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.approvedBtn = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // approvedBtn + // + this.approvedBtn.Location = new System.Drawing.Point(15, 25); + this.approvedBtn.Name = "approvedBtn"; + this.approvedBtn.Size = new System.Drawing.Size(79, 23); + this.approvedBtn.TabIndex = 1; + this.approvedBtn.Text = "Approved"; + this.approvedBtn.UseVisualStyleBackColor = true; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(104, 13); + this.label1.TabIndex = 0; + this.label1.Text = "Click after approving"; + // + // ApprovalNeededDialog + // + this.AcceptButton = this.approvedBtn; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(149, 60); + this.Controls.Add(this.label1); + this.Controls.Add(this.approvedBtn); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "ApprovalNeededDialog"; + this.ShowIcon = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Approval Needed"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private System.Windows.Forms.Button approvedBtn; + private System.Windows.Forms.Label label1; + } +} \ No newline at end of file diff --git a/WinFormsDesigner/Dialogs/Login/ApprovalNeededDialog.cs b/WinFormsDesigner/Dialogs/Login/ApprovalNeededDialog.cs new file mode 100644 index 00000000..be5fa309 --- /dev/null +++ b/WinFormsDesigner/Dialogs/Login/ApprovalNeededDialog.cs @@ -0,0 +1,13 @@ +using System; +using System.Windows.Forms; + +namespace WinFormsDesigner.Dialogs.Login +{ + public partial class ApprovalNeededDialog : Form + { + public ApprovalNeededDialog() + { + InitializeComponent(); + } + } +} diff --git a/WinFormsDesigner/Dialogs/Login/AudibleLoginDialog.resx b/WinFormsDesigner/Dialogs/Login/AudibleLoginDialog.resx deleted file mode 100644 index 1af7de15..00000000 --- a/WinFormsDesigner/Dialogs/Login/AudibleLoginDialog.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/WinFormsDesigner/Dialogs/Login/CaptchaDialog.resx b/WinFormsDesigner/Dialogs/Login/CaptchaDialog.resx deleted file mode 100644 index 1af7de15..00000000 --- a/WinFormsDesigner/Dialogs/Login/CaptchaDialog.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/WinFormsDesigner/Dialogs/Login/_2faCodeDialog.cs b/WinFormsDesigner/Dialogs/Login/_2faCodeDialog.cs index 75fcaa73..5dd1a13b 100644 --- a/WinFormsDesigner/Dialogs/Login/_2faCodeDialog.cs +++ b/WinFormsDesigner/Dialogs/Login/_2faCodeDialog.cs @@ -5,8 +5,6 @@ namespace WinFormsDesigner.Dialogs.Login { public partial class _2faCodeDialog : Form { - public string NewTags { get; private set; } - public _2faCodeDialog() { InitializeComponent(); diff --git a/WinFormsDesigner/Dialogs/Login/_2faCodeDialog.resx b/WinFormsDesigner/Dialogs/Login/_2faCodeDialog.resx deleted file mode 100644 index 1af7de15..00000000 --- a/WinFormsDesigner/Dialogs/Login/_2faCodeDialog.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/WinFormsDesigner/WinFormsDesigner.csproj b/WinFormsDesigner/WinFormsDesigner.csproj index 37f10612..5eb48f40 100644 --- a/WinFormsDesigner/WinFormsDesigner.csproj +++ b/WinFormsDesigner/WinFormsDesigner.csproj @@ -89,6 +89,12 @@ LibationFilesDialog.cs + + Form + + + ApprovalNeededDialog.cs + Form @@ -176,15 +182,6 @@ LibationFilesDialog.cs - - AudibleLoginDialog.cs - - - CaptchaDialog.cs - - - _2faCodeDialog.cs - ScanAccountsDialog.cs