Switch User MarkAsRead to use Jobs.UserId

ServiceStack · Aug 21, 2024 · b9c2431 · b9c2431
1 parent 343872c
commit b9c2431
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/MyApp.ServiceInterface/App/MarkAsReadCommand.cs b/MyApp.ServiceInterface/App/MarkAsReadCommand.cs
@@ -12,7 +12,7 @@ public class MarkAsReadCommand(AppConfig appConfig, IDbConnection db) : SyncComm
 {
     protected override void Run(MarkAsRead request)
     {
-        var userName = request.UserName;
+        var userName = Request.GetClaimsPrincipal().GetRequiredUserName();
         if (request.AllNotifications == true)
         {
             db.UpdateOnly(() => new Notification { Read = true }, x => x.UserName == userName);

diff --git a/MyApp.ServiceInterface/UserServices.cs b/MyApp.ServiceInterface/UserServices.cs
@@ -244,12 +244,11 @@ FROM Achievement A LEFT JOIN Post P on (A.PostId = P.Id)
         };
     }
 
-    public async Task<object> Any(MarkAsRead request)
+    public object Any(MarkAsRead request)
     {
-        request.UserName = Request.GetClaimsPrincipal().GetUserName()
-            ?? throw new ArgumentNullException(nameof(MarkAsRead.UserName));
-
-        jobs.RunCommand<MarkAsReadCommand>(request);
+        jobs.RunCommand<MarkAsReadCommand>(request, new() {
+            UserId = Request.GetClaimsPrincipal().GetUserId()
+        });
         return new EmptyResponse();
     }
 

diff --git a/MyApp.ServiceModel/User.cs b/MyApp.ServiceModel/User.cs
@@ -85,8 +85,6 @@ public class GetLatestAchievementsResponse
 [ValidateIsAuthenticated]
 public class MarkAsRead : IPost, IReturn<EmptyResponse>
 {
-    [IgnoreDataMember]
-    public string UserName { get; set; }
     public List<int>? NotificationIds { get; set; }
     public bool? AllNotifications { get; set; }
     public List<int>? AchievementIds { get; set; }

diff --git a/MyApp/Configure.Auth.cs b/MyApp/Configure.Auth.cs
@@ -12,9 +12,8 @@ namespace MyApp;
 public class ConfigureAuth : IHostingStartup
 {
     public void Configure(IWebHostBuilder builder) => builder
-        .ConfigureAppHost(appHost =>
-        {
-            appHost.Plugins.Add(new AuthFeature(IdentityAuth.For<ApplicationUser>(options => {
+        .ConfigureServices(services => {
+            services.AddPlugin(new AuthFeature(IdentityAuth.For<ApplicationUser>(options => {
                 options.SessionFactory = () => new CustomUserSession();
                 options.CredentialsAuth();
                 options.AdminUsersFeature(feature =>

diff --git a/MyApp/Configure.BackgroundJobs.cs b/MyApp/Configure.BackgroundJobs.cs
@@ -33,7 +33,6 @@ public void Configure(IWebHostBuilder builder) => builder
                 });
             
             jobs.RecurringCommand<SendWatchedTagEmailsCommand>(Schedule.Hourly);
-
         });
 }