Merge branch 'main' into mod-panel

This commit is contained in:
jvyden 2022-06-17 19:55:15 -04:00
commit f40c6ce894
No known key found for this signature in database
GPG key ID: 18BCF2BE0262B278
27 changed files with 150 additions and 151 deletions

View file

@ -82,7 +82,7 @@ public class LoginController : ControllerBase
if (ServerConfiguration.Instance.Authentication.UseExternalAuth)
{
if (this.database.UserApprovedIpAddresses.Where(a => a.UserId == user.UserId).Select(a => a.IpAddress).Contains(ipAddress))
if (user.ApprovedIPAddress == ipAddress)
{
token.Approved = true;
}