Squash merge main into feature branch

.github/pull_request_template.md

@@ -1,101 +0,0 @@
-## Summary
-
-<!--
-State WHAT is changing and WHY, in two to five sentences.
-A reader should understand the change without opening the diff.
-Describe the problem first, then the outcome.
--->
-
-## Type of change
-
-<!-- Tick the one option that best describes this PR. -->
-
-- [ ] Bug fix
-- [ ] New feature
-- [ ] Refactor (no change in behaviour)
-- [ ] Performance improvement
-- [ ] Documentation
-- [ ] Tests only
-- [ ] Build, CI or dependency update
-- [ ] Other (please specify):
-
-## Related issues
-
-<!--
-Link the issue(s) this PR relates to. Use one keyword per issue so that each is closed on merge:
-
-  Fixes #123
-  Fixes #124, fixes #125
-  Fixes owner/other-repo#456
-
-Closing keywords only take effect when the PR targets the repository's default branch.
-Use "Related to #123" if the PR should not close the issue.
-If there is no issue, write "N/A" and explain the motivation in the Summary.
--->
-
-## Approach and context
-
-<!--
-Explain how the change works and why this approach was chosen.
-Include, where relevant:
-  - The decisions you made that are not obvious from the code.
-  - Alternatives you considered and why you rejected them.
-  - Known limitations or shortcomings, and any planned follow-up work.
-  - Background such as benchmark results or design documents.
-
-Summarise the key points of any external link. Links may be inaccessible to future readers.
--->
-
-## How this was tested
-
-<!--
-Describe what you ran and what you observed. Be specific, and state only what you actually did.
-For example: the automated tests added or changed, manual steps and their outcome,
-environments or platforms covered, and anything you were unable to test.
-For a bug fix, note the test that fails without the fix.
--->
-
-## Compatibility and risk
-
-- [ ] This change is backwards compatible.
-- [ ] This change is **breaking** (complete the details below).
-- [ ] This change deprecates existing behaviour (complete the details below).
-
-<!--
-If breaking or deprecating, describe: what changes, who is affected,
-and the migration path or recommended alternative.
-Also note any deployment, configuration, data migration or rollback considerations.
--->
-
-## User-facing change
-
-<!--
-Does this PR change behaviour that users, operators or API consumers will notice?
-If not, write "None".
-If so, write one or two sentences suitable for release notes, in plain language and from the
-user's point of view. If users must take action when upgrading, state clearly that action is required.
--->
-
-```release-note
-
-```
-
-## Notes for reviewers
-
-<!--
-Help reviewers focus. For example:
-  - Where to start, or a suggested order in which to read the files.
-  - Areas where you would particularly value scrutiny, or where you are uncertain.
-  - How any mechanical, generated or bulk changes were produced (for example a search-and-replace
-    or a code generator), so that reviewers can reproduce the steps.
-  - Screenshots or recordings for visual changes (include before and after where useful).
--->
-
-## Checklist
-- [ ] The PR has a single, focused purpose and contains no unrelated changes.
-- [ ] The title is a clear, imperative summary of the change (for example, "Add retry to payment client").
-- [ ] I have added or updated tests that cover this change.
-- [ ] The build succeeds and the tests pass locally.
-- [ ] The code follows the existing patterns and style of this repository.
-- [ ] I have updated documentation, changelogs or API references where required.
-- [ ] I have reviewed my own diff, and this description reflects the final state of the change.

docs/web/database.md

@@ -76,14 +76,14 @@ updates (`UPDATE ... WHERE ... AND RowVersion = @RowVersion`).
 | `UserAccount`         | `Domain.Entities.UserAccount`, `Features.Users`             | `Username` and `Email` are unique                                                                                                                                                                         |
 | `UserCredential`      | `Domain.Entities.UserCredential`, `Features.Users`          | Argon2id password hash; `IsRevoked`/`RevokedAt` track credential rotation, not JWTs                                                                                                                       |
 | `UserVerification`    | `Domain.Entities.UserVerification`, `Features.Users`        | Written when a user confirms their email                                                                                                                                                                  |
-| `UserProfile`         | `Domain.Entities.UserProfile`, `Features.Users`             | 1:1 with `UserAccount`; holds the user's biography; written via `IUserProfileRepository`, read via `IUserListRepository`'s left joins in both `GetByIdAsync` and `GetAllAsync`                                                  |
+| `UserProfile`         | `Domain.Entities.UserProfile`, `Features.Users`             | 1:1 with `UserAccount`; holds the user's biography; written via `IUserProfileRepository`, read via `IUserListRepository.GetByIdAsync`'s left join                                                         |
-| `UserAvatar`          | `Domain.Entities.UserAvatar`, `Features.Users`              | Links a `UserProfile` to a `Photo` as its avatar; written via `IUserProfileRepository.SaveAvatarAsync`, read via `IUserListRepository`'s `ValidTo IS NULL` join for the active avatar                                                                                           |
+| `UserAvatar`          | `Domain.Entities.UserAvatar`, `Features.Users`              | Links a `UserProfile` to a `Photo` as its avatar; written via `IUserProfileRepository.SaveAvatarAsync`                                                                                                    |
 | `BreweryPost`         | `Domain.Entities.BreweryPost`, `Features.Breweries`         | A user-submitted brewery listing                                                                                                                                                                          |
 | `BreweryPostLocation` | `Domain.Entities.BreweryPostLocation`, `Features.Breweries` | 1:1 with `BreweryPost`; `Coordinates` is a `GEOGRAPHY` column, read via a plain Dapper query that selects `CONVERT(varbinary(max), Coordinates)`, since Dapper can't deserialize SQL Server UDTs directly |
 | `City`                | `Domain.Entities.City`, `Features.Locations`                | Referenced by `BreweryPostLocation.CityID`; `CityName` and `StateProvinceID` together are unique; written via `ILocationRepository`, read via `ILocationRepository` and `IBreweryRepository`'s location joins, currently written only by `Database.Seed` |
 | `StateProvince`       | `Domain.Entities.StateProvince`, `Features.Locations`       | Referenced by `City.StateProvinceID`; created on demand by `ILocationRepository.GetOrCreateCityIdAsync`, read via `IBreweryRepository`'s location joins                                                   |
 | `Country`             | `Domain.Entities.Country`, `Features.Locations`             | Referenced by `StateProvince.CountryID`; created on demand by `ILocationRepository.GetOrCreateCityIdAsync`, read via `IBreweryRepository`'s location joins                                                |
-| `Photo`               | `Domain.Entities.Photo`, `Features.PhotoUpload`             | Written via `IPhotoUploadRepository.CreateAsync`, sent as an `UploadPhotoCommand` from other features' handlers; `Hyperlink` holds the object key within the bucket, which readers sign into a time-limited URL via `IFileStorageProvider.GetPresignedUrl`; the active avatar's row is also read via `IUserListRepository`'s `Media.Photo` join; not yet seeded by `Database.Seed`                                                |
+| `Photo`               | `Domain.Entities.Photo`, `Features.PhotoUpload`             | Written via `IPhotoUploadRepository.CreateAsync`, sent as an `UploadPhotoCommand` from other features' handlers; not yet seeded by `Database.Seed`                                                        |
 
 ### Tables defined in the schema but not yet wired to a feature slice
 

docs/web/environment-variables.md

@@ -260,25 +260,17 @@ and retrieving photos via an S3-compatible object store.
 
 ```bash
 SEAWEEDFS_SERVICE_URL=http://seaweedfs:8333   # Required, no default
-SEAWEEDFS_PUBLIC_URL=http://localhost:8333    # Optional, defaults to SEAWEEDFS_SERVICE_URL
 SEAWEEDFS_ACCESS_KEY_ID=admin                 # Required, no default
 SEAWEEDFS_SECRET_ACCESS_KEY=secret            # Required, no default
 SEAWEEDFS_BUCKET=my-bucket                    # Required, no default
 ```
 
 - **Implementation**: `S3FileStorageProvider` throws on construction if any of
-  the four required values is missing
+  these four values is missing
 - **Local dev**: point at the `seaweedfs` Docker service (S3 API on port 8333)
 - **Production**: point at any S3-compatible endpoint (AWS S3, a hosted
   SeaweedFS cluster, and so on); `ForcePathStyle` is always enabled, which
   SeaweedFS requires and AWS S3 also accepts
-- **`SEAWEEDFS_PUBLIC_URL`**: the endpoint download URLs are signed against,
-  used by `GetPresignedUrl` and reaching the API response as
-  `PublicUserProfileDto.AvatarUrl`. A presigned URL is signed over its host, so
-  this has to be the address the browser uses (`http://localhost:8333` with the
-  dev compose file, which publishes the S3 API port), separate from the
-  in-network `SEAWEEDFS_SERVICE_URL` the API uploads through. The two can be the
-  same value wherever one address serves both
 
 ## Docker-specific variables
 
@@ -349,7 +341,6 @@ from the template in place; edit them manually if you go that route.
 | `SMTP_FROM_EMAIL`             |    ✓    |          |   ✓    |   Yes    | Email sender address         |
 | `SMTP_FROM_NAME`              |    ✓    |          |   ✓    |    No    | Defaults to `The Biergarten` |
 | `SEAWEEDFS_SERVICE_URL`       |    ✓    |          |   ✓    |   Yes    | S3-compatible endpoint URL   |
-| `SEAWEEDFS_PUBLIC_URL`        |    ✓    |          |   ✓    |    No    | Endpoint download URLs are signed against; defaults to `SEAWEEDFS_SERVICE_URL` |
 | `SEAWEEDFS_ACCESS_KEY_ID`     |    ✓    |          |   ✓    |   Yes    | S3 access key                |
 | `SEAWEEDFS_SECRET_ACCESS_KEY` |    ✓    |          |   ✓    |   Yes    | S3 secret key                |
 | `SEAWEEDFS_BUCKET`            |    ✓    |          |   ✓    |   Yes    | S3 bucket name               |
@@ -424,7 +415,6 @@ SMTP_FROM_NAME=The Biergarten App
 
 # SeaweedFS (S3-compatible storage)
 SEAWEEDFS_SERVICE_URL=http://seaweedfs:8333
-SEAWEEDFS_PUBLIC_URL=http://localhost:8333
 SEAWEEDFS_ACCESS_KEY_ID=<generated-with-openssl>
 SEAWEEDFS_SECRET_ACCESS_KEY=<generated-with-openssl>
 SEAWEEDFS_BUCKET=my-bucket

docs/web/testing.md

@@ -257,8 +257,7 @@ API.Specs/
 │   └── ApiGeneralSteps.cs              # Shared/general step definitions
 ├── Mocks/
 │   ├── MockEmailDispatcher.cs          # Substitutes Features.Emails' IEmailDispatcher
-│   ├── MockEmailProvider.cs            # Substitutes Features.Emails' IEmailProvider
+│   └── MockEmailProvider.cs            # Substitutes Features.Emails' IEmailProvider
-│   └── MockFileStorageProvider.cs      # Substitutes Features.ImageUploads' IFileStorageProvider
 └── TestApiFactory.cs                   # Test server setup (swaps in the mocks above)
 ```
 

web/.env.example

@@ -68,12 +68,8 @@ WEBSITE_BASE_URL=http://localhost:3000
 # ======================
 # SeaweedFS (S3) Configuration
 # ======================
-# Credentials and default bucket for the local SeaweedFS S3-compatible storage.
+# Credentials and default bucket for the local SeaweedFS S3-compatible storage
-# SEAWEEDFS_SERVICE_URL is the in-network endpoint the API uploads through;
-# SEAWEEDFS_PUBLIC_URL is the endpoint download URLs are signed against, so it has to be
-# reachable from the browser. It defaults to SEAWEEDFS_SERVICE_URL when left blank.
 SEAWEEDFS_SERVICE_URL=http://seaweedfs:8333
-SEAWEEDFS_PUBLIC_URL=http://localhost:8333
 SEAWEEDFS_ACCESS_KEY_ID=admin
 SEAWEEDFS_SECRET_ACCESS_KEY=secret
 SEAWEEDFS_BUCKET=my-bucket

web/backend/API/API.Specs/Features/PublicUserProfile.feature

@@ -60,14 +60,6 @@ Scenario: Listing user accounts exposes each account's avatar
     Then the response has HTTP status 200
     And my listed account should carry my current avatar
 
-Scenario: Listing user accounts exposes each account's biography
-    Given I have registered a new account
-    And I have a valid access token for my account
-    And I have set my biography to "Drinks lagers."
-    When I list user accounts
-    Then the response has HTTP status 200
-    And my listed account should carry my biography
-
 Scenario: Public profile for a non-existent account returns not found
     Given I have registered a new account
     And I have a valid access token for my account
@@ -114,14 +106,6 @@ Scenario: The caller can fetch their own account
     Then the response has HTTP status 200
     And the public profile response should match the registered account
 
-Scenario: The caller's own account omits the avatar graph
-    Given I have registered a new account
-    And I have a valid access token for my account
-    And I have uploaded an avatar
-    When I retrieve my own account
-    Then the response has HTTP status 200
-    And the response JSON should not contain "userAvatar"
-
 Scenario: The account endpoint serves the caller named by the access token
     Given I have registered a new account
     And I am logged in as a different user

web/backend/API/API.Specs/Mocks/MockFileStorageProvider.cs

@@ -8,17 +8,9 @@ namespace API.Specs.Mocks;
 /// </summary>
 public class MockFileStorageProvider : IFileStorageProvider
 {
-    private readonly List<string> _keys = [];
     private readonly Dictionary<string, byte[]> _objects = new();
 
-    public IReadOnlyCollection<string> UploadedKeys => _keys.ToList();
+    public IReadOnlyCollection<string> UploadedKeys => _objects.Keys.ToList();
-
-    /// <summary>The key of the most recent upload.</summary>
-    /// <exception cref="InvalidOperationException">Thrown when nothing has been uploaded yet.</exception>
-    public string LastUploadedKey =>
-        _keys.Count > 0
-            ? _keys[^1]
-            : throw new InvalidOperationException("no file has been uploaded");
 
     public Task UploadAsync(
         string key,
@@ -29,10 +21,6 @@ public class MockFileStorageProvider : IFileStorageProvider
     {
         using MemoryStream buffer = new();
         content.CopyTo(buffer);
-
-        if (!_objects.ContainsKey(key))
-            _keys.Add(key);
-
         _objects[key] = buffer.ToArray();
         return Task.CompletedTask;
     }
@@ -40,16 +28,11 @@ public class MockFileStorageProvider : IFileStorageProvider
     public Task DeleteAsync(string key, CancellationToken cancellationToken = default)
     {
         _objects.Remove(key);
-        _keys.Remove(key);
         return Task.CompletedTask;
     }
 
-    /// <summary>
-    ///     Stands in for a signed download URL: an absolute URL on a host the object store would serve,
-    ///     carrying the key in its path, so specs can assert the shape callers actually receive.
-    /// </summary>
     public string GetPresignedUrl(string key, TimeSpan expiresIn)
     {
-        return $"https://storage.test/{key}?X-Amz-Expires={(int)expiresIn.TotalSeconds}";
+        return $"https://storage.test/{key}";
     }
 }

web/backend/API/API.Specs/Steps/UserSteps.cs

@@ -1,8 +1,5 @@
 using System.Text.Json;
-using API.Specs.Mocks;
-using Features.ImageUploads.Services;
 using Features.Users.Commands.Profile.UploadAvatar;
-using Features.Users.Repository;
 using FluentAssertions;
 using MediatR;
 using Microsoft.AspNetCore.Http;
@@ -17,9 +14,8 @@ public class UserSteps(ScenarioContext scenario) : ApiStepsBase(scenario)
     private const string AccessTokenKey = "accessToken";
     private const string RegisteredUserIdKey = "registeredUserId";
     private const string RegisteredUsernameKey = "registeredUsername";
-    private const string CurrentAvatarKeyKey = "currentAvatarKey";
+    private const string CurrentAvatarUrlKey = "currentAvatarUrl";
-    private const string PreviousAvatarKeyKey = "previousAvatarKey";
+    private const string PreviousAvatarUrlKey = "previousAvatarUrl";
-    private const string BiographyKey = "biography";
 
     private static readonly byte[] PngSignature = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A];
 
@@ -64,71 +60,32 @@ public class UserSteps(ScenarioContext scenario) : ApiStepsBase(scenario)
         };
     }
 
-    /// <summary>
-    ///     Uploads an avatar and records the object key the storage provider actually received, rather
-    ///     than re-deriving the key template the handler uses.
-    /// </summary>
     private async Task UploadAvatarAsync()
     {
         Guid userId = GetRegisteredUserId();
 
         using IServiceScope scope = GetFactory().Services.CreateScope();
         IMediator mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
-        await mediator.Send(new UploadAvatarCommand(userId, CreateAvatarFile()));
+        Guid photoId = await mediator.Send(new UploadAvatarCommand(userId, CreateAvatarFile()));
 
-        if (Scenario.TryGetValue<string>(CurrentAvatarKeyKey, out string? existing))
+        if (Scenario.TryGetValue<string>(CurrentAvatarUrlKey, out string? existing))
-            Scenario[PreviousAvatarKeyKey] = existing;
+            Scenario[PreviousAvatarUrlKey] = existing;
 
-        Scenario[CurrentAvatarKeyKey] = GetStorageProvider().LastUploadedKey;
+        Scenario[CurrentAvatarUrlKey] = $"avatars/{userId}/{photoId}";
     }
 
-    private MockFileStorageProvider GetStorageProvider()
+    private string GetCurrentAvatarUrl()
     {
-        return (MockFileStorageProvider)
+        return Scenario.TryGetValue(CurrentAvatarUrlKey, out string? url) && url is not null
-            GetFactory().Services.GetRequiredService<IFileStorageProvider>();
+            ? url
-    }
-
-    private string GetCurrentAvatarKey()
-    {
-        return Scenario.TryGetValue(CurrentAvatarKeyKey, out string? key) && key is not null
-            ? key
             : throw new InvalidOperationException("no avatar has been uploaded in this scenario");
     }
 
-    private string GetPreviousAvatarKey()
+    private string GetPreviousAvatarUrl()
     {
-        return Scenario.TryGetValue(PreviousAvatarKeyKey, out string? key) && key is not null
+        return Scenario.TryGetValue(PreviousAvatarUrlKey, out string? url) && url is not null
-            ? key
+            ? url
-            : throw new InvalidOperationException(
+            : throw new InvalidOperationException("only one avatar has been uploaded in this scenario");
-                "only one avatar has been uploaded in this scenario"
-            );
-    }
-
-    /// <summary>
-    ///     Asserts that <paramref name="avatarUrl" /> is something a browser can fetch -- an absolute
-    ///     HTTP(S) URL -- pointing at the object stored under <paramref name="expectedKey" />. A bare
-    ///     storage key would resolve against the page's own origin, so the shape is the contract here,
-    ///     not just the value.
-    /// </summary>
-    private static Uri AssertFetchableUrl(string? avatarUrl, string expectedKey)
-    {
-        avatarUrl.Should().NotBeNullOrWhiteSpace();
-
-        Uri.TryCreate(avatarUrl, UriKind.Absolute, out Uri? uri)
-            .Should()
-            .BeTrue("avatarUrl must be an absolute URL, but was '{0}'", avatarUrl);
-        uri!.Scheme.Should().BeOneOf("http", "https");
-        uri.AbsolutePath.Should().EndWith(expectedKey, "the URL must address the uploaded object");
-
-        return uri;
-    }
-
-    private string GetAvatarUrlFromResponse()
-    {
-        Scenario.TryGetValue<string>(ResponseBodyKey, out string? responseBody).Should().BeTrue();
-
-        using JsonDocument doc = JsonDocument.Parse(responseBody!);
-        return doc.RootElement.GetProperty("avatarUrl").GetString()!;
     }
 
     [Given("I have uploaded an avatar")]
@@ -143,98 +100,59 @@ public class UserSteps(ScenarioContext scenario) : ApiStepsBase(scenario)
         await UploadAvatarAsync();
     }
 
-    /// <summary>
-    ///     Writes the biography straight through the repository: registration creates the profile row
-    ///     with an empty biography, and no endpoint edits it yet.
-    /// </summary>
-    [Given("I have set my biography to {string}")]
-    public async Task GivenIHaveSetMyBiographyTo(string biography)
-    {
-        using IServiceScope scope = GetFactory().Services.CreateScope();
-        IUserProfileRepository profiles =
-            scope.ServiceProvider.GetRequiredService<IUserProfileRepository>();
-
-        await profiles.UpdateBiographyAsync(
-            GetRegisteredUserId(),
-            biography,
-            CancellationToken.None
-        );
-
-        Scenario[BiographyKey] = biography;
-    }
-
     [Then("the public profile response should carry my current avatar")]
     public void ThenThePublicProfileResponseShouldCarryMyCurrentAvatar()
     {
-        AssertFetchableUrl(GetAvatarUrlFromResponse(), GetCurrentAvatarKey());
+        Scenario.TryGetValue<string>(ResponseBodyKey, out string? responseBody).Should().BeTrue();
+
+        using JsonDocument doc = JsonDocument.Parse(responseBody!);
+        doc.RootElement.GetProperty("avatarUrl").GetString().Should().Be(GetCurrentAvatarUrl());
     }
 
     [Then("the public profile response should not carry my previous avatar")]
     public void ThenThePublicProfileResponseShouldNotCarryMyPreviousAvatar()
     {
-        Uri uri = AssertFetchableUrl(GetAvatarUrlFromResponse(), GetCurrentAvatarKey());
+        Scenario.TryGetValue<string>(ResponseBodyKey, out string? responseBody).Should().BeTrue();
-        uri.AbsolutePath.Should().NotContain(GetPreviousAvatarKey());
+
+        using JsonDocument doc = JsonDocument.Parse(responseBody!);
+        doc.RootElement.GetProperty("avatarUrl").GetString().Should().NotBe(GetPreviousAvatarUrl());
     }
 
     [Then("my listed account should carry my current avatar")]
     public void ThenMyListedAccountShouldCarryMyCurrentAvatar()
-    {
-        AssertFetchableUrl(
-            GetMyListedAccount().GetProperty("avatarUrl").GetString(),
-            GetCurrentAvatarKey()
-        );
-    }
-
-    [Then("my listed account should carry my biography")]
-    public void ThenMyListedAccountShouldCarryMyBiography()
-    {
-        string expected =
-            Scenario.TryGetValue(BiographyKey, out string? biography) && biography is not null
-                ? biography
-                : throw new InvalidOperationException("no biography was set in this scenario");
-
-        GetMyListedAccount().GetProperty("biography").GetString().Should().Be(expected);
-    }
-
-    /// <summary>Finds the registered account in a listing response.</summary>
-    private JsonElement GetMyListedAccount()
     {
         Scenario.TryGetValue<string>(ResponseBodyKey, out string? responseBody).Should().BeTrue();
 
         using JsonDocument doc = JsonDocument.Parse(responseBody!);
         doc.RootElement.ValueKind.Should().Be(JsonValueKind.Array);
 
-        return doc
+        JsonElement listed = doc
             .RootElement.EnumerateArray()
             .Should()
             .ContainSingle(item =>
                 item.GetProperty("userAccountId").GetGuid() == GetRegisteredUserId()
             )
-            .Subject.Clone();
+            .Subject;
+
+        listed.GetProperty("avatarUrl").GetString().Should().Be(GetCurrentAvatarUrl());
     }
 
     [When("I retrieve the public profile by ID")]
     public async Task WhenIRetrieveThePublicProfileById()
     {
-        await SendAsync(
+        await SendAsync(NewAuthenticatedRequest(HttpMethod.Get, $"/api/user/{GetRegisteredUserId()}/profile"));
-            NewAuthenticatedRequest(HttpMethod.Get, $"/api/user/{GetRegisteredUserId()}/profile")
-        );
     }
 
     [When("I retrieve the public profile by ID without authentication")]
     public async Task WhenIRetrieveThePublicProfileByIdWithoutAuthentication()
     {
-        await SendAsync(
+        await SendAsync(new HttpRequestMessage(HttpMethod.Get, $"/api/user/{GetRegisteredUserId()}/profile"));
-            new HttpRequestMessage(HttpMethod.Get, $"/api/user/{GetRegisteredUserId()}/profile")
-        );
     }
 
     [When("I retrieve the public profile by a non-existent ID")]
     public async Task WhenIRetrieveThePublicProfileByANonExistentId()
     {
-        await SendAsync(
+        await SendAsync(NewAuthenticatedRequest(HttpMethod.Get, $"/api/user/{Guid.NewGuid()}/profile"));
-            NewAuthenticatedRequest(HttpMethod.Get, $"/api/user/{Guid.NewGuid()}/profile")
-        );
     }
 
     [When("I retrieve my own account without authentication")]

web/backend/Configuration/ConfigurationKeys.cs

@@ -23,14 +23,6 @@ public static class ConfigurationKeys
     public const string SmtpFromName = "SMTP_FROM_NAME";
 
     public const string SeaweedFsServiceUrl = "SEAWEEDFS_SERVICE_URL";
-
-    /// <summary>
-    ///     The browser-reachable base URL of the object store, used to sign download URLs. Falls back to
-    ///     <see cref="SeaweedFsServiceUrl" /> when unset: SigV4 covers the host, so a URL signed against
-    ///     the container-internal endpoint is only usable by callers that can resolve that host.
-    /// </summary>
-    public const string SeaweedFsPublicUrl = "SEAWEEDFS_PUBLIC_URL";
-
     public const string SeaweedFsAccessKeyId = "SEAWEEDFS_ACCESS_KEY_ID";
     public const string SeaweedFsSecretAccessKey = "SEAWEEDFS_SECRET_ACCESS_KEY";
     public const string SeaweedFsBucket = "SEAWEEDFS_BUCKET";

web/backend/Domain/Domain.Entities/Entities/UserAccount.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace Domain.Entities;
 
 public sealed class UserAccount
@@ -22,10 +20,5 @@ public sealed class UserAccount
     // Navigation properties
     public UserCredential? UserCredential { get; set; }
     public UserProfile? UserProfile { get; set; }
-
-    // GET /api/user/authenticated serializes this entity directly, and the avatar graph carries the
-    // storage key and uploader of the underlying Photo. Clients read the avatar from
-    // PublicUserProfileDto.AvatarUrl, which is a signed URL, so keep this one out of the response.
-    [JsonIgnore]
     public UserAvatar? UserAvatar { get; set; }
 }

web/backend/Features/Features.PhotoUpload/Services/S3FileStorageProvider.cs

@@ -13,14 +13,11 @@ public class S3FileStorageProvider : IFileStorageProvider, IDisposable
 {
     private readonly string _bucket;
     private readonly IAmazonS3 _client;
-    private readonly IAmazonS3 _presignClient;
-    private readonly Protocol _presignProtocol;
 
     /// <summary>
     ///     Initializes a new instance of the <see cref="S3FileStorageProvider" /> class, reading storage
     ///     configuration (<c>SEAWEEDFS_SERVICE_URL</c>, <c>SEAWEEDFS_ACCESS_KEY_ID</c>,
-    ///     <c>SEAWEEDFS_SECRET_ACCESS_KEY</c>, <c>SEAWEEDFS_BUCKET</c>, and the optional
+    ///     <c>SEAWEEDFS_SECRET_ACCESS_KEY</c>, <c>SEAWEEDFS_BUCKET</c>) from <paramref name="configuration" />.
-    ///     <c>SEAWEEDFS_PUBLIC_URL</c>) from <paramref name="configuration" />.
     /// </summary>
     /// <exception cref="InvalidOperationException">
     ///     Thrown when any of the required configuration values is not set.
@@ -48,31 +45,6 @@ public class S3FileStorageProvider : IFileStorageProvider, IDisposable
         AmazonS3Config config = new() { ServiceURL = serviceUrl, ForcePathStyle = true };
 
         _client = new AmazonS3Client(accessKeyId, secretAccessKey, config);
-
-        // A presigned URL is signed over its host, so one signed against the container-internal
-        // endpoint is only usable from inside the network. Sign downloads against the public
-        // endpoint instead, so a browser can fetch the object.
-        string? configuredPublicUrl = configuration[ConfigurationKeys.SeaweedFsPublicUrl];
-        string publicUrl = string.IsNullOrWhiteSpace(configuredPublicUrl)
-            ? serviceUrl
-            : configuredPublicUrl;
-
-        _presignClient =
-            publicUrl == serviceUrl
-                ? _client
-                : new AmazonS3Client(
-                    accessKeyId,
-                    secretAccessKey,
-                    new AmazonS3Config { ServiceURL = publicUrl, ForcePathStyle = true }
-                );
-
-        // GetPreSignedUrlRequest.Protocol defaults to HTTPS and ignores the ServiceURL scheme, so
-        // take the scheme from the endpoint the URL is signed against.
-        _presignProtocol =
-            Uri.TryCreate(publicUrl, UriKind.Absolute, out Uri? publicUri)
-            && publicUri.Scheme == Uri.UriSchemeHttp
-                ? Protocol.HTTP
-                : Protocol.HTTPS;
     }
 
     /// <inheritdoc/>
@@ -110,18 +82,14 @@ public class S3FileStorageProvider : IFileStorageProvider, IDisposable
             BucketName = _bucket,
             Key = key,
             Expires = DateTime.UtcNow.Add(expiresIn),
-            Protocol = _presignProtocol,
         };
 
-        return _presignClient.GetPreSignedURL(request);
+        return _client.GetPreSignedURL(request);
     }
 
     /// <inheritdoc/>
     public void Dispose()
     {
-        if (!ReferenceEquals(_presignClient, _client))
-            _presignClient.Dispose();
-
         _client.Dispose();
         GC.SuppressFinalize(this);
     }

web/backend/Features/Features.Users.Tests/Queries/GetAllUsersHandlerTests.cs

@@ -1,5 +1,4 @@
 using Domain.Entities;
-using Features.ImageUploads.Services;
 using Features.Users.Dtos;
 using Features.Users.Queries.GetAllUsers;
 using Features.Users.Repository;
@@ -10,36 +9,27 @@ namespace Features.Users.Tests.Queries;
 
 public class GetAllUsersHandlerTests
 {
-    private readonly Mock<IUserListRepository> _repoMock = new();
-    private readonly Mock<IFileStorageProvider> _storageMock = new();
-    private readonly GetAllUsersHandler _handler;
-
-    public GetAllUsersHandlerTests()
-    {
-        _storageMock
-            .Setup(s => s.GetPresignedUrl(It.IsAny<string>(), It.IsAny<TimeSpan>()))
-            .Returns((string key, TimeSpan _) => $"https://storage.test/{key}?signed");
-
-        _handler = new GetAllUsersHandler(_repoMock.Object, _storageMock.Object);
-    }
-
     [Fact]
     public async Task Handle_PassesLimitAndOffset_ToRepository()
     {
-        _repoMock.Setup(r => r.GetAllAsync(10, 5)).ReturnsAsync(Array.Empty<UserAccount>());
+        Mock<IUserListRepository> repoMock = new();
+        GetAllUsersHandler handler = new(repoMock.Object);
+        repoMock.Setup(r => r.GetAllAsync(10, 5)).ReturnsAsync(Array.Empty<UserAccount>());
 
-        IEnumerable<PublicUserProfileDto> result = await _handler.Handle(
+        IEnumerable<PublicUserProfileDto> result = await handler.Handle(
             new GetAllUsersQuery(10, 5),
             CancellationToken.None
         );
 
         result.Should().BeEmpty();
-        _repoMock.Verify(r => r.GetAllAsync(10, 5), Times.Once);
+        repoMock.Verify(r => r.GetAllAsync(10, 5), Times.Once);
     }
 
     [Fact]
     public async Task Handle_MapsUsersToPublicProfileDtos_AndExcludesPrivateFields()
     {
+        Mock<IUserListRepository> repoMock = new();
+        GetAllUsersHandler handler = new(repoMock.Object);
         UserAccount user = new()
         {
             UserAccountId = Guid.NewGuid(),
@@ -48,24 +38,21 @@ public class GetAllUsersHandlerTests
             LastName = "One",
             CreatedAt = DateTime.UtcNow,
         };
-        _repoMock.Setup(r => r.GetAllAsync(null, null)).ReturnsAsync([user]);
+        repoMock.Setup(r => r.GetAllAsync(null, null)).ReturnsAsync([user]);
 
-        IEnumerable<PublicUserProfileDto> result = await _handler.Handle(
+        IEnumerable<PublicUserProfileDto> result = await handler.Handle(
             new GetAllUsersQuery(null, null),
             CancellationToken.None
         );
 
-        result
+        result.Should().ContainSingle().Which.Should().BeEquivalentTo(user.ToPublicProfileDto());
-            .Should()
-            .ContainSingle()
-            .Which.Should()
-            .BeEquivalentTo(user.ToPublicProfileDto(_storageMock.Object));
     }
 
     [Fact]
     public async Task Handle_MapsEachUsersOwnAvatarUrl()
     {
-        string avatarKey = $"avatars/{Guid.NewGuid()}/{Guid.NewGuid()}";
+        Mock<IUserListRepository> repoMock = new();
+        GetAllUsersHandler handler = new(repoMock.Object);
         UserAccount withAvatar = new()
         {
             UserAccountId = Guid.NewGuid(),
@@ -74,7 +61,10 @@ public class GetAllUsersHandlerTests
             LastName = "Avatar",
             CreatedAt = DateTime.UtcNow,
             UserProfile = new UserProfile { Biography = "Drinks lagers." },
-            UserAvatar = new UserAvatar { Photo = new Photo { Hyperlink = avatarKey } },
+            UserAvatar = new UserAvatar
+            {
+                Photo = new Photo { Hyperlink = "https://cdn.example.com/avatar.jpg" },
+            },
         };
         UserAccount withoutAvatar = new()
         {
@@ -84,9 +74,9 @@ public class GetAllUsersHandlerTests
             LastName = "Avatar",
             CreatedAt = DateTime.UtcNow,
         };
-        _repoMock.Setup(r => r.GetAllAsync(null, null)).ReturnsAsync([withAvatar, withoutAvatar]);
+        repoMock.Setup(r => r.GetAllAsync(null, null)).ReturnsAsync([withAvatar, withoutAvatar]);
 
-        IEnumerable<PublicUserProfileDto> result = await _handler.Handle(
+        IEnumerable<PublicUserProfileDto> result = await handler.Handle(
             new GetAllUsersQuery(null, null),
             CancellationToken.None
         );
@@ -94,14 +84,6 @@ public class GetAllUsersHandlerTests
         result
             .Select(dto => dto.AvatarUrl)
             .Should()
-            .Equal($"https://storage.test/{avatarKey}?signed", string.Empty);
+            .Equal("https://cdn.example.com/avatar.jpg", string.Empty);
-        _storageMock.Verify(
-            s => s.GetPresignedUrl(avatarKey, UserDtoMapper.AvatarUrlLifetime),
-            Times.Once
-        );
-        _storageMock.Verify(
-            s => s.GetPresignedUrl(It.IsAny<string>(), It.IsAny<TimeSpan>()),
-            Times.Once
-        );
     }
 }

web/backend/Features/Features.Users.Tests/Queries/GetPublicUserProfileByIdHandlerTests.cs

@@ -1,6 +1,5 @@
 using Domain.Entities;
 using Domain.Exceptions;
-using Features.ImageUploads.Services;
 using Features.Users.Dtos;
 using Features.Users.Queries.GetPublicUserProfileById;
 using Features.Users.Repository;
@@ -13,21 +12,15 @@ public class GetPublicUserProfileByIdHandlerTests
 {
     private readonly GetPublicUserProfileByIdHandler _handler;
     private readonly Mock<IUserListRepository> _repoMock = new();
-    private readonly Mock<IFileStorageProvider> _storageMock = new();
 
     public GetPublicUserProfileByIdHandlerTests()
     {
-        _storageMock
+        _handler = new GetPublicUserProfileByIdHandler(_repoMock.Object);
-            .Setup(s => s.GetPresignedUrl(It.IsAny<string>(), It.IsAny<TimeSpan>()))
-            .Returns((string key, TimeSpan _) => $"https://storage.test/{key}?signed");
-
-        _handler = new GetPublicUserProfileByIdHandler(_repoMock.Object, _storageMock.Object);
     }
 
     [Fact]
     public async Task Handle_ReturnsPublicProfile_WhenFound()
     {
-        string avatarKey = $"avatars/{Guid.NewGuid()}/{Guid.NewGuid()}";
         UserAccount user = new()
         {
             UserAccountId = Guid.NewGuid(),
@@ -38,7 +31,10 @@ public class GetPublicUserProfileByIdHandlerTests
             DateOfBirth = new DateTime(1990, 1, 1),
             CreatedAt = new DateTime(2024, 1, 1),
             UserProfile = new UserProfile { Biography = "Drinks lagers." },
-            UserAvatar = new UserAvatar { Photo = new Photo { Hyperlink = avatarKey } },
+            UserAvatar = new UserAvatar
+            {
+                Photo = new Photo { Hyperlink = "https://cdn.example.com/avatar.jpg" },
+            },
         };
         _repoMock.Setup(r => r.GetByIdAsync(user.UserAccountId)).ReturnsAsync(user);
 
@@ -56,46 +52,12 @@ public class GetPublicUserProfileByIdHandlerTests
                     user.FirstName,
                     user.LastName,
                     "Drinks lagers.",
-                    $"https://storage.test/{avatarKey}?signed",
+                    "https://cdn.example.com/avatar.jpg",
                     user.CreatedAt
                 )
             );
     }
 
-    /// <summary>
-    ///     <c>Photo.Hyperlink</c> holds an object key, so the DTO has to carry a signed URL rather than
-    ///     the stored value: a bare key resolves against the calling page's own origin.
-    /// </summary>
-    [Fact]
-    public async Task Handle_SignsTheAvatarKey_RatherThanReturningIt()
-    {
-        string avatarKey = $"avatars/{Guid.NewGuid()}/{Guid.NewGuid()}";
-        UserAccount user = new()
-        {
-            UserAccountId = Guid.NewGuid(),
-            Username = "test",
-            FirstName = "Jane",
-            LastName = "Doe",
-            CreatedAt = new DateTime(2024, 1, 1),
-            UserAvatar = new UserAvatar { Photo = new Photo { Hyperlink = avatarKey } },
-        };
-        _repoMock.Setup(r => r.GetByIdAsync(user.UserAccountId)).ReturnsAsync(user);
-
-        PublicUserProfileDto result = await _handler.Handle(
-            new GetPublicUserProfileByIdQuery(user.UserAccountId),
-            CancellationToken.None
-        );
-
-        result.AvatarUrl.Should().NotBe(avatarKey);
-        Uri.TryCreate(result.AvatarUrl, UriKind.Absolute, out Uri? uri).Should().BeTrue();
-        uri!.Scheme.Should().BeOneOf("http", "https");
-        uri.AbsolutePath.Should().EndWith(avatarKey);
-        _storageMock.Verify(
-            s => s.GetPresignedUrl(avatarKey, UserDtoMapper.AvatarUrlLifetime),
-            Times.Once
-        );
-    }
-
     [Fact]
     public async Task Handle_ReturnsEmptyBiographyAndAvatarUrl_WhenProfileMissing()
     {
@@ -162,10 +124,6 @@ public class GetPublicUserProfileByIdHandlerTests
         );
 
         result.AvatarUrl.Should().BeEmpty();
-        _storageMock.Verify(
-            s => s.GetPresignedUrl(It.IsAny<string>(), It.IsAny<TimeSpan>()),
-            Times.Never
-        );
     }
 
     [Fact]

web/backend/Features/Features.Users/Dtos/UserDtoMapper.cs

@@ -1,39 +1,20 @@
 using Domain.Entities;
-using Features.ImageUploads.Services;
 
 namespace Features.Users.Dtos;
 
 /// <summary>Converts user domain entities into API response models.</summary>
 public static class UserDtoMapper
 {
-    /// <summary>
-    ///     How long a presigned avatar URL stays valid. Long enough to outlive the page that embeds it,
-    ///     short enough that a leaked URL stops working.
-    /// </summary>
-    public static readonly TimeSpan AvatarUrlLifetime = TimeSpan.FromHours(1);
-
     /// <summary>Converts a user account into its public-profile representation.</summary>
-    /// <param name="user">The account to convert.</param>
+    public static PublicUserProfileDto ToPublicProfileDto(this UserAccount user)
-    /// <param name="fileStorageProvider">
-    ///     Signs the download URL for the account's avatar. <c>Photo.Hyperlink</c> holds an object key
-    ///     rather than a URL, so it has to be signed before a client can fetch it.
-    /// </param>
-    public static PublicUserProfileDto ToPublicProfileDto(
-        this UserAccount user,
-        IFileStorageProvider fileStorageProvider
-    )
     {
-        string? avatarKey = user.UserAvatar?.Photo?.Hyperlink;
-
         return new PublicUserProfileDto(
             UserAccountId : user.UserAccountId,
             Username : user.Username,
             FirstName : user.FirstName,
             LastName : user.LastName,
             Biography : user.UserProfile?.Biography ?? string.Empty,
-            AvatarUrl : string.IsNullOrWhiteSpace(avatarKey)
+            AvatarUrl : user.UserAvatar?.Photo?.Hyperlink ?? string.Empty,
-                ? string.Empty
-                : fileStorageProvider.GetPresignedUrl(avatarKey, AvatarUrlLifetime),
             CreatedAt : user.CreatedAt
         );
     }

web/backend/Features/Features.Users/Queries/GetAllUsers/GetAllUsersHandler.cs

@@ -1,15 +1,12 @@
 using Domain.Entities;
-using Features.ImageUploads.Services;
 using Features.Users.Dtos;
 using Features.Users.Repository;
 using MediatR;
 
 namespace Features.Users.Queries.GetAllUsers;
 
-public class GetAllUsersHandler(
+public class GetAllUsersHandler(IUserListRepository repository)
-    IUserListRepository repository,
+    : IRequestHandler<GetAllUsersQuery, IEnumerable<PublicUserProfileDto>>
-    IFileStorageProvider fileStorageProvider
-) : IRequestHandler<GetAllUsersQuery, IEnumerable<PublicUserProfileDto>>
 {
     public async Task<IEnumerable<PublicUserProfileDto>> Handle(
         GetAllUsersQuery request,
@@ -17,6 +14,6 @@ public class GetAllUsersHandler(
     )
     {
         IEnumerable<UserAccount> users = await repository.GetAllAsync(request.Limit, request.Offset);
-        return users.Select(user => user.ToPublicProfileDto(fileStorageProvider));
+        return users.Select(user => user.ToPublicProfileDto());
     }
 }

web/backend/Features/Features.Users/Queries/GetPublicUserProfileById/GetPublicUserProfileByIdHandler.cs

@@ -1,16 +1,13 @@
 using Domain.Entities;
 using Domain.Exceptions;
-using Features.ImageUploads.Services;
 using Features.Users.Dtos;
 using Features.Users.Repository;
 using MediatR;
 
 namespace Features.Users.Queries.GetPublicUserProfileById;
 
-public class GetPublicUserProfileByIdHandler(
+public class GetPublicUserProfileByIdHandler(IUserListRepository repository)
-    IUserListRepository repository,
+    : IRequestHandler<GetPublicUserProfileByIdQuery, PublicUserProfileDto>
-    IFileStorageProvider fileStorageProvider
-) : IRequestHandler<GetPublicUserProfileByIdQuery, PublicUserProfileDto>
 {
     /// <exception cref="NotFoundException">Thrown when no user account exists with the given ID.</exception>
     public async Task<PublicUserProfileDto> Handle(
@@ -21,6 +18,6 @@ public class GetPublicUserProfileByIdHandler(
         UserAccount? user = await repository.GetByIdAsync(request.UserAccountId);
         if (user is null)
             throw new NotFoundException($"User with ID {request.UserAccountId} not found");
-        return user.ToPublicProfileDto(fileStorageProvider);
+        return user.ToPublicProfileDto();
     }
 }

web/backend/Features/Features.Users/Repository/UserListRepository.cs

@@ -13,13 +13,6 @@ public class UserListRepository(ISqlConnectionFactory connectionFactory)
         IUserListRepository
 {
     /// <inheritdoc />
-    /// <remarks>
-    ///     Left-joins <c>Social.UserProfile</c>, so <see cref="UserAccount.UserProfile" /> is
-    ///     <c>null</c> for an account whose profile has yet to be created, and left-joins the
-    ///     account's active <c>Social.UserAvatar</c> (<c>ValidTo IS NULL</c>) with its
-    ///     <c>Media.Photo</c>, so <see cref="UserAccount.UserAvatar" /> is <c>null</c> for an account
-    ///     with no avatar.
-    /// </remarks>
     public async Task<UserAccount?> GetByIdAsync(Guid id)
     {
         await using DbConnection connection = await CreateConnection();
@@ -57,14 +50,6 @@ public class UserListRepository(ISqlConnectionFactory connectionFactory)
     }
 
     /// <inheritdoc />
-    /// <remarks>
-    ///     Always applies pagination via <c>OFFSET</c>/<c>FETCH</c>, ordered by creation date descending.
-    ///     A <c>null</c> <paramref name="limit" />/<paramref name="offset" /> is treated as "no limit"/"no offset".
-    ///     Joins the same profile and active-avatar rows as <see cref="GetByIdAsync" />, both of which are
-    ///     part of a public profile. Does not select <c>Email</c> or <c>DateOfBirth</c>: this listing is
-    ///     consumed only as public profiles, so those fields are left at their default rather than read
-    ///     from the database.
-    /// </remarks>
     public async Task<IEnumerable<UserAccount>> GetAllAsync(int? limit, int? offset)
     {
         await using DbConnection connection = await CreateConnection();

web/docker-compose.db.yaml

@@ -70,7 +70,6 @@ services:
       DB_USER: "${DB_USER}"
       DB_PASSWORD: "${DB_PASSWORD}"
       SEAWEEDFS_SERVICE_URL: "${SEAWEEDFS_SERVICE_URL}"
-      SEAWEEDFS_PUBLIC_URL: "${SEAWEEDFS_PUBLIC_URL}"
       SEAWEEDFS_ACCESS_KEY_ID: "${SEAWEEDFS_ACCESS_KEY_ID}"
       SEAWEEDFS_SECRET_ACCESS_KEY: "${SEAWEEDFS_SECRET_ACCESS_KEY}"
       SEAWEEDFS_BUCKET: "${SEAWEEDFS_BUCKET}"

web/docker-compose.dev.yaml

@@ -72,7 +72,6 @@ services:
       DB_USER: "${DB_USER}"
       DB_PASSWORD: "${DB_PASSWORD}"
       SEAWEEDFS_SERVICE_URL: "${SEAWEEDFS_SERVICE_URL}"
-      SEAWEEDFS_PUBLIC_URL: "${SEAWEEDFS_PUBLIC_URL}"
       SEAWEEDFS_ACCESS_KEY_ID: "${SEAWEEDFS_ACCESS_KEY_ID}"
       SEAWEEDFS_SECRET_ACCESS_KEY: "${SEAWEEDFS_SECRET_ACCESS_KEY}"
       SEAWEEDFS_BUCKET: "${SEAWEEDFS_BUCKET}"
@@ -111,7 +110,6 @@ services:
       CONFIRMATION_TOKEN_SECRET: "${CONFIRMATION_TOKEN_SECRET}"
       WEBSITE_BASE_URL: "${WEBSITE_BASE_URL}"
       SEAWEEDFS_SERVICE_URL: "${SEAWEEDFS_SERVICE_URL}"
-      SEAWEEDFS_PUBLIC_URL: "${SEAWEEDFS_PUBLIC_URL}"
       SEAWEEDFS_ACCESS_KEY_ID: "${SEAWEEDFS_ACCESS_KEY_ID}"
       SEAWEEDFS_SECRET_ACCESS_KEY: "${SEAWEEDFS_SECRET_ACCESS_KEY}"
       SEAWEEDFS_BUCKET: "${SEAWEEDFS_BUCKET}"

web/docker-compose.min.yaml

@@ -84,7 +84,6 @@ services:
       DB_USER: "${DB_USER}"
       DB_PASSWORD: "${DB_PASSWORD}"
       SEAWEEDFS_SERVICE_URL: "${SEAWEEDFS_SERVICE_URL}"
-      SEAWEEDFS_PUBLIC_URL: "${SEAWEEDFS_PUBLIC_URL}"
       SEAWEEDFS_ACCESS_KEY_ID: "${SEAWEEDFS_ACCESS_KEY_ID}"
       SEAWEEDFS_SECRET_ACCESS_KEY: "${SEAWEEDFS_SECRET_ACCESS_KEY}"
       SEAWEEDFS_BUCKET: "${SEAWEEDFS_BUCKET}"

web/docker-compose.prod.seed.yaml

@@ -19,7 +19,6 @@ services:
       DB_USER: "${DB_USER}"
       DB_PASSWORD: "${DB_PASSWORD}"
       SEAWEEDFS_SERVICE_URL: "${SEAWEEDFS_SERVICE_URL}"
-      SEAWEEDFS_PUBLIC_URL: "${SEAWEEDFS_PUBLIC_URL}"
       SEAWEEDFS_ACCESS_KEY_ID: "${SEAWEEDFS_ACCESS_KEY_ID}"
       SEAWEEDFS_SECRET_ACCESS_KEY: "${SEAWEEDFS_SECRET_ACCESS_KEY}"
       SEAWEEDFS_BUCKET: "${SEAWEEDFS_BUCKET}"

web/docker-compose.prod.yaml

@@ -51,7 +51,6 @@ services:
       CONFIRMATION_TOKEN_SECRET: "${CONFIRMATION_TOKEN_SECRET}"
       WEBSITE_BASE_URL: "${WEBSITE_BASE_URL}"
       SEAWEEDFS_SERVICE_URL: "${SEAWEEDFS_SERVICE_URL}"
-      SEAWEEDFS_PUBLIC_URL: "${SEAWEEDFS_PUBLIC_URL}"
       SEAWEEDFS_ACCESS_KEY_ID: "${SEAWEEDFS_ACCESS_KEY_ID}"
       SEAWEEDFS_SECRET_ACCESS_KEY: "${SEAWEEDFS_SECRET_ACCESS_KEY}"
       SEAWEEDFS_BUCKET: "${SEAWEEDFS_BUCKET}"

web/docker-compose.test.yaml

@@ -70,7 +70,6 @@ services:
       DB_USER: "${DB_USER}"
       DB_PASSWORD: "${DB_PASSWORD}"
       SEAWEEDFS_SERVICE_URL: "${SEAWEEDFS_SERVICE_URL}"
-      SEAWEEDFS_PUBLIC_URL: "${SEAWEEDFS_PUBLIC_URL}"
       SEAWEEDFS_ACCESS_KEY_ID: "${SEAWEEDFS_ACCESS_KEY_ID}"
       SEAWEEDFS_SECRET_ACCESS_KEY: "${SEAWEEDFS_SECRET_ACCESS_KEY}"
       SEAWEEDFS_BUCKET: "${SEAWEEDFS_BUCKET}"

web/frontend/app/features/users/USER_PROFILE_HANDOFF.md

@@ -6,21 +6,21 @@ Covers `/users/:id` (`routes/user-profile.tsx`). Mirrors the format of
 ## Status legend
 
 - ✅ **Available**: real data, wired up.
-- ⚠️ **Partial**: reads real data, but a related gap remains (see the Gap column).
+- ⚠️ **Partial**: schema/repository exists but no public read endpoint.
 - ❌ **Missing**: no backend support; page shows filler or local-only state.
 
 ## Header & sidebar
 
-| Field                                    | Status | Source                                                    | Gap                                                                                                                                                                                                  |
+| Field                                    | Status | Source                                                    | Gap                                                                                                                                                      |
-| ---------------------------------------- | ------ | --------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| ---------------------------------------- | ------ | --------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Username, name, joined date              | ✅     | `GET /api/user/{id}/profile` (`PublicUserProfileDto`)     |                                                                                                                                                                                                      |
+| Username, name, joined date              | ✅     | `GET /api/user/{id}/profile` (`PublicUserProfileDto`)     |                                                                                                                                                          |
-| `isOwnProfile`                           | ✅     | Compares the session's `userAccountId` to the route param |                                                                                                                                                                                                      |
+| `isOwnProfile`                           | ✅     | Compares the session's `userAccountId` to the route param |                                                                                                                                                          |
-| Bio                                      | ✅     | `GET /api/user/{id}/profile` (`PublicUserProfileDto`)     | Reads `Social.UserProfile.Biography` via the left join in `UserListRepository.GetByIdAsync`; an account with no profile row yet returns an empty string.                                             |
+| Bio                                      | ✅     | `GET /api/user/{id}/profile` (`PublicUserProfileDto`)     | Reads `Social.UserProfile.Biography` via the left join in `UserListRepository.GetByIdAsync`; an account with no profile row yet returns an empty string. |
-| Location                                 | ❌     | `FILLER_PROFILE_META.location`                            | No location field on `UserAccount` or `UserProfile`.                                                                                                                                                 |
+| Location                                 | ❌     | `FILLER_PROFILE_META.location`                            | No location field on `UserAccount` or `UserProfile`.                                                                                                     |
-| Avatar photo                             | ⚠️     | `GET /api/user/{id}/profile` (`PublicUserProfileDto`)     | Reads the current `Social.UserAvatar` photo via the left joins in `UserListRepository.GetByIdAsync` and signs it into `avatarUrl`; an account with no avatar returns an empty string and `ProfileAvatar` shows initials. `UploadAvatarCommand` has no HTTP route yet, so only accounts created by `Database.Seed` have one — see (4) below.                                                                       |
+| Avatar photo                             | ⚠️     | Initials placeholder (`avatar-placeholder`)               | `Social.UserAvatar` + `UploadAvatarHandler` exist but there's no GET endpoint to read a user's stored avatar back.                                       |
-| Cover photo                              | ❌     | Flat `bg-base-300` block                                  | No cover-photo concept anywhere in the schema.                                                                                                                                                       |
+| Cover photo                              | ❌     | Flat `bg-base-300` block                                  | No cover-photo concept anywhere in the schema.                                                                                                           |
-| Following / Followers counts             | ❌     | `FILLER_PROFILE_META.following` / `.followers`            | `Social.UserFollow` table exists but is unused by any query/controller — needs count queries (`WHERE UserAccountID = ?` / `WHERE FollowingID = ?`).                                                  |
+| Following / Followers counts             | ❌     | `FILLER_PROFILE_META.following` / `.followers`            | `Social.UserFollow` table exists but is unused by any query/controller — needs count queries (`WHERE UserAccountID = ?` / `WHERE FollowingID = ?`).      |
-| Breweries visited / Ratings given counts | ❌     | `FILLER_PROFILE_META.breweriesVisited` / `.ratingsGiven`  | Blocked on the same like/rating gaps called out in `BREWERY_HANDOFF.md`.                                                                                                                             |
+| Breweries visited / Ratings given counts | ❌     | `FILLER_PROFILE_META.breweriesVisited` / `.ratingsGiven`  | Blocked on the same like/rating gaps called out in `BREWERY_HANDOFF.md`.                                                                                 |
 
 ## Follow action
 
@@ -36,7 +36,7 @@ Covers `/users/:id` (`routes/user-profile.tsx`). Mirrors the format of
 | Commenter name links (brewery detail comments) | ⚠️     | `CommentItem` links only when `comment.userAccountId` is set | `FILLER_COMMENTS` has no backing accounts, so those rows render as plain text; a comment added during the session by a signed-in user does carry a real GUID and links correctly. |
 | Following-list person links (profile page)     | ⚠️     | `FollowingTab` links only when `f.userAccountId` is set      | Same gap as above — `FILLER_FOLLOWING`'s two person rows have no backing accounts, so they render as plain text until real follow data exists.                                    |
 
-Both components already support linking (see `CommentItem.stories.tsx`'s `WithLinkedAccount` story); what's missing is real account IDs on the filler rows, which can't be faked without recreating the 404 this was fixed for. This resolves itself once (3) below closes and comments/follows are loader-backed.
+Both components already support linking (see `CommentItem.stories.tsx`'s `WithLinkedAccount` story); what's missing is real account IDs on the filler rows, which can't be faked without recreating the 404 this was fixed for. This resolves itself once (4) below closes and comments/follows are loader-backed.
 
 ## Activity / Following / Liked tabs
 
@@ -49,8 +49,8 @@ Both components already support linking (see `CommentItem.stories.tsx`'s `WithLi
 
 ## Summary of backend work
 
-1. A location field on `UserAccount` or `UserProfile`, and a cover-photo storage concept.
+1. A public query + controller route to read a user's stored `Social.UserAvatar`.
-2. `Social.UserFollow` command/query/controller: follow, unfollow, "is following" check, and follower/following counts.
+2. A location field on `UserAccount` or `UserProfile`, and a cover-photo storage concept (mirrors the avatar gap).
-3. An activity/timeline query unioning ratings, likes, and comments for a user, ordered by time — depends on the like/rating/comment tables called out in `BREWERY_HANDOFF.md` existing first.
+3. `Social.UserFollow` command/query/controller: follow, unfollow, "is following" check, and follower/following counts.
-4. An avatar-upload endpoint: `UploadAvatarCommand`/`UploadAvatarHandler` exist and `Database.Seed` sends them, but no controller action does, so a signed-in user has no way to set their own avatar. Needs a `multipart/form-data` route on the authenticated caller's own account (`IFormFile`, same validation the seeder's uploads pass through).
+4. An activity/timeline query unioning ratings, likes, and comments for a user, ordered by time — depends on the like/rating/comment tables called out in `BREWERY_HANDOFF.md` existing first.
-5. Once (2) and the like/rating gaps close, swap `FILLER_PROFILE_META` / `FILLER_ACTIVITY` / `FILLER_FOLLOWING` / `FILLER_LIKED` (`utils/filler-user-profile.ts`) and the local `useState` in `routes/user-profile.tsx` for loader data and `authorizedRequest`-based mutations (see `auth.server.ts`). Swapping in real (possibly empty) arrays is also what makes the Activity/Following `EmptyState`s reachable from the actual route — today they're only exercised by the `Empty` Storybook stories, since the filler arrays are never empty.
+5. Once (3) and the like/rating gaps close, swap `FILLER_PROFILE_META` / `FILLER_ACTIVITY` / `FILLER_FOLLOWING` / `FILLER_LIKED` (`utils/filler-user-profile.ts`) and the local `useState` in `routes/user-profile.tsx` for loader data and `authorizedRequest`-based mutations (see `auth.server.ts`). Swapping in real (possibly empty) arrays is also what makes the Activity/Following `EmptyState`s reachable from the actual route — today they're only exercised by the `Empty` Storybook stories, since the filler arrays are never empty.

web/frontend/app/features/users/components/profile/ProfileAvatar.stories.tsx

@@ -1,51 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/react-vite';
-import { expect, within } from 'storybook/test';
-import ProfileAvatar from './ProfileAvatar';
-
-const profileAvatarDescription = `Avatar shown at the top of the public profile sidebar. It renders the photo from the public profile payload's \`avatarUrl\`, and shows the first two letters of the display name when that field is empty or the image fails to load.`;
-
-const meta = {
-    title: 'Users/ProfileAvatar',
-    component: ProfileAvatar,
-    tags: ['autodocs'],
-    args: {
-        displayName: 'Maren Iverson',
-        avatarUrl: 'https://picsum.photos/id/1027/240/240',
-    },
-    parameters: {
-        layout: 'centered',
-        docs: {
-            description: {
-                component: profileAvatarDescription,
-            },
-        },
-    },
-} satisfies Meta<typeof ProfileAvatar>;
-
-export default meta;
-type Story = StoryObj<typeof meta>;
-
-export const WithPhoto: Story = {
-    play: async ({ canvasElement }) => {
-        const canvas = within(canvasElement);
-        const image = canvas.getByRole('img', { name: "Maren Iverson's avatar" });
-        await expect(image).toHaveAttribute('src', 'https://picsum.photos/id/1027/240/240');
-    },
-};
-
-export const WithoutPhoto: Story = {
-    args: { avatarUrl: '' },
-    play: async ({ canvasElement }) => {
-        const canvas = within(canvasElement);
-        await expect(canvas.getByText('MA')).toBeInTheDocument();
-        await expect(canvas.queryByRole('img')).not.toBeInTheDocument();
-    },
-};
-
-export const BrokenPhotoUrl: Story = {
-    args: { avatarUrl: 'https://example.invalid/missing-avatar.jpg' },
-    play: async ({ canvasElement }) => {
-        const canvas = within(canvasElement);
-        await expect(await canvas.findByText('MA')).toBeInTheDocument();
-    },
-};

web/frontend/app/features/users/components/profile/ProfileAvatar.tsx

@@ -1,42 +0,0 @@
-import { useState } from 'react';
-
-interface ProfileAvatarProps {
-    avatarUrl: string;
-    displayName: string;
-}
-
-/**
- * Renders the user's current avatar photo, falling back to their initials when the public
- * profile payload carries an empty `avatarUrl` or the hosted image fails to load.
- */
-const ProfileAvatar = ({ avatarUrl, displayName }: ProfileAvatarProps) => {
-    const [didImageFail, setDidImageFail] = useState(false);
-    const showPhoto = avatarUrl.length > 0 && !didImageFail;
-
-    return (
-        <div
-            className={`avatar w-[120px] h-[120px] rounded-full border-4 border-base-200 shadow-md ${
-                showPhoto ? '' : 'avatar-placeholder'
-            }`}
-        >
-            {showPhoto ? (
-                <div className="w-full h-full rounded-full overflow-hidden">
-                    <img
-                        src={avatarUrl}
-                        alt={`${displayName}'s avatar`}
-                        className="w-full h-full object-cover"
-                        onError={() => setDidImageFail(true)}
-                    />
-                </div>
-            ) : (
-                <div className="bg-secondary text-secondary-content w-full h-full rounded-full flex items-center justify-center">
-                    <span className="text-2xl font-bold">
-                        {displayName.slice(0, 2).toUpperCase()}
-                    </span>
-                </div>
-            )}
-        </div>
-    );
-};
-
-export default ProfileAvatar;

web/frontend/app/features/users/routes/user-profile.tsx

@@ -3,7 +3,6 @@ import { data } from 'react-router';
 import RouteErrorState from '../../../components/ui/error/RouteErrorState';
 import { getOptionalAuth } from '../../auth/auth.server';
 import { getPublicUserProfile, type PublicUserProfile } from '../users.server';
-import ProfileAvatar from '../components/profile/ProfileAvatar';
 import ProfileSidebarCard from '../components/profile/ProfileSidebarCard';
 import ProfileTabs, { type ProfileTab } from '../components/profile/ProfileTabs';
 import ActivityTab from '../components/profile/tabs/ActivityTab';
@@ -81,7 +80,15 @@ const ProfileContent = ({ profile, isOwnProfile }: ProfileContentProps) => {
 
                 <div className="grid grid-cols-1 lg:grid-cols-[300px_1fr] gap-8 items-start -mt-12">
                     <div className="lg:sticky lg:top-8 flex flex-col gap-5 px-2">
-                        <ProfileAvatar avatarUrl={profile.avatarUrl} displayName={displayName} />
+                        <div className="w-[120px] h-[120px] rounded-full border-4 border-base-200 shadow-md overflow-hidden">
+                            <div className="avatar avatar-placeholder w-full h-full">
+                                <div className="bg-secondary text-secondary-content w-full h-full flex items-center justify-center">
+                                    <span className="text-2xl font-bold">
+                                        {displayName.slice(0, 2).toUpperCase()}
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
 
                         <ProfileSidebarCard
                             displayName={displayName}

web/frontend/app/features/users/users.server.ts

@@ -8,7 +8,6 @@ export interface PublicUserProfile {
     firstName: string;
     lastName: string;
     biography: string;
-    avatarUrl: string;
     createdAt: string;
 }
 
@@ -50,7 +49,6 @@ export const getPublicUserProfile = async (
         firstName: string;
         lastName: string;
         biography: string;
-        avatarUrl: string;
         createdAt: string;
     } = await res.json();
 
@@ -60,7 +58,6 @@ export const getPublicUserProfile = async (
         firstName: account.firstName,
         lastName: account.lastName,
         biography: account.biography,
-        avatarUrl: account.avatarUrl,
         createdAt: account.createdAt,
     };
 };

web/frontend/app/features/users/utils/filler-user-profile.ts

@@ -1,5 +1,5 @@
 // see USER_PROFILE_HANDOFF.md — filler data pending backend support for
-// location, cover photos, follower/following stats, and activity feeds.
+// bio, location, avatar/cover photos, follower/following stats, and activity feeds.
 
 export interface FillerProfileMeta {
     bio: string;