Random Bugs

.github/DISCUSSION_TEMPLATE/ideas.yml

@@ -0,0 +1,69 @@
+title: "[Kavita] Idea Submission"
+labels: ["Idea Submission"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## 🌟 Idea Submission for Kavita 🌟
+
+        This is a template for submitting your ideas to enhance Kavita. Please fill out the details below, and let's make Kavita even better together!
+
+  - type: textarea
+    id: idea-description
+    attributes:
+      label: Idea Description
+      description: "Describe your idea in detail."
+      value: |
+        [Include a brief overview of your idea]
+
+  - type: markdown
+    attributes:
+      value: |
+        **Why I Think This Is Important:**
+
+        [Provide context on why you believe this idea is valuable or necessary for Kavita users]
+
+  - type: markdown
+    attributes:
+      value: |
+        **How You Can Contribute:**
+
+        1. **Upvote if You Agree:**
+           - If you resonate with my idea, please upvote it! This helps us gauge community interest.
+
+        2. **Leave Your Thoughts:**
+           - Feel free to leave comments with your opinions, suggestions, or even constructive critiques.
+
+        Let's work together to shape the future of Kavita! 🌟
+
+  - type: input
+    id: duration-of-use
+    attributes:
+      label: Duration of Using Kavita
+      description: "How long have you been using Kavita?"
+    validations:
+      required: true
+
+  - type: dropdown
+    id: idea-category
+    attributes:
+      label: Idea Category
+      options:
+        - Feature Enhancement
+        - User Experience
+        - Performance Improvement
+      description: "Select the category that best fits your idea."
+    validations:
+      required: true
+
+  - type: checkboxes
+    attributes:
+      label: Agreement
+      options:
+        - label: "I agree that this is solely for submitting ideas, and I will search for existing ideas before posting."
+          required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        ### Thank you for contributing to Kavita's future! 🚀

API/Controllers/AccountController.cs

@@ -193,7 +193,7 @@
         {
             user = await _userManager.Users
                 .Include(u => u.UserPreferences)
-                .SingleOrDefaultAsync(x => x.NormalizedUserName == loginDto.Username.ToUpper());
+                .SingleOrDefaultAsync(x => x.NormalizedUserName == loginDto.Username.ToUpperInvariant());
         }
 
         _logger.LogInformation("{UserName} attempting to login from {IpAddress}", loginDto.Username, HttpContext.Connection.RemoteIpAddress?.ToString());
@@ -390,7 +390,8 @@
                 return Ok(new InviteUserResponse
                 {
                     EmailLink = string.Empty,
-                    EmailSent = false
+                    EmailSent = false,
+                    InvalidEmail = true,
                 });
             }
 
@@ -484,6 +485,7 @@
             var errors = await _accountService.ValidateUsername(dto.Username);
             if (errors.Any()) return BadRequest(await _localizationService.Translate(User.GetUserId(), "username-taken"));
             user.UserName = dto.Username;
+            await _userManager.UpdateNormalizedUserNameAsync(user);
             _unitOfWork.UserRepository.Update(user);
         }
 
@@ -689,7 +691,8 @@
                 return Ok(new InviteUserResponse
                 {
                     EmailLink = emailLink,
-                    EmailSent = false
+                    EmailSent = false,
+                    InvalidEmail = true
                 });
             }
 
@@ -974,13 +977,12 @@
 
         var token = await _userManager.GenerateEmailConfirmationTokenAsync(user);
         var emailLink = await _accountService.GenerateEmailLink(Request, token, "confirm-email", user.Email);
-        _logger.LogCritical("[Email Migration]: Email Link: {Link}", emailLink);
-        _logger.LogCritical("[Email Migration]: Token {UserName}: {Token}", user.UserName, token);
+        _logger.LogCritical("[Email Migration]: Email Link for {UserName}: {Link}", user.UserName, emailLink);
 
         if (!_emailService.IsValidEmail(user.Email))
         {
-            _logger.LogCritical("[Email Migration]: User is trying to resend an invite flow, but their email ({Email}) isn't valid. No email will be send", user.Email);
-            return Ok(await _localizationService.Translate(user.Id, "invalid-email"));
+            _logger.LogCritical("[Email Migration]: User {UserName} is trying to resend an invite flow, but their email ({Email}) isn't valid. No email will be send", user.UserName, user.Email);
+            return BadRequest(await _localizationService.Translate(user.Id, "invalid-email"));
         }
 
         if (await _accountService.CheckIfAccessible(Request))
@@ -1003,7 +1005,7 @@
             return Ok(emailLink);
         }
 
-        return Ok(await _localizationService.Translate(user.Id, "not-accessible"));
+        return BadRequest(await _localizationService.Translate(user.Id, "not-accessible"));
     }
 
     /// <summary>
@@ -1102,12 +1104,26 @@
                 baseUrl = baseUrl.Replace("//", "/");
             }
 
-            if (baseUrl.StartsWith("/"))
+            if (baseUrl.StartsWith('/'))
             {
                 baseUrl = baseUrl.Substring(1, baseUrl.Length - 1);
             }
         }
         return Ok(origin + "/" + baseUrl + "api/opds/" + user!.ApiKey);
+    }
+
+
+    /// <summary>
+    /// Is the user's current email valid or not
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("is-email-valid")]
+    public async Task<ActionResult<bool>> IsEmailValid()
+    {
+        var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId());
+        if (user == null) return Unauthorized();
+        if (string.IsNullOrEmpty(user.Email)) return Ok(false);
 
+        return Ok(_emailService.IsValidEmail(user.Email));
     }
 }

API/DTOs/Account/InviteUserResponse.cs

@@ -10,4 +10,8 @@ public class InviteUserResponse
     /// Was an email sent (ie is this server accessible)
     /// </summary>
     public bool EmailSent { get; set; } = default!;
+    /// <summary>
+    /// When a user has an invalid email and is attempting to perform a flow.
+    /// </summary>
+    public bool InvalidEmail { get; set; } = false;
 }

API/Helpers/Builders/VolumeBuilder.cs

@@ -15,6 +15,7 @@ public VolumeBuilder(string volumeNumber)
         _volume = new Volume()
         {
             Name = volumeNumber,
+            // TODO / BUG: Try to use float based Number which will allow Epub's with < 1 volumes to show in series detail
             Number = (int) Services.Tasks.Scanner.Parser.Parser.MinNumberFromRange(volumeNumber),
             Chapters = new List<Chapter>()
         };

API/Logging/LogLevelOptions.cs

@@ -1,4 +1,5 @@
-using Serilog;
+using System.Text.RegularExpressions;
+using Serilog;
 using Serilog.Core;
 using Serilog.Events;
 using Serilog.Formatting.Display;
@@ -49,6 +50,7 @@ public static LoggerConfiguration CreateConfig(LoggerConfiguration configuration
             .MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Error)
             .Enrich.FromLogContext()
             .Enrich.WithThreadId()
+            .Enrich.With(new ApiKeyEnricher())
             .WriteTo.Console(new MessageTemplateTextFormatter(outputTemplate))
             .WriteTo.File(LogFile,
                 shared: true,
@@ -74,6 +76,7 @@ private static bool ShouldIncludeLogStatement(LogEvent e)
             if (e.Properties.ContainsKey("Path") && e.Properties["Path"].ToString().Replace("\"", string.Empty) == "/api/health") return false;
             if (e.Properties.ContainsKey("Path") && e.Properties["Path"].ToString().Replace("\"", string.Empty) == "/hubs/messages") return false;
         }
+
         return true;
     }
 
@@ -115,3 +118,24 @@ public static void SwitchLogLevel(string level)
     }
 
 }
+
+public partial class ApiKeyEnricher : ILogEventEnricher
+{
+    public void Enrich(LogEvent e, ILogEventPropertyFactory propertyFactory)
+    {
+        var isRequestLoggingMiddleware = e.Properties.ContainsKey("SourceContext") &&
+                                         e.Properties["SourceContext"].ToString().Replace("\"", string.Empty) ==
+                                         "Serilog.AspNetCore.RequestLoggingMiddleware";
+        if (!isRequestLoggingMiddleware) return;
+        if (!e.Properties.ContainsKey("RequestPath") ||
+            !e.Properties["RequestPath"].ToString().Contains("apiKey=")) return;
+
+        // Check if the log message contains "apiKey=" and censor it
+        var censoredMessage = MyRegex().Replace(e.Properties["RequestPath"].ToString(), "apiKey=******REDACTED******");
+        var enrichedProperty = propertyFactory.CreateProperty("RequestPath", censoredMessage);
+        e.AddOrUpdateProperty(enrichedProperty);
+    }
+
+    [GeneratedRegex(@"\bapiKey=[^&\s]+\b")]
+    private static partial Regex MyRegex();
+}

API/Services/AccountService.cs

@@ -73,7 +73,7 @@ public async Task<string> GenerateEmailLink(HttpRequest request, string token, s
             basePart = serverSettings.HostName;
             if (!serverSettings.BaseUrl.Equals(Configuration.DefaultBaseUrl))
             {
-                var removeCount = serverSettings.BaseUrl.EndsWith("/") ? 2 : 1;
+                var removeCount = serverSettings.BaseUrl.EndsWith('/') ? 1 : 0;
                 basePart += serverSettings.BaseUrl.Substring(0, serverSettings.BaseUrl.Length - removeCount);
             }
         }

API/Services/BookService.cs

@@ -546,7 +546,6 @@ await _mediaErrorService.ReportMediaIssueAsync(book.FilePath, MediaErrorProducer
                             ExtractSortTitle(metadataItem, epubBook, info);
                         }
 
-
                         break;
                 }
             }

API/Services/Tasks/Scanner/ProcessSeries.cs

@@ -510,7 +510,6 @@ public void UpdateSeriesMetadata(Series series, Library library)
 
     public void UpdateVolumes(Series series, IList<ParserInfo> parsedInfos, bool forceUpdate = false)
     {
-        var startingVolumeCount = series.Volumes.Count;
         // Add new volumes and update chapters per volume
         var distinctVolumes = parsedInfos.DistinctVolumes();
         _logger.LogDebug("[ScannerService] Updating {DistinctVolumes} volumes on {SeriesName}", distinctVolumes.Count, series.Name);
@@ -582,10 +581,6 @@ public void UpdateVolumes(Series series, IList<ParserInfo> parsedInfos, bool for
 
             series.Volumes = nonDeletedVolumes;
         }
-
-        // DO I need this anymore?
-        _logger.LogDebug("[ScannerService] Updated {SeriesName} volumes from count of {StartingVolumeCount} to {VolumeCount}",
-            series.Name, startingVolumeCount, series.Volumes.Count);
     }
 
     public void UpdateChapters(Series series, Volume volume, IList<ParserInfo> parsedInfos, bool forceUpdate = false)

API/Startup.cs

@@ -261,7 +261,6 @@ public void Configure(IApplicationBuilder app, IBackgroundJobClient backgroundJo
 
         app.UseMiddleware<ExceptionMiddleware>();
         app.UseMiddleware<SecurityEventMiddleware>();
-        app.UseMiddleware<CustomAuthHeaderMiddleware>();
 
 
         if (env.IsDevelopment())

UI/Web/src/app/_models/auth/invite-user-response.ts

@@ -7,4 +7,8 @@ export interface InviteUserResponse {
      * If an email was sent to the invited user
      */
     emailSent: boolean;
-}
+   /**
+   * When a user has an invalid email and is attempting to perform a flow.
+   */
+   invalidEmail: boolean;
+}