Merge pull request #38 from SpotifaiI/main

sync

.github/workflows/dotnet.yml

@@ -0,0 +1,28 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: .NET
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal

src/HigiaServer.API/Endpoints/TaskEndpoint.cs

@@ -1,12 +1,10 @@
-using System.Security.Authentication;
 using System.Security.Claims;
 using AutoMapper;
 using HigiaServer.Application.Contracts.Requests;
 using HigiaServer.Application.Contracts.Responses;
 using HigiaServer.Application.Errors;
 using HigiaServer.Application.Repositories;
 using HigiaServer.Domain.Enums;
-using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace HigiaServer.API.Endpoints;
 
@@ -63,6 +61,7 @@ public static IEndpointRouteBuilder AddTaskEndpoint(this IEndpointRouteBuilder a
                 return x;
             });
 
+        // delete task
         authEndpoint.MapDelete("/{taskId:guid}", HandleDeleteTask)
             .WithName("Delete task by id")
             .WithOpenApi(x =>
@@ -71,6 +70,7 @@ public static IEndpointRouteBuilder AddTaskEndpoint(this IEndpointRouteBuilder a
                 return x;
             });
 
+        // remove collaborator from task
         authEndpoint.MapPatch("/{taskId:guid}/{collaboratorId:guid}", HandleRemoveCollaboratorToTask)
             .WithName("Remove collaborator to task")
             .WithOpenApi(x =>

src/HigiaServer.API/Program.cs

@@ -11,30 +11,27 @@
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddInfra(builder.Configuration);
 
-builder.Services.AddAuthorization(options =>
+builder.Services.AddAuthorizationBuilder()
+    .AddPolicy("admin", policy => policy.RequireRole("admin"))
+    .AddPolicy("collaborator", policy => policy.RequireRole("collaborator"));
+
+builder.Services.AddAuthentication(x =>
 {
-    options.AddPolicy("admin", policy => policy.RequireRole("admin"));
-    options.AddPolicy("collaborator", policy => policy.RequireRole("collaborator"));
-});
-builder
-    .Services.AddAuthentication(x =>
-    {
-        x.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-        x.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-    })
-    .AddJwtBearer(x =>
+    x.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
+    x.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
+}).AddJwtBearer(x =>
+{
+    var key = Encoding.ASCII.GetBytes(
+        builder.Configuration.GetValue<string>("JwtSettings:SecretKey")!
+    );
+    x.TokenValidationParameters = new TokenValidationParameters
     {
-        var key = Encoding.ASCII.GetBytes(
-            builder.Configuration.GetValue<string>("JwtSettings:SecretKey")!
-        );
-        x.TokenValidationParameters = new TokenValidationParameters
-        {
-            ValidateIssuerSigningKey = true,
-            IssuerSigningKey = new SymmetricSecurityKey(key),
-            ValidateIssuer = false,
-            ValidateAudience = false
-        };
-    });
+        ValidateIssuerSigningKey = true,
+        IssuerSigningKey = new SymmetricSecurityKey(key),
+        ValidateIssuer = false,
+        ValidateAudience = false
+    };
+});
 
 var app = builder.Build();
 

src/HigiaServer.Domain/Entities/User.cs

@@ -1,6 +1,6 @@
 namespace HigiaServer.Domain.Entities;
 
-public class User(bool isAdmin, string name, string email, string password, string? number)
+public class User(bool isAdmin, string name, string email, string password, string? number = null)
 {
     public Guid Id { get; init; } = Guid.NewGuid();
     public string Name { get; private set; } = name;

src/HigiaServer.Infra/DbContext/HigiaServerContext.cs

@@ -10,7 +10,15 @@ public class HigiaServerContext : Microsoft.EntityFrameworkCore.DbContext
     public DbSet<User> Users { get; set; }
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        => optionsBuilder.UseInMemoryDatabase(databaseName: "HigiaServerDb");
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
-        optionsBuilder.UseInMemoryDatabase(databaseName: "HigiaServerDb");
+        modelBuilder.Entity<User>().HasData(new User(
+            isAdmin: true,
+            name: "admin",
+            email: "[email protected]",
+            password: "adminadmin"
+        ));
     }
 }