Merge pull request #184 from LiamMorrow/automatically-create-feed

LiamMorrow · Jun 30, 2024 · 8099426 · 8099426
2 parents 89c41ec + 10eadb7
commit 8099426
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 14 deletions.
diff --git a/LiftLog.Api/Controllers/UserController.cs b/LiftLog.Api/Controllers/UserController.cs
@@ -36,9 +36,10 @@ [FromServices] IValidator<CreateUserRequest> validator
 
         var password = Guid.NewGuid().ToString();
         var hashedPassword = passwordService.HashPassword(password, out var salt);
+        var id = request.Id ?? Guid.NewGuid();
         var user = new User
         {
-            Id = request.Id,
+            Id = id,
             HashedPassword = hashedPassword,
             Salt = salt,
             LastAccessed = DateTimeOffset.UtcNow,
@@ -50,6 +51,7 @@ [FromServices] IValidator<CreateUserRequest> validator
         await db.SaveChangesAsync();
         return Ok(
             new CreateUserResponse(
+                Id: id,
                 Lookup: idEncodingService.EncodeId(user.UserLookup),
                 Password: password
             )

diff --git a/LiftLog.Api/Validators/UserRequestValidators.cs b/LiftLog.Api/Validators/UserRequestValidators.cs
@@ -6,10 +6,7 @@ namespace LiftLog.Api.Validators;
 
 public class CreateUserRequestValidator : AbstractValidator<CreateUserRequest>
 {
-    public CreateUserRequestValidator()
-    {
-        RuleFor(x => x.Id).NotEmpty();
-    }
+    public CreateUserRequestValidator() { }
 }
 
 public class GetUsersRequestValidator : AbstractValidator<GetUsersRequest>

diff --git a/LiftLog.Lib/Models/UserActions.cs b/LiftLog.Lib/Models/UserActions.cs
@@ -1,14 +1,14 @@
 namespace LiftLog.Lib.Models;
 
-public record CreateUserRequest(Guid Id);
+public record CreateUserRequest(Guid? Id);
 
 public record GetUsersRequest(Guid[] Ids);
 
 public record DeleteUserRequest(Guid Id, string Password);
 
 public record GetUsersResponse(Dictionary<Guid, GetUserResponse> Users);
 
-public record CreateUserResponse(string Lookup, string Password);
+public record CreateUserResponse(Guid Id, string Lookup, string Password);
 
 public record PutUserDataRequest(
     Guid Id,

diff --git a/LiftLog.Ui/Pages/Feed/CreateFeedIdentityPage.razor b/LiftLog.Ui/Pages/Feed/CreateFeedIdentityPage.razor
@@ -77,7 +77,7 @@ else
 
     private void StartPublishing()
     {
-        Dispatcher.Dispatch(new CreateFeedIdentityAction(Guid.NewGuid(), string.IsNullOrEmpty(name) ? null : name, null, publishBodyweight, publishPlan, publishWorkouts, From == null ? null : From));
+        Dispatcher.Dispatch(new CreateFeedIdentityAction(string.IsNullOrEmpty(name) ? null : name, null, publishBodyweight, publishPlan, publishWorkouts, From == null ? null : From));
     }
 
     private void UpdatePublishingDetails()

diff --git a/LiftLog.Ui/Pages/Feed/FeedPage.razor b/LiftLog.Ui/Pages/Feed/FeedPage.razor
@@ -39,8 +39,17 @@
         }
         else
         {
-            <div class="flex justify-end">
-                <AppButton Type=AppButtonType.Text OnClick=NavigateToCreateFeedIdentity>Your details</AppButton>
+            <div class="flex justify-center">
+            @if(!FeedState.Value.Identity.PublishWorkouts)
+            {
+                <div class="flex  justify-center">
+                    <AppButton Type=AppButtonType.Text OnClick=NavigateToCreateFeedIdentity>You're not currently publishing your workouts for your friends to see. Tap to start!</AppButton>
+                </div>
+            }else{
+                <div class="ml-auto">
+                    <AppButton Type=AppButtonType.Text OnClick=NavigateToCreateFeedIdentity>Your details</AppButton>
+                </div>
+            }
             </div>
         }
 

diff --git a/LiftLog.Ui/Services/FeedIdentityService.cs b/LiftLog.Ui/Services/FeedIdentityService.cs
@@ -24,8 +24,7 @@ public async Task<ApiResult<FeedIdentity>> CreateFeedIdentityAsync(
         ImmutableListValue<SessionBlueprint> currentPlan
     )
     {
-        var id = Guid.NewGuid();
-        var response = await feedApiService.CreateUserAsync(new CreateUserRequest(id));
+        var response = await feedApiService.CreateUserAsync(new CreateUserRequest(null));
         if (!response.IsSuccess)
         {
             return ApiResult<FeedIdentity>.FromFailure(response);
@@ -34,7 +33,7 @@ ImmutableListValue<SessionBlueprint> currentPlan
         var aesKey = await encryptionService.GenerateAesKeyAsync();
         var rsaKeyPair = await encryptionService.GenerateRsaKeysAsync();
         return await UpdateFeedIdentityAsync(
-            id: id,
+            id: response.Data.Id,
             lookup: response.Data.Lookup,
             password: response.Data.Password,
             aesKey: aesKey,

diff --git a/LiftLog.Ui/Store/Feed/FeedActions.cs b/LiftLog.Ui/Store/Feed/FeedActions.cs
@@ -6,7 +6,6 @@ namespace LiftLog.Ui.Store.Feed;
 public record SetFeedIsHydratedAction();
 
 public record CreateFeedIdentityAction(
-    Guid Id,
     string? Name,
     byte[]? ProfilePicture,
     bool PublishBodyweight,

diff --git a/LiftLog.Ui/Store/Feed/FeedStateInitMiddleware.cs b/LiftLog.Ui/Store/Feed/FeedStateInitMiddleware.cs
@@ -35,6 +35,19 @@ public override async Task InitializeAsync(IDispatcher dispatch, IStore store)
             }
 
             dispatch.Dispatch(new SetFeedIsHydratedAction());
+            if (((FeedState)store.Features[nameof(FeedFeature)].GetState()) is { Identity: null })
+            {
+                dispatch.Dispatch(
+                    new CreateFeedIdentityAction(
+                        Name: null,
+                        ProfilePicture: null,
+                        PublishBodyweight: false,
+                        PublishPlan: false,
+                        PublishWorkouts: false,
+                        RedirectAfterCreation: null
+                    )
+                );
+            }
         }
         catch (Exception e)
         {