Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

allow search client exact with quotes

Browse Source
This commit is contained in:
RaidMax 2022-02-23 09:32:59 -06:00
parent 0d88b6293f
commit 18f3c59b9b
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SharedLibraryCore/Services/ClientService.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Data.Abstractions; using Data.Abstractions;
@ -839,13 +840,14 @@ namespace SharedLibraryCore.Services
} }
catch catch
{ {
// ignored
} }
var ipAddress = trimmedIdentifier.ConvertToIP(); var ipAddress = trimmedIdentifier.ConvertToIP();
var iqLinkIds = context.Aliases.Where(_alias => _alias.Active); var iqLinkIds = context.Aliases.Where(_alias => _alias.Active);
// we want to query for the IP ADdress // we want to query for the IP Address
if (ipAddress != null) if (ipAddress != null)
{ {
iqLinkIds = iqLinkIds.Where(_alias => _alias.IPAddress == ipAddress); iqLinkIds = iqLinkIds.Where(_alias => _alias.IPAddress == ipAddress);
@ -866,12 +868,22 @@ namespace SharedLibraryCore.Services
var iqClients = context.Clients var iqClients = context.Clients
.Where(_client => _client.Active); .Where(_client => _client.Active);
var match = Regex.Match(trimmedIdentifier ?? "", "\"(.+)\"");
if (match.Success)
{
iqClients = iqClients.Where(client =>
client.CurrentAlias.SearchableName.ToLower().Equals(match.Groups[1].ToString().ToLower()));
}
else
{
iqClients = iqClients.Where(_client => networkId == _client.NetworkId || iqClients = iqClients.Where(_client => networkId == _client.NetworkId ||
linkIds.Contains(_client.AliasLinkId) linkIds.Contains(_client.AliasLinkId)
|| !_appConfig.EnableImplicitAccountLinking && || !_appConfig.EnableImplicitAccountLinking &&
_client.CurrentAlias.IPAddress != null && _client.CurrentAlias.IPAddress != null &&
_client.CurrentAlias.IPAddress == ipAddress); _client.CurrentAlias.IPAddress == ipAddress);
}
// we want to project our results // we want to project our results
var iqClientProjection = iqClients.OrderByDescending(_client => _client.LastConnection) var iqClientProjection = iqClients.OrderByDescending(_client => _client.LastConnection)