Merge pull request #110 from gothinkster/updates

Updates

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "0.27.3",
+      "version": "0.28.0",
       "commands": [
         "dotnet-csharpier"
       ]

.github/workflows/dotnetcore.yml

@@ -11,5 +11,5 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.201
+        dotnet-version: 8.0.204
     - run: dotnet run --project build/build.csproj

Directory.Packages.props

@@ -3,10 +3,10 @@
     <PackageVersion Include="AutoMapper" Version="13.0.1" />
     <PackageVersion Include="Bullseye" Version="5.0.0" />
     <PackageVersion Include="Glob" Version="1.1.9" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Serilog" Version="3.1.1" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />

src/Conduit/Domain/Person.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 

src/Conduit/Features/Articles/Create.cs

@@ -60,15 +60,15 @@ CancellationToken cancellationToken
                 var t = await context.Tags.FindAsync(tag);
                 if (t == null)
                 {
-                    t = new Tag() { TagId = tag };
+                    t = new Tag { TagId = tag };
                     await context.Tags.AddAsync(t, cancellationToken);
                     //save immediately for reuse
                     await context.SaveChangesAsync(cancellationToken);
                 }
                 tags.Add(t);
             }
 
-            var article = new Article()
+            var article = new Article
             {
                 Author = author,
                 Body = message.Article.Body,
@@ -81,7 +81,7 @@ CancellationToken cancellationToken
             await context.Articles.AddAsync(article, cancellationToken);
 
             await context.ArticleTags.AddRangeAsync(
-                tags.Select(x => new ArticleTag() { Article = article, Tag = x }),
+                tags.Select(x => new ArticleTag { Article = article, Tag = x }),
                 cancellationToken
             );
 

src/Conduit/Features/Articles/Edit.cs

@@ -109,11 +109,11 @@ IEnumerable<string> articleTagList
                 var at = article.ArticleTags?.FirstOrDefault(t => t.TagId == tag);
                 if (at == null)
                 {
-                    at = new ArticleTag()
+                    at = new ArticleTag
                     {
                         Article = article,
                         ArticleId = article.ArticleId,
-                        Tag = new Tag() { TagId = tag },
+                        Tag = new Tag { TagId = tag },
                         TagId = tag
                     };
                     articleTagsToCreate.Add(at);

src/Conduit/Features/Articles/List.cs

@@ -2,7 +2,6 @@
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using Conduit.Domain;
 using Conduit.Infrastructure;
 using Conduit.Infrastructure.Errors;
 using MediatR;
@@ -111,11 +110,7 @@ CancellationToken cancellationToken
                 .AsNoTracking()
                 .ToListAsync(cancellationToken);
 
-            return new ArticlesEnvelope()
-            {
-                Articles = articles,
-                ArticlesCount = queryable.Count()
-            };
+            return new ArticlesEnvelope { Articles = articles, ArticlesCount = queryable.Count() };
         }
     }
 }

src/Conduit/Features/Comments/Create.cs

@@ -49,7 +49,7 @@ CancellationToken cancellationToken
                 cancellationToken
             );
 
-            var comment = new Comment()
+            var comment = new Comment
             {
                 Author = author,
                 Body = message.Model.Comment.Body ?? string.Empty,

src/Conduit/Features/Favorites/Add.cs

@@ -61,7 +61,7 @@ CancellationToken cancellationToken
 
             if (favorite == null)
             {
-                favorite = new ArticleFavorite()
+                favorite = new ArticleFavorite
                 {
                     Article = article,
                     ArticleId = article.ArticleId,

src/Conduit/Features/Followers/Add.cs

@@ -64,7 +64,7 @@ CancellationToken cancellationToken
 
             if (followedPeople == null)
             {
-                followedPeople = new FollowedPeople()
+                followedPeople = new FollowedPeople
                 {
                     Observer = observer,
                     ObserverId = observer.PersonId,

src/Conduit/Features/Tags/List.cs

@@ -20,7 +20,7 @@ public async Task<TagsEnvelope> Handle(Query message, CancellationToken cancella
                 .Tags.OrderBy(x => x.TagId)
                 .AsNoTracking()
                 .ToListAsync(cancellationToken);
-            return new TagsEnvelope()
+            return new TagsEnvelope
             {
                 Tags = tags?.Select(x => x.TagId ?? string.Empty).ToList() ?? new List<string>()
             };

src/Conduit/Infrastructure/Security/JwtIssuerOptions.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Threading.Tasks;
 using Microsoft.IdentityModel.Tokens;
 
 namespace Conduit.Infrastructure.Security;

src/Conduit/Program.cs

@@ -1,18 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using Conduit;
-using Conduit.Features.Profiles;
 using Conduit.Infrastructure;
 using Conduit.Infrastructure.Errors;
-using Conduit.Infrastructure.Security;
-using FluentValidation;
-using FluentValidation.AspNetCore;
-using MediatR;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Models;
@@ -25,15 +17,6 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddMediatR(cfg =>
-    cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly())
-);
-builder.Services.AddTransient(typeof(IPipelineBehavior<,>), typeof(ValidationPipelineBehavior<,>));
-builder.Services.AddScoped(
-    typeof(IPipelineBehavior<,>),
-    typeof(DBContextTransactionPipelineBehavior<,>)
-);
-
 // take the connection string from the environment variable or use hard-coded database name
 var connectionString = defaultDatabaseConnectionSrting;
 
@@ -81,7 +64,7 @@
     x.SupportNonNullableReferenceTypes();
 
     x.AddSecurityRequirement(
-        new OpenApiSecurityRequirement()
+        new OpenApiSecurityRequirement
         {
             {
                 new OpenApiSecurityScheme
@@ -98,11 +81,8 @@
     );
     x.SwaggerDoc("v1", new OpenApiInfo { Title = "RealWorld API", Version = "v1" });
     x.CustomSchemaIds(y => y.FullName);
-    x.DocInclusionPredicate((version, apiDescription) => true);
-    x.TagActionsBy(y => new List<string>()
-    {
-        y.GroupName ?? throw new InvalidOperationException()
-    });
+    x.DocInclusionPredicate((_, _) => true);
+    x.TagActionsBy(y => new List<string> { y.GroupName ?? throw new InvalidOperationException() });
     x.CustomSchemaIds(s => s.FullName?.Replace("+", "."));
 });
 
@@ -123,17 +103,7 @@
             .WhenWritingNull
     );
 
-builder.Services.AddFluentValidationAutoValidation();
-builder.Services.AddFluentValidationClientsideAdapters();
-builder.Services.AddValidatorsFromAssemblyContaining<Startup>();
-
-builder.Services.AddAutoMapper(typeof(Program));
-
-builder.Services.AddScoped<IPasswordHasher, PasswordHasher>();
-builder.Services.AddScoped<IJwtTokenGenerator, JwtTokenGenerator>();
-builder.Services.AddScoped<ICurrentUserAccessor, CurrentUserAccessor>();
-builder.Services.AddScoped<IProfileReader, ProfileReader>();
-builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+builder.Services.AddConduit();
 
 builder.Services.AddJwt();
 
@@ -143,7 +113,7 @@
 
 app.UseMiddleware<ErrorHandlingMiddleware>();
 
-app.UseCors(builder => builder.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod());
+app.UseCors(x => x.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod());
 
 app.UseAuthentication();
 app.UseMvc();