Add users analytics events

Author: Bardin08

src/Api/Endpoints/Auth/RegisterEndpoint.cs

@@ -9,7 +9,7 @@ namespace Api.Endpoints.Auth;
 public class RegisterEndpoint(
     IAuthService authService,
     ILogger<RegisterEndpoint> logger)
-    : Endpoint<RegisterRequest, ApiResponse<UserTokenResponse>>
+    : Endpoint<RegisterRequest, ApiResponse<UserInfoResponse>>
 {
     private readonly IAuthService _authService = authService;
     private readonly ILogger<RegisterEndpoint> _logger = logger;
@@ -26,17 +26,21 @@ public override async Task HandleAsync(
     {
         try
         {
-            var tokenInfo = await _authService.RegisterUser(
+            var registrationResponse = await _authService.RegisterUser(
                 new RegisterRequestDto(req.Login, req.FullName, req.Password, req.Email), ct);
 
-            if (tokenInfo is null)
+            if (registrationResponse is null)
             {
                 await SendUnauthorizedAsync(ct);
             }
             else
             {
-                var payload = new UserTokenResponse(tokenInfo.Token, tokenInfo.ExpiresIn);
-                await SendAsync(ApiResponse<UserTokenResponse>.Success(payload), cancellation: ct);
+                var tokenInfo = new UserTokenResponse(
+                    registrationResponse.TokenInfo.Token,
+                    registrationResponse.TokenInfo.ExpiresIn);
+
+                var payload = new UserInfoResponse(registrationResponse.UserId, tokenInfo);
+                await SendAsync(ApiResponse<UserInfoResponse>.Success(payload), cancellation: ct);
             }
         }
         catch (Exception ex)

src/Api/Models/Responses/UserInfoResponse.cs

@@ -0,0 +1,3 @@
+namespace Api.Models.Responses;
+
+public record UserInfoResponse(string UserId, UserTokenResponse TokenInfo);

src/Api/Models/Responses/UserTokenInfo.cs

@@ -1,3 +1,3 @@
 namespace Api.Models.Responses;
 
-public record UserTokenResponse(string Token, int ExpiresIn);
+public record UserTokenResponse(string Token, int ExpiresIn);

src/Core/Core.csproj

@@ -9,7 +9,7 @@
     <ItemGroup>
       <PackageReference Include="ErrorOr" Version="1.3.0" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-      <PackageReference Include="trumpee.masstransit.messages" Version="1.0.0.8" />
+      <PackageReference Include="trumpee.masstransit.messages" Version="1.0.0.15" />
     </ItemGroup>
 
     <ItemGroup>

src/Core/Mappers/External/DeliveryRequestMapper.cs

@@ -12,6 +12,7 @@ internal static Notification ToRequest(NotificationDto notification, RecipientDt
 
         return new Notification
         {
+            NotificationId = notification.Id!,
             Content = ContentNapper.ToContent(notification.Content),
             Priority = (Priority?)notification.Priority,
             Status = notification.Status,

src/Infrastructure/Auth0/Abstractions/IAuthService.cs

@@ -5,5 +5,5 @@ namespace Infrastructure.Auth0.Abstractions;
 public interface IAuthService
 {
     Task<TokenInfoDto?> GetUserToken(LoginRequestDto req, CancellationToken ct);
-    Task<TokenInfoDto?> RegisterUser(RegisterRequestDto req, CancellationToken ct);
+    Task<UserInfoDto?> RegisterUser(RegisterRequestDto req, CancellationToken ct);
 }

src/Infrastructure/Auth0/Auth0Service.cs src/Infrastructure/Auth0/AuthService.cs

@@ -3,6 +3,7 @@
 using Infrastructure.Auth0.Abstractions;
 using Infrastructure.Auth0.Configuration;
 using Infrastructure.Auth0.Models;
+using Infrastructure.Persistence.MassTransit.Analytics;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
@@ -11,11 +12,13 @@ namespace Infrastructure.Auth0;
 public class AuthService(
     IOptions<Auth0Options> auth0Options,
     IAuthenticationApiClient authenticationClient,
+    IUserAnalyticsClient userAnalyticsClient,
     ILogger<AuthService> logger) : IAuthService
 {
     private readonly Auth0Options _auth0Options = auth0Options.Value ??
                                                   throw new ArgumentNullException(nameof(auth0Options));
     private readonly IAuthenticationApiClient _auth0Client = authenticationClient;
+    private readonly IUserAnalyticsClient _userAnalyticsClient = userAnalyticsClient;
     private readonly ILogger<AuthService> _logger = logger;
 
     public async Task<TokenInfoDto?> GetUserToken(LoginRequestDto req, CancellationToken ct)
@@ -33,14 +36,15 @@ public class AuthService(
                 ClientSecret = _auth0Options.ClientSecret,
                 Scope = "openid"
             }, ct);
-            
+
             var authToken = auth0Response?.AccessToken;
             if (string.IsNullOrEmpty(authToken))
             {
                 _logger.LogWarning("Failed to get token for user {Login}", req.Login);
                 return null;
             }
-            
+
+            await _userAnalyticsClient.SendUserSignIn(req.Login, ct);
             return new TokenInfoDto(authToken, auth0Response?.ExpiresIn ?? 0);
         }
         catch (Exception ex)
@@ -50,11 +54,11 @@ public class AuthService(
         }
     }
 
-    public async Task<TokenInfoDto?> RegisterUser(RegisterRequestDto req, CancellationToken ct)
+    public async Task<UserInfoDto?> RegisterUser(RegisterRequestDto req, CancellationToken ct)
     {
         try
         {
-            var username = $"{req.FullName[0]}-{Guid.NewGuid().ToString()[..6]}";
+            var username = $"{req.FullName[0]}-{Guid.NewGuid().ToString()[..6]}".ToLower();
             await _auth0Client.SignupUserAsync(new SignupUserRequest
             {
                 Username = username,
@@ -71,8 +75,18 @@ await _auth0Client.SignupUserAsync(new SignupUserRequest
                 Connection =_auth0Options.Realm,
                 ClientId = _auth0Options.ClientId
             }, ct);
-            
-            return await GetUserToken(new LoginRequestDto(req.Email, req.Password), ct);
+
+            // By now, all users registered are recipients.
+            // Administrators are created manually via Auth0 management console.
+            await _userAnalyticsClient.SendUserSignUp(username, req.Email, req.FullName, "recipient", ct);
+            var tokenInfo = await GetUserToken(new LoginRequestDto(req.Email, req.Password), ct);
+            if (tokenInfo is null)
+            {
+                _logger.LogWarning("Failed to register user {Login}", req.Login);
+                return null;
+            }
+
+            return new UserInfoDto(username, tokenInfo);
         }
         catch (Exception ex)
         {

src/Infrastructure/Auth0/Models/TokenInfoDto.cs

@@ -1,3 +1,3 @@
 namespace Infrastructure.Auth0.Models;
 
-public record TokenInfoDto(string Token, int ExpiresIn);
+public record TokenInfoDto(string Token, int ExpiresIn);

src/Infrastructure/Auth0/Models/UserInfoDto.cs

@@ -0,0 +1,3 @@
+namespace Infrastructure.Auth0.Models;
+
+public record UserInfoDto(string UserId, TokenInfoDto TokenInfo);

src/Infrastructure/Infrastructure.csproj

@@ -15,8 +15,8 @@
       <PackageReference Include="MongoAsyncEnumerableAdapter" Version="0.2.0" />
       <PackageReference Include="MongoDB.Driver" Version="2.22.0" />
       <PackageReference Include="MongoDB.Driver.Core" Version="2.22.0" />
-      <PackageReference Include="Trumpee.MassTransit" Version="1.0.0.10" />
-      <PackageReference Include="trumpee.masstransit.messages" Version="1.0.0.8" />
+      <PackageReference Include="Trumpee.MassTransit" Version="1.0.0.13" />
+      <PackageReference Include="trumpee.masstransit.messages" Version="1.0.0.15" />
     </ItemGroup>
 
 </Project>

src/Infrastructure/Persistence/DependencyInjection.cs

@@ -3,6 +3,7 @@
 using Infrastructure.Auth0.Abstractions;
 using Infrastructure.Auth0.Configuration;
 using Infrastructure.Persistence.MassTransit;
+using Infrastructure.Persistence.MassTransit.Analytics;
 using Infrastructure.Persistence.Mongo.Abstractions;
 using Infrastructure.Persistence.Mongo.Configurations;
 using Infrastructure.Persistence.Mongo.Repositories;
@@ -34,6 +35,7 @@ private static void AddMassTransit(this IServiceCollection services, IConfigurat
         services.AddConfiguredMassTransit(config);
 
         services.AddScoped<ITemplateFillerClient, TemplateFillerClient>();
+        services.AddScoped<IUserAnalyticsClient, UserAnalyticsClient>();
     }
 
     private static void AddAuth0(this IServiceCollection services, IConfiguration config)

src/Infrastructure/Persistence/MassTransit/Analytics/UserAnalyticsClient.cs

@@ -0,0 +1,36 @@
+using MassTransit;
+using Trumpee.MassTransit;
+using Trumpee.MassTransit.Messages.Analytics.Users;
+
+namespace Infrastructure.Persistence.MassTransit.Analytics;
+
+public class UserAnalyticsClient(ISendEndpointProvider sendEndpointProvider) : IUserAnalyticsClient
+{
+    private readonly ISendEndpointProvider _endpointProvider = sendEndpointProvider;
+    
+    public async Task SendUserSignIn(string email, CancellationToken ct)
+    {
+        var analyticsEvent = User.SignIn("Trumpee Gateway", email);
+        await SendEvent(analyticsEvent, ct);
+    }
+    
+    public async Task SendUserSignUp(string userId,
+        string email, string name, string roles, CancellationToken ct)
+    {
+        var analyticsEvent = User.SignUp("Trumpee Gateway", userId, email, name, roles);
+        await SendEvent(analyticsEvent, ct);
+    }
+    
+    public async Task SendUserAction(string email,
+        string userAction, string usedRole, string affectedData, CancellationToken ct)
+    {
+        var analyticsEvent = User.Action("Trumpee Gateway", email, userAction, usedRole, affectedData);
+        await SendEvent(analyticsEvent, ct);
+    }
+    
+    private async Task SendEvent<T>(T analyticsEvent, CancellationToken ct) where T : class
+    {
+        var endpoint = await _endpointProvider.GetSendEndpoint(new Uri(QueueNames.Analytics.Users));
+        await endpoint.Send(analyticsEvent, ct);
+    }
+}

src/Infrastructure/Persistence/MassTransit/TempalateFillerClient.cs

@@ -5,18 +5,13 @@
 
 namespace Infrastructure.Persistence.MassTransit;
 
-public class TemplateFillerClient :
-    MassTransitClient<Notification>, ITemplateFillerClient
+public class TemplateFillerClient(ISendEndpointProvider endpointProvider) :
+    MassTransitClient<Notification>(endpointProvider), ITemplateFillerClient
 {
-    public TemplateFillerClient(ISendEndpointProvider endpointProvider) :
-        base(endpointProvider)
-    {
-    }
-
     public new Task SendMessages(
         IEnumerable<Notification> messages,
         string _)
     {
-        return base.SendMessages(messages, QueueNames.TemplateFillerQueueName);
+        return base.SendMessages(messages, QueueNames.Services.TemplateFillerQueueName);
     }
 }