refactored

docker-compose.yml

@@ -23,6 +23,19 @@ services:
  ports:
  - 5432:5432
 
+ idp:
+ image: quay.io/keycloak/keycloak:latest
+ container_name: identity
+ command: start-dev --import-realm
+ environment:
+ - KEYCLOAK_ADMIN=admin
+ - KEYCLOAK_ADMIN_PASSWORD=admin
+ volumes:
+ - ./.containers/identity:/opt/keycloak/data
+ - ./.files/uzbekcuisines-realm-export.json:/opt/keycloak/data/import/realm.json
+ ports:
+ - 18080:8080
+
  seq:
  image: datalust/seq:latest
  container_name: seq

src/Application/Users/GetLoggedInUser/GetLoggedInUserQueryHandler.cs

@@ -0,0 +1,39 @@
+using System.Data.Common;
+using Application.Abstractions.Authentication;
+using Application.Abstractions.Data;
+using Application.Abstractions.Messaging;
+using Dapper;
+using SharedKernel;
+
+namespace Application.Users.GetLoggedInUser;
+internal sealed class GetLoggedInUserQueryHandler(
+ IDbConnectionFactory dbConnectionFactory,
+ IUserContext userContext)
+ : IQueryHandler<GetLoggedInUserQuery, UserResponse>
+{
+ public async Task<Result<UserResponse>> Handle(
+ GetLoggedInUserQuery request,
+ CancellationToken cancellationToken)
+ {
+ await using DbConnection connection = await dbConnectionFactory.OpenConnectionAsync();
+
+ const string sql = """
+ SELECT
+ id AS Id,
+ first_name AS FirstName,
+ last_name AS LastName,
+ email AS Email
+ FROM users
+ WHERE identity_id = @IdentityId
+ """;
+
+ UserResponse user = await connection.QuerySingleAsync<UserResponse>(
+ sql,
+ new
+ {
+ userContext.IdentityId
+ });
+
+ return user;
+ }
+}

src/Application/Users/RegisterUser/RegisterUserCommandHandler.cs

@@ -6,40 +6,27 @@
 
 namespace Application.Users.RegisterUser;
 internal sealed class RegisterUserCommandHandler(
- IAuthenticationService authenticationService,
+ //IAuthenticationService authenticationService,
  IUserRepository userRepository,
  IUnitOfWork unitOfWork) : ICommandHandler<RegisterUserCommand, Guid>
 {
  public async Task<Result<Guid>> Handle(
  RegisterUserCommand request,
  CancellationToken cancellationToken)
  {
- Result<Email> emailResult = Email.Create(request.Email);
+ var user = User.Create(
+ new FirstName(request.FirstName),
+ new LastName(request.LastName),
+ new Email(request.Email));
 
- if (emailResult.IsFailure)
- {
- return Result.Failure<Guid>(emailResult.Error);
- }
+ //string identityId = await authenticationService.RegisterAsync(
+ // user,
+ // request.Password,
+ // cancellationToken);
 
- Email email = emailResult.Value;
- if (!await userRepository.IsEmailUniqueAsync(email))
- {
- return Result.Failure<Guid>(UserErrors.EmailNotUnique);
- }
+ //user.SetIdentityId(identityId);
 
- var firstName = new FirstName(request.FirstName);
- var lastName = new LastName(request.LastName);
-
- var user = User.Create(email, firstName, lastName);
-
- string identityId = await authenticationService.RegisterAsync(
- user,
- request.Password,
- cancellationToken);
-
- user.SetIdentityId(identityId);
-
- userRepository.Insert(user);
+ userRepository.Add(user);
 
  await unitOfWork.SaveChangesAsync(cancellationToken);
 

src/Application/Users/RegisterUser/RegisterUserCommandValidator.cs

@@ -5,15 +5,11 @@ internal sealed class RegisterUserCommandValidator : AbstractValidator<RegisterU
 {
  public RegisterUserCommandValidator()
  {
- RuleFor(c => c.FirstName)
- .NotEmpty().WithErrorCode(UserErrorCodes.CreateUser.MissingFirstName);
+ RuleFor(c => c.FirstName).NotEmpty();
 
- RuleFor(c => c.LastName)
- .NotEmpty().WithErrorCode(UserErrorCodes.CreateUser.MissingLastName);
+ RuleFor(c => c.LastName).NotEmpty();
 
- RuleFor(c => c.Email)
- .NotEmpty().WithErrorCode(UserErrorCodes.CreateUser.MissingEmail)
- .EmailAddress().WithErrorCode(UserErrorCodes.CreateUser.InvalidEmail);
+ RuleFor(c => c.Email).EmailAddress();
 
  RuleFor(c => c.Password).NotEmpty().MinimumLength(5);
  }

src/Application/Users/UserErrorCodes.cs

@@ -6,7 +6,5 @@ public static class CreateUser
  {
  public const string MissingFirstName = nameof(MissingFirstName);
  public const string MissingLastName = nameof(MissingLastName);
- public const string MissingEmail = nameof(MissingEmail);
- public const string InvalidEmail = nameof(InvalidEmail);
  }
 }

src/Domain/Users/Email.cs

@@ -1,25 +1,2 @@
-using SharedKernel;
-
-namespace Domain.Users;
-
-public sealed record Email
-{
- private Email(string value) => Value = value;
-
- public string Value { get; }
-
- public static Result<Email> Create(string? email)
- {
- if (string.IsNullOrEmpty(email))
- {
- return Result.Failure<Email>(EmailErrors.Empty);
- }
-
- //if (email.Split('@').Length != 2)
- //{
- // return Result.Failure<Email>(EmailErrors.InvalidFormat);
- //}
-
- return new Email(email);
- }
-}
+namespace Domain.Users;
+public sealed record Email(string Value);

src/Domain/Users/FirstName.cs

@@ -1,15 +1,4 @@
-using SharedKernel;
+namespace Domain.Users;
 
-namespace Domain.Users;
+public sealed record FirstName(string Value);
 
-public sealed record FirstName
-{
- public FirstName(string? value)
- {
- Ensure.NotNullOrEmpty(value);
-
- Value = value;
- }
-
- public string Value { get; }
-}