diff --git a/.drone.yml b/.drone.yml index 0047e74..9a9fdd2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -61,6 +61,7 @@ steps: - main - rebase - pipeline + - Login - name: deploy-container image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest diff --git a/Infrastructure/Entities/User.cs b/Infrastructure/Entities/User.cs index 8f52c97..a4471f1 100644 --- a/Infrastructure/Entities/User.cs +++ b/Infrastructure/Entities/User.cs @@ -27,7 +27,7 @@ public class User : EntityBase public ESport? ESport { get; set; } public ESleepLevel? ESleepLevel { get; set; } public ESportLevel? ESportLevel { get; set; } - public string HashPassword { get; set; } + public string? HashPassword { get; set; } public string? OAuthProvider { get; set; } diff --git a/Server/Dto/Request/RequestUserDto.cs b/Server/Dto/Request/RequestUserDto.cs index 9ab798b..e171279 100644 --- a/Server/Dto/Request/RequestUserDto.cs +++ b/Server/Dto/Request/RequestUserDto.cs @@ -1,9 +1,25 @@ using System.ComponentModel.DataAnnotations; +using Shared; namespace Server.Dto.Request; public class RequestUserDto { [Required(ErrorMessage = "FirstName is required")] + public string Id { get; set; } public string Name { get; set; } + public int Age { get; set; } + public float Height { get; set; } + public float Weight { get; set; } + public bool Sexe { get; set; } + public string? Logo { get; set; } + public int NbSessionPerWeek { get; set; } + public string? EGoal { get; set; } + public ESleepLevel ESleepLevel { get; set; } + + public EHealthProblem EHealthProblem { get; set; } + + public ESport ESport { get; set; } + + public ESportLevel ESportLevel { get; set; } } \ No newline at end of file diff --git a/Server/FirstTest.db b/Server/FirstTest.db index 2fa9246..d60c83a 100644 Binary files a/Server/FirstTest.db and b/Server/FirstTest.db differ diff --git a/Server/Mappers/UserProfile.cs b/Server/Mappers/UserProfile.cs index 8953b21..79b4468 100644 --- a/Server/Mappers/UserProfile.cs +++ b/Server/Mappers/UserProfile.cs @@ -25,15 +25,19 @@ public class UserProfile : Profile .ForMember(dest => dest.ESport, opt => opt.MapFrom(src => src.ESport)); _ = CreateMap() - .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.Name)); - //.ForMember(dest => dest.Age, opt => opt.MapFrom(src => src.Age)) - //.ForMember(dest => dest.Height, opt => opt.MapFrom(src => src.Height)) - //.ForMember(dest => dest.Weight, opt => opt.MapFrom(src => src.Weight)) - //.ForMember(dest => dest.Sexe, opt => opt.MapFrom(src => src.Sexe)) - //.ForMember(dest => dest.Logo, opt => opt.MapFrom(src => src.Logo)) - //.ForMember(dest => dest.NbSessionPerWeek, opt => opt.MapFrom(src => src.NbSessionPerWeek)) - //.ForMember(dest => dest.EGoal, opt => opt.MapFrom(src => src.EGoal)) - //.ForMember(dest => dest.ESleepLevel, opt => opt.MapFrom(src => src.ESleepLevel)); + .ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.Id)) + .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.Name)) + .ForMember(dest => dest.Age, opt => opt.MapFrom(src => src.Age)) + .ForMember(dest => dest.Height, opt => opt.MapFrom(src => src.Height)) + .ForMember(dest => dest.Weight, opt => opt.MapFrom(src => src.Weight)) + .ForMember(dest => dest.Sexe, opt => opt.MapFrom(src => src.Sexe)) + .ForMember(dest => dest.Logo, opt => opt.MapFrom(src => src.Logo)) + .ForMember(dest => dest.NbSessionPerWeek, opt => opt.MapFrom(src => src.NbSessionPerWeek)) + .ForMember(dest => dest.EGoal, opt => opt.MapFrom(src => src.EGoal)) + .ForMember(dest => dest.ESleepLevel, opt => opt.MapFrom(src => src.ESleepLevel)) + .ForMember(dest => dest.EHealthProblem, opt => opt.MapFrom(src => src.EHealthProblem)) + .ForMember(dest => dest.ESportLevel, opt => opt.MapFrom(src => src.ESportLevel)) + .ForMember(dest => dest.ESport, opt => opt.MapFrom(src => src.ESport)); } } \ No newline at end of file diff --git a/Server/Program.cs b/Server/Program.cs index a5e811f..811f612 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -84,7 +84,6 @@ builder.Services.AddSwaggerGen(option => builder.Services.AddDbContext( options => options.UseInMemoryDatabase("AppDb")); -builder.Services.AddAuthorization(); builder.Services.AddIdentityApiEndpoints() .AddEntityFrameworkStores(); @@ -107,11 +106,15 @@ if (app.Environment.IsDevelopment()) } app.MapIdentityApi(); -app.MapSwagger().RequireAuthorization(); app.UseAuthorization(); app.MapControllers(); +using var scoped = app.Services.CreateScope(); +var dataContext = scoped.ServiceProvider.GetService(); +//libraryContext.Database.EnsureCreated(); +dataContext.Database.Migrate(); + app.MapPost("/logout", async (SignInManager signInManager, [FromBody]object empty) => {