mirror of
https://github.com/Govor-team/Govor.git
synced 2026-07-21 19:54:55 +00:00
Refactor: migrate Core -> Domain and reorganize projects
Large refactor that renames/moves core types into a new Govor.Domain surface and reorganizes the Application layer. Models, configurations, migrations and many files moved from Govor.Core/Govor.Data to Govor.Domain; numerous Application services, interfaces and implementations were relocated or added (authentication, friends, messages, medias, push notifications, user sessions, storage, synching, private chats, etc.). Tests updated to use Govor.Domain namespaces and adjusted project references (removed Govor.Data reference from API tests). Also updated API, Hub and mapping code and project files to reflect the new structure and naming. This is primarily a codebase-wide namespace and module reorganization to establish a Domain project and restructure application services.
This commit is contained in:
@@ -1,13 +1,15 @@
|
||||
using System.Text.RegularExpressions;
|
||||
using Govor.Application.Exceptions.AuthService;
|
||||
using Govor.Application.Interfaces.Authentication;
|
||||
using Govor.Core.Infrastructure.Validators;
|
||||
using Govor.Application.Authentication.Exceptions;
|
||||
using Govor.Domain.Common.Constants;
|
||||
using Govor.Domain.Common;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace Govor.Application.Infrastructure.Validators;
|
||||
|
||||
public class UsernameValidator : IUsernameValidator
|
||||
{
|
||||
private const string ErrorCode = nameof(InvalidUsernameException);
|
||||
|
||||
private readonly Regex _usernameRegex = new(@"^[А-Яа-яЁё]+[А-Яа-яЁё0-9]*$", RegexOptions.Compiled);
|
||||
|
||||
private readonly HashSet<string> _blockedExact;
|
||||
@@ -37,43 +39,61 @@ public class UsernameValidator : IUsernameValidator
|
||||
?? throw new InvalidOperationException("Reserved not set");
|
||||
}
|
||||
|
||||
public void Validate(string username)
|
||||
public Result Validate(string username)
|
||||
{
|
||||
if(username.Length < UserValidator.MIN_LENGHT_OF_NAME || username.Length > UserValidator.MAX_LENGHT_OF_NAME)
|
||||
throw new InvalidUsernameException($"Username must be between {UserValidator.MIN_LENGHT_OF_NAME} and {UserValidator.MAX_LENGHT_OF_NAME} characters.");
|
||||
|
||||
if (!_usernameRegex.IsMatch(username))
|
||||
throw new InvalidUsernameException("The username must be in Cyrillic and start with a letter.");
|
||||
if (username.Length < UserConstants.MIN_LENGHT_OF_NAME || username.Length > UserConstants.MAX_LENGHT_OF_NAME)
|
||||
{
|
||||
return new Error(
|
||||
ErrorCode,
|
||||
$"Username must be between {UserConstants.MIN_LENGHT_OF_NAME} and {UserConstants.MAX_LENGHT_OF_NAME} characters.");
|
||||
}
|
||||
|
||||
if (!_usernameRegex.IsMatch(username))
|
||||
{
|
||||
return new Error(
|
||||
ErrorCode,
|
||||
"The username must be in Cyrillic and start with a letter.");
|
||||
}
|
||||
|
||||
if (Regex.IsMatch(username, @"(.)\1{4,}"))
|
||||
throw new InvalidUsernameException("Too many repeating characters.");
|
||||
{
|
||||
return new Error(
|
||||
ErrorCode,
|
||||
"Too many repeating characters.");
|
||||
}
|
||||
|
||||
var normalized = Normalize(username);
|
||||
|
||||
|
||||
if (_reserved.Contains(normalized))
|
||||
throw new InvalidUsernameException("This username is reserved.");
|
||||
|
||||
{
|
||||
return new Error(
|
||||
ErrorCode,
|
||||
"This username is reserved.");
|
||||
}
|
||||
|
||||
if (_blockedExact.Contains(normalized))
|
||||
throw new InvalidUsernameException("This username is not allowed.");
|
||||
|
||||
{
|
||||
return new Error(
|
||||
ErrorCode,
|
||||
"This username is not allowed.");
|
||||
}
|
||||
|
||||
foreach (var banned in _blockedContains)
|
||||
{
|
||||
if (normalized.Contains(banned))
|
||||
throw new InvalidUsernameException("Username contains prohibited content.");
|
||||
{
|
||||
return new Error(
|
||||
ErrorCode,
|
||||
"Username contains prohibited content.");
|
||||
}
|
||||
}
|
||||
|
||||
return Result.Success();
|
||||
}
|
||||
|
||||
public bool TryValidate(string username)
|
||||
{
|
||||
try
|
||||
{
|
||||
Validate(username);
|
||||
return true;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return Validate(username).IsSuccess;
|
||||
}
|
||||
|
||||
private static string Normalize(string username)
|
||||
@@ -87,4 +107,4 @@ public class UsernameValidator : IUsernameValidator
|
||||
.Replace("6", "б")
|
||||
.Replace("8", "в");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user