Final Form

src/Web/Common/BlobStorage/AzureBlobStorage.cs

@@ -0,0 +1,147 @@
+using Azure;
+using Azure.Storage.Blobs;
+using Azure.Storage.Blobs.Models;
+
+namespace Hutopy.Web.Common.BlobStorage;
+
+public class AzureBlobStorage
+{
+    private const long MaxUploadSize = 10 * 1024 * 1024; // 10 MB in bytes
+    
+    private readonly BlobServiceClient _blobServiceClient;
+    private readonly ILogger<AzureBlobStorage> _logger;
+
+    public AzureBlobStorage(IConfiguration configuration, ILogger<AzureBlobStorage> logger)
+    {
+        _logger = logger;
+        var connectionString = configuration.GetConnectionString("AzureBlob");
+        _blobServiceClient = new BlobServiceClient(connectionString);
+    }
+
+    /// <summary>
+    /// Upload a file to microsoft azure blob storage.
+    /// </summary>
+    /// <param name="containerName">The name of the container where the file is stored.</param>
+    /// <param name="blobName">The blob name (path within the container, include the file name).</param>
+    /// <param name="stream"></param>
+    /// <param name="contentType">The content type.</param>
+    /// <param name="ct">The cancellation token</param>
+    /// <returns></returns>
+    public async Task<string> UploadFileAsync(string containerName, string blobName, Stream stream,
+        string contentType, CancellationToken ct = default)
+    {
+        // Read the file stream into a memory stream to determine the length
+        // WATCH FOR MEMORY USAGE USING THE MEMORY STREAM.
+        stream.Position = 0;
+
+        // Check if the file size exceeds the maximum upload size
+        if (stream.Length > MaxUploadSize)
+        {
+            _logger.LogError(
+                $"Blob storage: File size exceeds the maximum allowed size of {MaxUploadSize} bytes.");
+            throw new InvalidOperationException(
+                $"Blob storage: File size exceeds the maximum allowed size of {MaxUploadSize} bytes.");
+        }
+
+        // Validate content type
+        if (!ContentTypes.IsAllowed(contentType, stream))
+        {
+            _logger.LogError(
+                $"Blob storage: Unsupported file type {contentType}.");
+            throw new InvalidOperationException("Unsupported file type.");
+        }
+
+        try
+        {
+            // Get a reference to a container
+            var containerClient = _blobServiceClient.GetBlobContainerClient(containerName);
+
+            // Create the container if it does not exist
+            await containerClient.CreateIfNotExistsAsync(
+                PublicAccessType.Blob,
+                cancellationToken: ct);
+
+            // Get a reference to a blob
+            var blobClient = containerClient.GetBlobClient(blobName);
+
+            // Define the BlobHttpHeaders to include the content type
+            var blobHttpHeaders = new BlobHttpHeaders { ContentType = contentType };
+
+            // Upload the file
+            var response = await blobClient.UploadAsync(
+                stream,
+                new BlobUploadOptions { HttpHeaders = blobHttpHeaders },
+                ct);
+
+            var fileUri = blobClient.Uri.ToString();
+
+            _logger.LogInformation(
+                """
+                Blob storage: Status [   {ResponseStatus}   ] 
+                Uploaded [  {BlobName}  ] to the container [  {ContainerName}  ] 
+                with contentType [  {ContentType}  ] 
+                with a length of [   {StreamLength} bytes   ]
+                with the uri [   {FileUri}   ]
+                """,
+                response.GetRawResponse().Status.ToString(),
+                blobName,
+                containerName,
+                contentType,
+                stream.Length,
+                fileUri
+            );
+
+            // Return the URI of the uploaded blob
+            return fileUri;
+        }
+        catch (RequestFailedException ex)
+        {
+            _logger.LogError($"Blob storage: Azure Storage request failed: {ex.Message}");
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError($"Blob storage: An error occurred: {ex.Message}");
+            throw;
+        }
+    }
+
+    /// <summary>
+    /// Download a file to microsoft's azure blob storage.
+    /// </summary>
+    /// <param name="blobName">The blob name (path within the container).</param>
+    /// <param name="containerName">The name of the container where the file is stored. (users)</param>
+    /// <param name="ct">The cancellation token for the request</param>
+    /// <returns></returns>
+    public async Task<MemoryStream> DownloadFileAsync(string containerName, string blobName,
+        CancellationToken ct = default)
+    {
+        try
+        {
+            // Get a reference to a container
+            var containerClient = _blobServiceClient.GetBlobContainerClient(containerName);
+
+            // Get a reference to a blob
+            var blobClient = containerClient.GetBlobClient(blobName);
+
+            // Download the blob to a stream
+            BlobDownloadInfo download = await blobClient.DownloadAsync(ct);
+            
+            MemoryStream memoryStream = new();
+            await download.Content.CopyToAsync(memoryStream, ct);
+            memoryStream.Position = 0; // Ensure the stream is at the beginning
+
+            return memoryStream;
+        }
+        catch (RequestFailedException ex)
+        {
+            _logger.LogError($"Azure Storage request failed: {ex.Message}");
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError($"An error occurred: {ex.Message}");
+            throw;
+        }
+    }
+}

src/Web/Common/BlobStorage/BlobStructure.txt

@@ -0,0 +1,33 @@
+users/
+│
+├── userId1/
+│   ├── profile/
+│   │   └── profilePicture.jpg
+│   │   └── data.json
+│   │
+│   ├── posts/
+│   │   ├── post1/
+│   │   │   ├── image1.jpg
+│   │   │   ├── video1.mp4
+│   │   │   └── audio1.mp3
+│   │   ├── post2/
+│   │   │   ├── image2.jpg
+│   │   │   └── video2.mp4
+│   │   └── ...
+│
+├── userId2/
+│   ├── profile/
+│   │   └── profilePicture.jpg
+│   │   └── data.json
+│   │
+│   ├── posts/
+│   │   ├── post1/
+│   │   │   ├── image1.jpg
+│   │   │   ├── video1.mp4
+│   │   │   └── audio1.mp3
+│   │   ├── post2/
+│   │   │   ├── image2.jpg
+│   │   │   └── video2.mp4
+│   │   └── ...
+│
+└── ...

src/Web/Common/BlobStorage/CommonFileNames.cs

@@ -0,0 +1,7 @@
+namespace Hutopy.Web.Common.BlobStorage;
+
+public static class CommonFileNames
+{
+    public static string ProfilePicture = "profilePicture";
+    public static string BannerPicture = "bannerPicture";
+}

src/Web/Common/BlobStorage/ContainerNames.cs

@@ -0,0 +1,7 @@
+namespace Hutopy.Web.Common.BlobStorage;
+
+public static class ContainerNames
+{
+    public const string Users = "users";
+    public const string Creators = "creators";
+}

src/Web/Common/BlobStorage/ContentTypes.cs

@@ -0,0 +1,39 @@
+namespace Hutopy.Web.Common.BlobStorage;
+
+public static class ContentTypes
+{
+    private const string ImagePng = "image/png";
+    private const string ImageJpeg = "image/jpeg";
+    private const string ImageJpg = "image/jpg";
+
+    private static readonly HashSet<string> AllowedContentTypes = [ImagePng, ImageJpeg, ImageJpg];
+
+    public static bool IsAllowed(
+        string contentType,
+        Stream fileStream)
+    {
+        return IsValidFileType(fileStream) && AllowedContentTypes.Contains(contentType);
+    }
+
+    private static bool IsValidFileType(
+        Stream fileStream)
+    {
+        byte[] buffer = new byte[4];
+        fileStream.Read(buffer, 0, buffer.Length);
+        fileStream.Position = 0;
+
+        // PNG file signature: 89 50 4E 47 (in hex)
+        if (buffer[0] == 0x89 && buffer[1] == 0x50 && buffer[2] == 0x4E && buffer[3] == 0x47)
+        {
+            return true;
+        }
+
+        // JPEG file signature: FF D8 FF (in hex)
+        if (buffer[0] == 0xFF && buffer[1] == 0xD8 && buffer[2] == 0xFF)
+        {
+            return true;
+        }
+
+        return false;
+    }
+}

src/Web/Common/BlobStorage/SubDirectoryNames.cs

@@ -0,0 +1,7 @@
+namespace Hutopy.Web.Common.BlobStorage;
+
+public static class SubDirectoryNames
+{
+    public static string Profile = "profile";
+    public static string Contents = "contents";
+}

src/Web/Common/Security/ClaimsPrincipalExtensions.cs

@@ -1,7 +1,6 @@
 using System.Security.Claims;
-using Hutopy.Infrastructure.Utils;
 
-namespace Hutopy.Web.Common;
+namespace Hutopy.Web.Common.Security;
 
 public static class ClaimsPrincipalExtensions
 {

src/Web/Common/Security/GenerateJwtToken.cs

@@ -0,0 +1,53 @@
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
+using System.Text;
+using Microsoft.IdentityModel.Tokens;
+
+namespace Hutopy.Web.Common.Security;
+
+public static class JwtTokenHelper
+{
+    public static string GenerateJwtToken(
+        TimeSpan expiresIn,
+        string issuer,
+        string audience,
+        string key,
+        string userId,
+        string email,
+        string? alias,
+        string firstname,
+        string lastname,
+        string? portraitUrl)
+    {
+        var securityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(key));
+        var credentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256);
+
+        var claims = new List<Claim>(new[]
+        {
+            new Claim(JwtRegisteredClaimNames.Sub, userId),
+            new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
+            new Claim(ClaimTypes.NameIdentifier, userId), new Claim(ClaimTypes.Email, email),
+            new Claim(ClaimTypes.Name, email), new Claim(ClaimTypes.GivenName, firstname),
+            new Claim(ClaimTypes.Surname, lastname)
+        });
+
+        if (alias is not null)
+        {
+            claims.Add(new(KnownClaims.Alias, alias));
+        }
+
+        if (portraitUrl is not null)
+        {
+            claims.Add(new(KnownClaims.PortraitUrl, portraitUrl));
+        }
+
+        var token = new JwtSecurityToken(
+            issuer: issuer,
+            audience: audience,
+            claims: claims,
+            expires: DateTime.Now.Add(expiresIn),
+            signingCredentials: credentials);
+
+        return new JwtSecurityTokenHandler().WriteToken(token);
+    }
+}

src/Web/Common/Security/KnownClaims.cs

@@ -0,0 +1,7 @@
+namespace Hutopy.Web.Common.Security;
+
+public static class KnownClaims
+{
+    public const string Alias = "alias";
+    public const string PortraitUrl = "portraitUrl";
+}

src/Web/Common/Security/MissingClaimException.cs

@@ -1,4 +1,4 @@
-namespace Hutopy.Web.Common;
+namespace Hutopy.Web.Common.Security;
 
 public class MissingClaimException(
     string claimName) 

src/Web/Common/Security/PasswordGenerator.cs

@@ -0,0 +1,70 @@
+using System.Text;
+
+namespace Hutopy.Web.Common.Security;
+
+// If we need to add special characters we can alternate between 2 pools.
+public static class PasswordGenerator
+{
+    private const string LowerLetters = "abcdefghijklmnopqrstuvwxyz";
+    private const string UpperLetters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    private const string Numbers = "0123456789";
+    private const string SpecialCharacters = "!@#$%^&*()_+-=[];',./`~{}|:\"<>?";
+
+    private static readonly Random Random = new();
+
+    public static string GeneratePassword(
+        int minLength,
+        int maxLength,
+        bool requireNumber = true,
+        bool requireCapital = true,
+        bool requireSpecialCharacter = true)
+    {
+        // Create pools based on the requirements
+        var characterPool = new StringBuilder(LowerLetters);
+
+        if (requireCapital)
+            characterPool.Append(UpperLetters);
+
+        if (requireNumber)
+            characterPool.Append(Numbers);
+
+        if (requireSpecialCharacter)
+            characterPool.Append(SpecialCharacters);
+
+        // Ensure that the length is within the specified bounds
+        int length = Random.Next(minLength, maxLength + 1);
+        var password = new char[length];
+
+        // Ensure at least one character from each required category is included
+        int index = 0;
+        
+        if (requireCapital)
+            password[index++] = UpperLetters[Random.Next(UpperLetters.Length)];
+        
+        if (requireNumber)
+            password[index++] = Numbers[Random.Next(Numbers.Length)];
+        
+        if (requireSpecialCharacter)
+            password[index++] = SpecialCharacters[Random.Next(SpecialCharacters.Length)];
+
+        // Fill the rest of the password
+        for (int i = index; i < length; i++)
+        {
+            password[i] = characterPool[Random.Next(characterPool.Length)];
+        }
+
+        // Shuffle the password to randomize the placement of the required characters
+        Shuffle(password);
+        return new string(password);
+    }
+
+    private static void Shuffle(
+        char[] array)
+    {
+        for (int i = array.Length - 1; i > 0; i--)
+        {
+            int j = Random.Next(i + 1);
+            (array[i], array[j]) = (array[j], array[i]); // Swap elements
+        }
+    }
+}

src/Web/Controllers/FacebookController.cs

@@ -1,6 +1,7 @@
 using System.Security.Claims;
-using Hutopy.Infrastructure.Identity;
-using Hutopy.Infrastructure.Utils;
+using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
+using Hutopy.Web.Features.Users;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.Facebook;

src/Web/DependencyInjection.cs

@@ -1,6 +1,6 @@
 using System.Text;
 using Azure.Identity;
-using Hutopy.Infrastructure.Data;
+using Hutopy.Web.Features.Users.Data;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.Facebook;
 using Microsoft.AspNetCore.Authentication.Google;

src/Web/Features/Contents/Data/ContentDbContext.cs

@@ -1,6 +1,4 @@
-using Humanizer;
-
-namespace Hutopy.Web.Features.Contents.Data;
+namespace Hutopy.Web.Features.Contents.Data;
 
 public class ContentDbContext(
     DbContextOptions<ContentDbContext> options)
@@ -31,7 +29,7 @@ public class ContentDbContext(
         modelBuilder
             .Entity<Content>()
             .OwnsMany(c => c.Reactions)
-            .ToTable(nameof(ContentReaction).Pluralize());
+            .ToTable("Reactions");
 
         modelBuilder
             .Entity<Follower>()

src/Web/Features/Contents/Data/ContentReaction.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Hutopy.Web.Features.Contents.Handlers.Enums;
+using Hutopy.Web.Features.Contents.Data.Enums;
 
 namespace Hutopy.Web.Features.Contents.Data;
 

src/Web/Features/Contents/Data/Enums/Reaction.cs

@@ -1,4 +1,4 @@
-namespace Hutopy.Web.Features.Contents.Handlers.Enums;
+namespace Hutopy.Web.Features.Contents.Data.Enums;
 
 public enum Reaction
 {

src/Web/Features/Contents/Handlers/AddReaction.cs

@@ -1,6 +1,6 @@
 using Hutopy.Web.Extensions;
 using Hutopy.Web.Features.Contents.Data;
-using Hutopy.Web.Features.Contents.Handlers.Enums;
+using Hutopy.Web.Features.Contents.Data.Enums;
 
 namespace Hutopy.Web.Features.Contents.Handlers;
 

src/Web/Features/Contents/Handlers/ChangeBanner.cs

@@ -1,4 +1,4 @@
-using Hutopy.Infrastructure.BlobStorage;
+using Hutopy.Web.Common.BlobStorage;
 using Hutopy.Web.Features.Contents.Data;
 
 namespace Hutopy.Web.Features.Contents.Handlers;

src/Web/Features/Contents/Handlers/ChangeLogo.cs

@@ -1,4 +1,4 @@
-using Hutopy.Infrastructure.BlobStorage;
+using Hutopy.Web.Common.BlobStorage;
 using Hutopy.Web.Features.Contents.Data;
 
 namespace Hutopy.Web.Features.Contents.Handlers;

src/Web/Features/Contents/Handlers/CreateContent.cs

@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
-using Hutopy.Infrastructure.BlobStorage;
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.BlobStorage;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Contents.Data;
 using Hutopy.Web.Features.Contents.Handlers.Models;
 

src/Web/Features/Contents/Handlers/CreateCreator.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Contents.Data;
 
 namespace Hutopy.Web.Features.Contents.Handlers;

src/Web/Features/Contents/Handlers/DeleteContent.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Contents.Data;
 
 namespace Hutopy.Web.Features.Contents.Handlers;

src/Web/Features/Contents/Handlers/FollowCreator.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Contents.Data;
 using Hutopy.Web.Features.Contents.Handlers.Models;
 

src/Web/Features/Contents/Handlers/GetCreatorProfile.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Contents.Data;
 
 namespace Hutopy.Web.Features.Contents.Handlers;

src/Web/Features/Contents/Handlers/GetFollowedCreators.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Contents.Data;
 using Hutopy.Web.Features.Contents.Handlers.Models;
 

src/Web/Features/Contents/Handlers/UnfollowCreator.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Contents.Data;
 
 namespace Hutopy.Web.Features.Contents.Handlers;

src/Web/Features/Contents/Migrations/20241012183354_AddHtmlFileUrl.Designer.cs

@@ -1,313 +0,0 @@
-// <auto-generated />
-using System;
-using Hutopy.Web.Features.Contents.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace Hutopy.Web.Features.Contents.Migrations
-{
-    [DbContext(typeof(ContentDbContext))]
-    [Migration("20241012183354_AddHtmlFileUrl")]
-    partial class AddHtmlFileUrl
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasDefaultSchema("Content")
-                .HasAnnotation("ProductVersion", "8.0.4")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Hutopy.Web.Features.Contents.Data.Content", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("timestamp with time zone")
-                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
-
-                    b.Property<Guid>("CreatedBy")
-                        .HasColumnType("uuid");
-
-                    b.Property<DateTimeOffset?>("DeletedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<Guid?>("DeletedBy")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasMaxLength(2048)
-                        .HasColumnType("character varying(2048)");
-
-                    b.Property<string>("HtmlFileUrl")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Title")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("character varying(128)");
-
-                    b.Property<string[]>("Urls")
-                        .HasColumnType("text[]");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.ToTable("Contents", "Content");
-                });
-
-            modelBuilder.Entity("Hutopy.Web.Features.Contents.Data.Creator", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<Guid>("CreatedBy")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)");
-
-                    b.Property<string>("Title")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Creators", "Content");
-                });
-
-            modelBuilder.Entity("Hutopy.Web.Features.Contents.Data.Subscription", b =>
-                {
-                    b.Property<Guid>("CreatedBy")
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("CreatorId")
-                        .HasColumnType("uuid");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("CreatedBy", "CreatorId");
-
-                    b.HasIndex("CreatorId");
-
-                    b.ToTable("Subscriptions", "Content");
-                });
-
-            modelBuilder.Entity("Hutopy.Web.Features.Contents.Data.Content", b =>
-                {
-                    b.HasOne("Hutopy.Web.Features.Contents.Data.Creator", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.OwnsMany("Hutopy.Web.Features.Contents.Data.ContentReaction", "Reactions", b1 =>
-                        {
-                            b1.Property<Guid>("ContentId")
-                                .HasColumnType("uuid");
-
-                            b1.Property<int>("Id")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("integer");
-
-                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
-
-                            b1.Property<int>("Reaction")
-                                .HasColumnType("integer");
-
-                            b1.Property<Guid>("UserId")
-                                .HasColumnType("uuid");
-
-                            b1.Property<string>("UserName")
-                                .IsRequired()
-                                .HasMaxLength(128)
-                                .HasColumnType("character varying(128)");
-
-                            b1.HasKey("ContentId", "Id");
-
-                            b1.ToTable("ContentReactions", "Content");
-
-                            b1.WithOwner()
-                                .HasForeignKey("ContentId");
-                        });
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("Reactions");
-                });
-
-            modelBuilder.Entity("Hutopy.Web.Features.Contents.Data.Creator", b =>
-                {
-                    b.OwnsOne("Hutopy.Web.Features.Contents.Data.Colors", "Colors", b1 =>
-                        {
-                            b1.Property<Guid>("CreatorId")
-                                .HasColumnType("uuid");
-
-                            b1.Property<string>("Background")
-                                .IsRequired()
-                                .HasMaxLength(9)
-                                .HasColumnType("character varying(9)");
-
-                            b1.Property<string>("Error")
-                                .IsRequired()
-                                .HasMaxLength(9)
-                                .HasColumnType("character varying(9)");
-
-                            b1.Property<string>("OnBackground")
-                                .IsRequired()
-                                .HasMaxLength(9)
-                                .HasColumnType("character varying(9)");
-
-                            b1.Property<string>("OnError")
-                                .IsRequired()
-                                .HasMaxLength(9)
-                                .HasColumnType("character varying(9)");
-
-                            b1.Property<string>("OnPrimary")
-                                .IsRequired()
-                                .HasMaxLength(9)
-                                .HasColumnType("character varying(9)");
-
-                            b1.Property<string>("OnSecondary")
-                                .IsRequired()
-                                .HasMaxLength(9)
-                                .HasColumnType("character varying(9)");
-
-                            b1.Property<string>("OnSurface")
-                                .IsRequired()
-                                .HasMaxLength(9)
-                                .HasColumnType("character varying(9)");
-
-                            b1.Property<string>("Primary")
-                                .IsRequired()
-                                .HasMaxLength(9)
-                                .HasColumnType("character varying(9)");
-
-                            b1.Property<string>("Secondary")
-                                .IsRequired()
-                                .HasMaxLength(9)
-                                .HasColumnType("character varying(9)");
-
-                            b1.Property<string>("Surface")
-                                .IsRequired()
-                                .HasMaxLength(9)
-                                .HasColumnType("character varying(9)");
-
-                            b1.HasKey("CreatorId");
-
-                            b1.ToTable("Colors", "Content");
-
-                            b1.WithOwner()
-                                .HasForeignKey("CreatorId");
-                        });
-
-                    b.OwnsOne("Hutopy.Web.Features.Contents.Data.Images", "Images", b1 =>
-                        {
-                            b1.Property<Guid>("CreatorId")
-                                .HasColumnType("uuid");
-
-                            b1.Property<string>("Banner")
-                                .HasMaxLength(255)
-                                .HasColumnType("character varying(255)");
-
-                            b1.Property<string>("Logo")
-                                .HasMaxLength(255)
-                                .HasColumnType("character varying(255)");
-
-                            b1.HasKey("CreatorId");
-
-                            b1.ToTable("Images", "Content");
-
-                            b1.WithOwner()
-                                .HasForeignKey("CreatorId");
-                        });
-
-                    b.OwnsOne("Hutopy.Web.Features.Contents.Data.Socials", "Socials", b1 =>
-                        {
-                            b1.Property<Guid>("CreatorId")
-                                .HasColumnType("uuid");
-
-                            b1.Property<string>("FacebookUrl")
-                                .HasMaxLength(255)
-                                .HasColumnType("character varying(255)");
-
-                            b1.Property<string>("InstagramUrl")
-                                .HasMaxLength(255)
-                                .HasColumnType("character varying(255)");
-
-                            b1.Property<string>("LinkedInUrl")
-                                .HasMaxLength(255)
-                                .HasColumnType("character varying(255)");
-
-                            b1.Property<string>("RedditUrl")
-                                .HasMaxLength(255)
-                                .HasColumnType("character varying(255)");
-
-                            b1.Property<string>("TikTokUrl")
-                                .HasMaxLength(255)
-                                .HasColumnType("character varying(255)");
-
-                            b1.Property<string>("WebsiteUrl")
-                                .HasMaxLength(255)
-                                .HasColumnType("character varying(255)");
-
-                            b1.Property<string>("XUrl")
-                                .HasMaxLength(255)
-                                .HasColumnType("character varying(255)");
-
-                            b1.Property<string>("YoutubeUrl")
-                                .HasMaxLength(255)
-                                .HasColumnType("character varying(255)");
-
-                            b1.HasKey("CreatorId");
-
-                            b1.ToTable("Socials", "Content");
-
-                            b1.WithOwner()
-                                .HasForeignKey("CreatorId");
-                        });
-
-                    b.Navigation("Colors")
-                        .IsRequired();
-
-                    b.Navigation("Images")
-                        .IsRequired();
-
-                    b.Navigation("Socials")
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Hutopy.Web.Features.Contents.Data.Subscription", b =>
-                {
-                    b.HasOne("Hutopy.Web.Features.Contents.Data.Creator", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatorId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

src/Web/Features/Contents/Migrations/20241012183354_AddHtmlFileUrl.cs

@@ -1,30 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Hutopy.Web.Features.Contents.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddHtmlFileUrl : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "HtmlFileUrl",
-                schema: "Content",
-                table: "Contents",
-                type: "text",
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "HtmlFileUrl",
-                schema: "Content",
-                table: "Contents");
-        }
-    }
-}

src/Web/Features/Memberships/Handlers/GetActiveSubscriptions.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Memberships.Data;
 
 namespace Hutopy.Web.Features.Memberships.Handlers;

src/Web/Features/Memberships/Handlers/GetReceivedTips.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Memberships.Data;
 
 namespace Hutopy.Web.Features.Memberships.Handlers;

src/Web/Features/Memberships/Handlers/GetSentTips.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Memberships.Data;
 
 namespace Hutopy.Web.Features.Memberships.Handlers;

src/Web/Features/Memberships/Handlers/SendTip.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Memberships.Data;
 using Hutopy.Web.Features.Memberships.Services;
 

src/Web/Features/Memberships/Handlers/SubscribeToCreator.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Memberships.Data;
 using Hutopy.Web.Features.Memberships.Services;
 

src/Web/Features/Messages/Handlers/AddMessage.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Messages.Data;
 
 namespace Hutopy.Web.Features.Messages.Handlers;

src/Web/Features/Messages/Handlers/AddReply.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Messages.Data;
 
 namespace Hutopy.Web.Features.Messages.Handlers;

src/Web/Features/Messages/Handlers/ChangeMessage.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Messages.Data;
 
 namespace Hutopy.Web.Features.Messages.Handlers;

src/Web/Features/Messages/Handlers/DeleteMessage.cs

@@ -1,4 +1,5 @@
 using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Hutopy.Web.Features.Messages.Data;
 
 namespace Hutopy.Web.Features.Messages.Handlers;

src/Web/Features/Users/ApplicationRole.cs

@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Identity;
+
+namespace Hutopy.Web.Features.Users;
+
+public class ApplicationRole : IdentityRole<Guid>
+{
+    public ApplicationRole() { }
+    public ApplicationRole(string roleName) : base(roleName) { }
+}

src/Web/Features/Users/ApplicationUser.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Identity;
+
+namespace Hutopy.Web.Features.Users;
+
+public class ApplicationUser : IdentityUser<Guid>
+{  
+    [MaxLength(255)] public string? Alias { get; set; }
+    [MaxLength(255)] public string? Firstname { get; set; }
+    [MaxLength(255)] public string? Lastname { get; set; }
+    public DateTime? BirthDate { get; set; } 
+    [MaxLength(255)] public string? Address { get; set; } 
+    [MaxLength(255)] public string? PortraitUrl { get; set; }
+    [MaxLength(255)] public string? GoogleId { get; set; }
+}

src/Web/Features/Users/ApplicationUserManager.cs

@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Options;
+
+namespace Hutopy.Web.Features.Users;
+
+public sealed class ApplicationUserManager(
+    IUserStore<ApplicationUser> store,
+    IOptions<IdentityOptions> optionsAccessor,
+    IPasswordHasher<ApplicationUser> passwordHasher,
+    IEnumerable<IUserValidator<ApplicationUser>> userValidators,
+    IEnumerable<IPasswordValidator<ApplicationUser>> passwordValidators,
+    ILookupNormalizer keyNormalizer,
+    IdentityErrorDescriber errors,
+    IServiceProvider services,
+    ILogger<UserManager<ApplicationUser>> logger)
+    : UserManager<ApplicationUser>(
+        store,
+        optionsAccessor,
+        passwordHasher,
+        userValidators,
+        passwordValidators,
+        keyNormalizer,
+        errors,
+        services,
+        logger)
+{
+}

src/Web/Features/Users/Data/ApplicationDbContext.cs

@@ -0,0 +1,19 @@
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
+
+namespace Hutopy.Web.Features.Users.Data
+{
+    public class ApplicationDbContext(
+        DbContextOptions<ApplicationDbContext> options)
+        : IdentityDbContext<ApplicationUser, ApplicationRole, Guid>(options)
+    {
+        public const string SchemaName = "Identity";
+        protected override void OnModelCreating(ModelBuilder 
+            modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+            
+            modelBuilder.HasDefaultSchema(SchemaName);
+        }
+
+    }
+}

src/Web/Features/Users/Data/ApplicationDbContextInitializer.cs

@@ -0,0 +1,64 @@
+using Microsoft.AspNetCore.Identity;
+
+namespace Hutopy.Web.Features.Users.Data;
+
+public static class InitializerExtensions
+{
+    public static async Task InitialiseApplicationDatabaseAsync(this WebApplication app)
+    {
+        using var scope = app.Services.CreateScope();
+
+        var initializer = scope.ServiceProvider.GetRequiredService<ApplicationDbContextInitializer>();
+
+        await initializer.InitialiseAsync();
+
+        await initializer.SeedAsync();
+    }
+}
+
+public class ApplicationDbContextInitializer(
+    ILogger<ApplicationDbContextInitializer> logger,
+    ApplicationDbContext context,
+    RoleManager<ApplicationRole> roleManager)
+{
+    public async Task InitialiseAsync()
+    {
+        try
+        {
+            await context.Database.MigrateAsync();
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "An error occurred while initialising the database.");
+            throw;
+        }
+    }
+
+    public async Task SeedAsync()
+    {
+        try
+        {
+            await TrySeedAsync();
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "An error occurred while seeding the database.");
+            throw;
+        }
+    }
+
+    private async Task TrySeedAsync()
+    {
+        var administratorRole = new ApplicationRole(KnownRoles.Administrator);
+        if (roleManager.Roles.All(r => r.Name != administratorRole.Name))
+        {
+            await roleManager.CreateAsync(administratorRole);
+        }
+
+        var roleCreator = new ApplicationRole(KnownRoles.Creator);
+        if (roleManager.Roles.All(r => r.Name != roleCreator.Name))
+        {
+            await roleManager.CreateAsync(roleCreator);
+        }
+    }
+}

src/Web/Features/Users/Data/Migrations/20241020183421_Initial.Designer.cs

@@ -0,0 +1,304 @@
+// <auto-generated />
+using System;
+using Hutopy.Web.Features.Users.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Hutopy.Web.Features.Users.Data.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20241020183421_Initial")]
+    partial class Initial
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("Identity")
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Hutopy.Web.Features.Users.ApplicationRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", "Identity");
+                });
+
+            modelBuilder.Entity("Hutopy.Web.Features.Users.ApplicationUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Address")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("Alias")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Firstname")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("GoogleId")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("Lastname")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PortraitUrl")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", "Identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<System.Guid>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", "Identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<System.Guid>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", "Identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<System.Guid>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", "Identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<System.Guid>", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", "Identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<System.Guid>", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", "Identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<System.Guid>", b =>
+                {
+                    b.HasOne("Hutopy.Web.Features.Users.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<System.Guid>", b =>
+                {
+                    b.HasOne("Hutopy.Web.Features.Users.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<System.Guid>", b =>
+                {
+                    b.HasOne("Hutopy.Web.Features.Users.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<System.Guid>", b =>
+                {
+                    b.HasOne("Hutopy.Web.Features.Users.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Hutopy.Web.Features.Users.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<System.Guid>", b =>
+                {
+                    b.HasOne("Hutopy.Web.Features.Users.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Web/Features/Users/Data/Migrations/20241020183421_Initial.cs

@@ -0,0 +1,260 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Hutopy.Web.Features.Users.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class Initial : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.EnsureSchema(
+                name: "Identity");
+
+            migrationBuilder.CreateTable(
+                name: "AspNetRoles",
+                schema: "Identity",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uuid", nullable: false),
+                    Name = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
+                    NormalizedName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetRoles", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AspNetUsers",
+                schema: "Identity",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uuid", nullable: false),
+                    Alias = table.Column<string>(type: "character varying(255)", maxLength: 255, nullable: true),
+                    Firstname = table.Column<string>(type: "character varying(255)", maxLength: 255, nullable: true),
+                    Lastname = table.Column<string>(type: "character varying(255)", maxLength: 255, nullable: true),
+                    BirthDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
+                    Address = table.Column<string>(type: "character varying(255)", maxLength: 255, nullable: true),
+                    PortraitUrl = table.Column<string>(type: "character varying(255)", maxLength: 255, nullable: true),
+                    GoogleId = table.Column<string>(type: "character varying(255)", maxLength: 255, nullable: true),
+                    UserName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
+                    NormalizedUserName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
+                    Email = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
+                    NormalizedEmail = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
+                    EmailConfirmed = table.Column<bool>(type: "boolean", nullable: false),
+                    PasswordHash = table.Column<string>(type: "text", nullable: true),
+                    SecurityStamp = table.Column<string>(type: "text", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "text", nullable: true),
+                    PhoneNumber = table.Column<string>(type: "text", nullable: true),
+                    PhoneNumberConfirmed = table.Column<bool>(type: "boolean", nullable: false),
+                    TwoFactorEnabled = table.Column<bool>(type: "boolean", nullable: false),
+                    LockoutEnd = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: true),
+                    LockoutEnabled = table.Column<bool>(type: "boolean", nullable: false),
+                    AccessFailedCount = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetUsers", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AspNetRoleClaims",
+                schema: "Identity",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    RoleId = table.Column<Guid>(type: "uuid", nullable: false),
+                    ClaimType = table.Column<string>(type: "text", nullable: true),
+                    ClaimValue = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_AspNetRoleClaims_AspNetRoles_RoleId",
+                        column: x => x.RoleId,
+                        principalSchema: "Identity",
+                        principalTable: "AspNetRoles",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AspNetUserClaims",
+                schema: "Identity",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    UserId = table.Column<Guid>(type: "uuid", nullable: false),
+                    ClaimType = table.Column<string>(type: "text", nullable: true),
+                    ClaimValue = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetUserClaims", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_AspNetUserClaims_AspNetUsers_UserId",
+                        column: x => x.UserId,
+                        principalSchema: "Identity",
+                        principalTable: "AspNetUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AspNetUserLogins",
+                schema: "Identity",
+                columns: table => new
+                {
+                    LoginProvider = table.Column<string>(type: "text", nullable: false),
+                    ProviderKey = table.Column<string>(type: "text", nullable: false),
+                    ProviderDisplayName = table.Column<string>(type: "text", nullable: true),
+                    UserId = table.Column<Guid>(type: "uuid", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey });
+                    table.ForeignKey(
+                        name: "FK_AspNetUserLogins_AspNetUsers_UserId",
+                        column: x => x.UserId,
+                        principalSchema: "Identity",
+                        principalTable: "AspNetUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AspNetUserRoles",
+                schema: "Identity",
+                columns: table => new
+                {
+                    UserId = table.Column<Guid>(type: "uuid", nullable: false),
+                    RoleId = table.Column<Guid>(type: "uuid", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId });
+                    table.ForeignKey(
+                        name: "FK_AspNetUserRoles_AspNetRoles_RoleId",
+                        column: x => x.RoleId,
+                        principalSchema: "Identity",
+                        principalTable: "AspNetRoles",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_AspNetUserRoles_AspNetUsers_UserId",
+                        column: x => x.UserId,
+                        principalSchema: "Identity",
+                        principalTable: "AspNetUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AspNetUserTokens",
+                schema: "Identity",
+                columns: table => new
+                {
+                    UserId = table.Column<Guid>(type: "uuid", nullable: false),
+                    LoginProvider = table.Column<string>(type: "text", nullable: false),
+                    Name = table.Column<string>(type: "text", nullable: false),
+                    Value = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name });
+                    table.ForeignKey(
+                        name: "FK_AspNetUserTokens_AspNetUsers_UserId",
+                        column: x => x.UserId,
+                        principalSchema: "Identity",
+                        principalTable: "AspNetUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AspNetRoleClaims_RoleId",
+                schema: "Identity",
+                table: "AspNetRoleClaims",
+                column: "RoleId");
+
+            migrationBuilder.CreateIndex(
+                name: "RoleNameIndex",
+                schema: "Identity",
+                table: "AspNetRoles",
+                column: "NormalizedName",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AspNetUserClaims_UserId",
+                schema: "Identity",
+                table: "AspNetUserClaims",
+                column: "UserId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AspNetUserLogins_UserId",
+                schema: "Identity",
+                table: "AspNetUserLogins",
+                column: "UserId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AspNetUserRoles_RoleId",
+                schema: "Identity",
+                table: "AspNetUserRoles",
+                column: "RoleId");
+
+            migrationBuilder.CreateIndex(
+                name: "EmailIndex",
+                schema: "Identity",
+                table: "AspNetUsers",
+                column: "NormalizedEmail");
+
+            migrationBuilder.CreateIndex(
+                name: "UserNameIndex",
+                schema: "Identity",
+                table: "AspNetUsers",
+                column: "NormalizedUserName",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AspNetRoleClaims",
+                schema: "Identity");
+
+            migrationBuilder.DropTable(
+                name: "AspNetUserClaims",
+                schema: "Identity");
+
+            migrationBuilder.DropTable(
+                name: "AspNetUserLogins",
+                schema: "Identity");
+
+            migrationBuilder.DropTable(
+                name: "AspNetUserRoles",
+                schema: "Identity");
+
+            migrationBuilder.DropTable(
+                name: "AspNetUserTokens",
+                schema: "Identity");
+
+            migrationBuilder.DropTable(
+                name: "AspNetRoles",
+                schema: "Identity");
+
+            migrationBuilder.DropTable(
+                name: "AspNetUsers",
+                schema: "Identity");
+        }
+    }
+}

src/Web/Features/Users/Data/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -0,0 +1,301 @@
+// <auto-generated />
+using System;
+using Hutopy.Web.Features.Users.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Hutopy.Web.Features.Users.Data.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    partial class ApplicationDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("Identity")
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Hutopy.Web.Features.Users.ApplicationRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", "Identity");
+                });
+
+            modelBuilder.Entity("Hutopy.Web.Features.Users.ApplicationUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Address")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("Alias")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Firstname")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("GoogleId")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("Lastname")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PortraitUrl")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", "Identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<System.Guid>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", "Identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<System.Guid>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", "Identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<System.Guid>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", "Identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<System.Guid>", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", "Identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<System.Guid>", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", "Identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<System.Guid>", b =>
+                {
+                    b.HasOne("Hutopy.Web.Features.Users.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<System.Guid>", b =>
+                {
+                    b.HasOne("Hutopy.Web.Features.Users.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<System.Guid>", b =>
+                {
+                    b.HasOne("Hutopy.Web.Features.Users.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<System.Guid>", b =>
+                {
+                    b.HasOne("Hutopy.Web.Features.Users.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Hutopy.Web.Features.Users.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<System.Guid>", b =>
+                {
+                    b.HasOne("Hutopy.Web.Features.Users.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Web/Features/Users/DependencyInjection.cs

@@ -0,0 +1,43 @@
+using Hutopy.Web.Common.BlobStorage;
+using Hutopy.Web.Features.Messages.Data;
+using Hutopy.Web.Features.Users.Data;
+using Microsoft.AspNetCore.Identity;
+
+namespace Hutopy.Web.Features.Users;
+
+public static class DependencyInjection
+{
+    public static IServiceCollection AddUsersModule(
+        this IServiceCollection services,
+        Action<DbContextOptionsBuilder>? configureAction = null)
+    {
+        services.AddDbContext<MessagingDbContext>(configureAction);
+        services.AddScoped<MessagingDbContextInitializer>();
+        
+        services.AddDbContext<ApplicationDbContext>(configureAction);
+        services.AddScoped<ApplicationDbContextInitializer>();
+
+        services.AddAuthentication()
+            .AddBearerToken(IdentityConstants.BearerScheme);
+
+        services.AddAuthorizationBuilder();
+
+        services
+            .AddIdentityCore<ApplicationUser>()
+            .AddUserManager<ApplicationUserManager>()
+            .AddRoles<ApplicationRole>()
+            .AddEntityFrameworkStores<ApplicationDbContext>()
+            .AddApiEndpoints()
+            .AddSignInManager<SignInManager<ApplicationUser>>()
+            .AddDefaultTokenProviders();
+
+        // Singleton services
+        services.AddSingleton(TimeProvider.System);
+        services.AddSingleton<AzureBlobStorage>();
+
+        // Scoped services
+        services.AddScoped<IdentityService>();
+        
+        return services;
+    }
+}

src/Web/Features/Users/Handlers/ChangeAddress.cs

@@ -1,5 +1,5 @@
-using Hutopy.Infrastructure.Identity;
-using Hutopy.Web.Common;
+using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 
 namespace Hutopy.Web.Features.Users.Handlers;
 

src/Web/Features/Users/Handlers/ChangeAlias.cs

@@ -1,5 +1,5 @@
-using Hutopy.Infrastructure.Identity;
-using Hutopy.Web.Common;
+using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 
 namespace Hutopy.Web.Features.Users.Handlers;
 

src/Web/Features/Users/Handlers/ChangeBirthDate.cs

@@ -1,5 +1,5 @@
-using Hutopy.Infrastructure.Identity;
-using Hutopy.Web.Common;
+using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 
 namespace Hutopy.Web.Features.Users.Handlers;
 

src/Web/Features/Users/Handlers/ChangeEmail.cs

@@ -1,5 +1,5 @@
-using Hutopy.Infrastructure.Identity;
-using Hutopy.Web.Common;
+using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 
 namespace Hutopy.Web.Features.Users.Handlers;
 

src/Web/Features/Users/Handlers/ChangeFullname.cs

@@ -1,5 +1,5 @@
-using Hutopy.Infrastructure.Identity;
-using Hutopy.Web.Common;
+using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 
 namespace Hutopy.Web.Features.Users.Handlers;
 

src/Web/Features/Users/Handlers/ChangePhone.cs

@@ -1,5 +1,5 @@
-using Hutopy.Infrastructure.Identity;
-using Hutopy.Web.Common;
+using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 
 namespace Hutopy.Web.Features.Users.Handlers;
 

src/Web/Features/Users/Handlers/ChangePortrait.cs

@@ -1,6 +1,6 @@
-using Hutopy.Infrastructure.BlobStorage;
-using Hutopy.Infrastructure.Identity;
-using Hutopy.Web.Common;
+using Hutopy.Web.Common;
+using Hutopy.Web.Common.BlobStorage;
+using Hutopy.Web.Common.Security;
 
 namespace Hutopy.Web.Features.Users.Handlers;
 

src/Web/Features/Users/Handlers/GetCurrentUser.cs

@@ -1,4 +1,3 @@
-using Hutopy.Infrastructure.Identity;
 using Hutopy.Web.Features.Users.Handlers.Models;
 
 namespace Hutopy.Web.Features.Users.Handlers;

src/Web/Features/Users/Handlers/GetCurrentUserProfilePicture.cs

@@ -1,5 +1,4 @@
-using Hutopy.Infrastructure.BlobStorage;
-using Hutopy.Infrastructure.Identity;
+using Hutopy.Web.Common.BlobStorage;
 
 namespace Hutopy.Web.Features.Users.Handlers;
 

src/Web/Features/Users/Handlers/LoginWithGoogle.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Hutopy.Infrastructure.Identity;
-using Hutopy.Infrastructure.Utils;
+using Hutopy.Web.Common;
+using Hutopy.Web.Common.Security;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 

src/Web/Features/Users/IdentityResultExtensions.cs

@@ -0,0 +1,14 @@
+using Hutopy.Web.Features.Users.Models;
+using Microsoft.AspNetCore.Identity;
+
+namespace Hutopy.Web.Features.Users;
+
+public static class IdentityResultExtensions
+{
+    public static Result ToApplicationResult(this IdentityResult result)
+    {
+        return result.Succeeded
+            ? Result.Success()
+            : Result.Failure(result.Errors.Select(e => e.Description));
+    }
+}

src/Web/Features/Users/IdentityService.cs

@@ -0,0 +1,94 @@
+using System.Security.Claims;
+using Hutopy.Web.Features.Users.Models;
+
+namespace Hutopy.Web.Features.Users;
+
+public class IdentityService(
+    ApplicationUserManager userManager,
+    IHttpContextAccessor contextAccessor
+)
+{
+    public async Task<Result<Guid>> CreateUserAsync(string email, string userName, string firstName, string lastName,
+        string password)
+    {
+        var applicationUser = new ApplicationUser
+        {
+            UserName = userName, Email = email, Firstname = firstName, Lastname = lastName
+        };
+
+        var response = await userManager.CreateAsync(applicationUser, password);
+
+        if (!response.Succeeded)
+        {
+            throw new BadHttpRequestException(response.Errors.First().Description);
+        }
+
+        var result = new Result<Guid>(applicationUser.Id, response.Succeeded, response.ToApplicationResult().Errors);
+
+        return result;
+    }
+
+    private static UserModel BuildModelFrom(ApplicationUser response)
+    {
+        var userModel = new UserModel
+        {
+            Id = response.Id,
+            Username = response.UserName ?? string.Empty,
+            PhoneNumber = response.PhoneNumber ?? string.Empty,
+            Email = response.Email ?? string.Empty,
+            PortraitUrl = response.PortraitUrl,
+            Alias = response.Alias,
+            Firstname = response.Firstname,
+            Lastname = response.Lastname,
+            BirthDate = response.BirthDate,
+            Address = response.Address,
+        };
+
+        return userModel;
+    }
+
+    public async Task<UserModel?> FindUserByIdAsync(string id)
+    {
+        var user = await userManager.FindByIdAsync(id);
+
+        if (user == null) return null;
+
+        var userModel = BuildModelFrom(user);
+
+        return userModel;
+    }
+
+    public async Task<UserModel?> FindUserByEmailAsync(string email)
+    {
+        var response = await userManager.FindByEmailAsync(email);
+
+        if (response == null) return null;
+
+        return BuildModelFrom(response);
+    }
+
+    public async Task<UserModel?> GetCurrentUserAsync()
+    {
+        var currentUserId = contextAccessor.HttpContext?.User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+        if (string.IsNullOrEmpty(currentUserId))
+        {
+            return null;
+        }
+
+        return await FindUserByIdAsync(currentUserId);
+    }
+
+    public async Task<IList<string>> GetCurrentUserRolesAsync()
+    {
+        var currentUserModel = await GetCurrentUserAsync();
+
+        var currentUser = await userManager.FindByIdAsync(currentUserModel.Id.ToString());
+
+        if (currentUser is null) return [];
+
+        var userRoles = await userManager.GetRolesAsync(currentUser);
+
+        return userRoles;
+    }
+
+}

src/Web/Features/Users/JwtOptions.cs

@@ -0,0 +1,11 @@
+namespace Hutopy.Web.Features.Users;
+
+public record JwtOptions
+{
+    public const string SectionName = "Authentication:Jwt";
+    
+    public required TimeSpan Lifetime { get; init; }
+    public required string Issuer { get; init; }
+    public required string Audience { get; init; }
+    public required string Key { get; init; }
+}

src/Web/Features/Users/KnownRoles.cs

@@ -0,0 +1,7 @@
+namespace Hutopy.Web.Features.Users;
+
+public static class KnownRoles
+{
+    public const string Administrator = nameof(Administrator);
+    public const string Creator = nameof(Creator);
+}

src/Web/Features/Users/Models/Result.cs

@@ -0,0 +1,49 @@
+namespace Hutopy.Web.Features.Users.Models;
+
+public class Result(
+    bool succeeded, 
+    IEnumerable<string> errors)
+{
+    public bool Succeeded { get; init; } = succeeded;
+    public string[] Errors { get; init; } = errors.ToArray();
+    
+    public static Result Success()
+    {
+        return new Result(true, Array.Empty<string>());
+    }
+
+    public static Result Failure(IEnumerable<string> errors)
+    {
+        return new Result(false, errors);
+    }
+}
+
+public class Result<T>(
+    T? value,
+    bool succeeded, 
+    IEnumerable<string> errors)
+{
+    public bool Succeeded { get; init; } = succeeded;
+    public string[] Errors { get; init; } = errors.ToArray();
+    public T? Value { get; set; } = value;
+    
+    public T GetValueOrDefault()
+    {
+        return Value ?? default(T)!;
+    }
+    
+    public string GetErrorsAsString()
+    {
+        return Errors.Length == 0 ? string.Empty : string.Join(", ", Errors);
+    }
+
+    public static Result<T> Success(T value)
+    {
+        return new Result<T>(value, true, Array.Empty<string>());
+    }
+
+    public static Result<T> Failure(T value, IEnumerable<string> errors)
+    {
+        return new Result<T>(value, false, errors);
+    }
+}

src/Web/Features/Users/Models/RoleModel.cs

@@ -0,0 +1,7 @@
+namespace Hutopy.Web.Features.Users.Models;
+
+public class RoleModel
+{
+    public Guid Id { get; set; }
+    public string? Name { get; set; }
+}

src/Web/Features/Users/Models/UserModel.cs

@@ -0,0 +1,15 @@
+namespace Hutopy.Web.Features.Users.Models;
+
+public class UserModel
+{
+    public Guid Id { get; set; }
+    public string Username { get; init; } = null!;
+    public string? Alias { get; init; }
+    public string? PortraitUrl { get; init; }
+    public string? Firstname { get; init; }
+    public string? Lastname { get; init; }
+    public string? Email { get; init; }
+    public string? PhoneNumber { get; init; }
+    public DateTime? BirthDate { get; init; }
+    public string? Address { get; init; }
+}

src/Web/Pages/Shared/_LoginPartial.cshtml

@@ -1,4 +1,4 @@
-@using Hutopy.Infrastructure.Identity
+@using Hutopy.Web.Features.Users
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @inject SignInManager<ApplicationUser> SignInManager

src/Web/Program.cs

@@ -1,7 +1,4 @@
 using Azure.Identity;
-using Hutopy.Infrastructure;
-using Hutopy.Infrastructure.Data;
-using Hutopy.Infrastructure.Identity;
 using Hutopy.Web;
 using Hutopy.Web.Features.Contents;
 using Hutopy.Web.Features.Contents.Data;
@@ -9,6 +6,8 @@ using Hutopy.Web.Features.Memberships;
 using Hutopy.Web.Features.Memberships.Data;
 using Hutopy.Web.Features.Messages;
 using Hutopy.Web.Features.Messages.Data;
+using Hutopy.Web.Features.Users;
+using Hutopy.Web.Features.Users.Data;
 using Microsoft.AspNetCore.HttpOverrides;
 using NSwag;
 using NSwag.Generation.AspNetCore.Processors;
@@ -50,8 +49,6 @@ builder.Services.AddCors(options =>
 
 // Add services to the container.
 builder.Services.AddKeyVaultIfConfigured(builder.Configuration);
-
-builder.Services.AddInfrastructureServices(builder.Configuration);
 builder.Services.AddWebServices();
 builder.Services.AddAuthorizationAndAuthentication(builder.Configuration);
 
@@ -84,6 +81,10 @@ var postgresConnectionString = builder.Configuration.GetConnectionString("Postgr
                                ?? throw new InvalidOperationException("Missing ConnectionStrings:PostgresConnection");
 
 builder.Services.AddFastEndpoints();
+builder.Services.AddUsersModule(options =>
+    options.UseNpgsql(
+        postgresConnectionString,
+        o => o.MigrationsHistoryTable("__EFMigrationsHistory", ApplicationDbContext.SchemaName)));
 builder.Services.AddContentModule(options =>
     options.UseNpgsql(
         postgresConnectionString,

src/Web/TestDataSeeder.cs

@@ -1,7 +1,7 @@
-using Hutopy.Infrastructure.Identity;
-using Hutopy.Web.Common;
+using Hutopy.Web.Common;
 using Hutopy.Web.Features.Contents.Data;
 using Hutopy.Web.Features.Messages.Data;
+using Hutopy.Web.Features.Users;
 
 namespace Hutopy.Web;
 

src/Web/Web.csproj

@@ -7,34 +7,30 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" />
-    <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="FastEndpoints" />
-    <PackageReference Include="JetBrains.Annotations" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
-    <PackageReference Include="NSwag.AspNetCore" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.22.2" />
+    <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2" />
+    <PackageReference Include="Azure.Identity" Version="1.13.0" />
+    <PackageReference Include="FastEndpoints" Version="5.30.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.10" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.10" />
+    <PackageReference Include="NSwag.AspNetCore" Version="14.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="FluentValidation.AspNetCore" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
+    <PackageReference Include="Stripe.net" Version="46.2.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Features\Contents\Migrations\" />
-    <Folder Include="Features\Messages\Migrations\" />
+    <Folder Include="Features\Users\Data\Migrations\" />
   </ItemGroup>
 
 </Project>

src/Web/appsettings.Development.json

@@ -9,7 +9,6 @@
   },
   "ConnectionStrings": {
     "AzureBlob": "DefaultEndpointsProtocol=https;AccountName=hutopyblob;AccountKey=AjK9vQMCIAG280PFIAWDjTtiFc/fIj/fb1NA9xtC7SLm6ZMZa/Agg0JFGYcHuJEaoZKDme7mNx/U+AStt9o7LQ==;EndpointSuffix=core.windows.net",
-    "MssqlConnection": "Server=localhost,1433;Initial Catalog=Hutopy;User Id=sa;Password=P@ssword123!;MultipleActiveResultSets=true;TrustServerCertificate=True;MultiSubnetFailover=True",
     "PostgresConnection": "Server=localhost,5432;Database=Hutopy;Uid=sa;Pwd=P@ssword123!;"
   },
   "Authentication": {