seems to work not tested for the moment

pull/10/head
David D'ALMEIDA 1 year ago
parent 49110b2e47
commit 6c4c96f7fb

@ -236,12 +236,23 @@ namespace DbContextLib
.WithOne(at => at.DataSource)
.HasForeignKey(at => at.DataSourceId)
.IsRequired(false);
List<IdentityRole> roles = new List<IdentityRole>
{
new ("Athlete"),
new ("Coach")
};
modelBuilder.Entity<IdentityRole>().HasData(roles);
List<IdentityRole<int>> roles =
[
new()
{
Id = 1,
Name = "Athlete",
NormalizedName = "ATHLETE"
},
new()
{
Id = 2,
Name = "Coach",
NormalizedName = "COACH"
}
];
modelBuilder.Entity<IdentityRole<int>>().HasData(roles);
}
}
}

@ -0,0 +1,23 @@
namespace Dto.Auth;
public class AuthResponseDto
{
/// <summary>
/// Gets or sets the access token issued by the OAuth provider.
/// </summary>
public string AccessToken { get; set; }
/// <summary>Gets or sets the token type.</summary>
/// <remarks>Typically the string “bearer”.</remarks>
public string? TokenType { get; set; }
/// <summary>
/// Gets or sets a refresh token that applications can use to obtain another access token if tokens can expire.
/// </summary>
public string? RefreshToken { get; set; }
/// <summary>
/// Gets or sets the validatity lifetime of the token in seconds.
/// </summary>
public string? ExpiresIn { get; set; }
}

@ -0,0 +1,33 @@
using System.ComponentModel.DataAnnotations;
namespace Dto.Auth;
public class RegisterRequestDto
{
[MaxLength(100)]
[Required(ErrorMessage = "Username is required")]
public string Username { get; set; }
[MaxLength(150)]
[Required(ErrorMessage = "LastName is required")]
public string LastName { get; set; }
[MaxLength(100)]
[Required(ErrorMessage = "FirstName is required")]
public string FirstName { get; set; }
[Required(ErrorMessage = "Email is required")]
[EmailAddress]
public string Email { get; set; }
[Required(ErrorMessage = "Sexe is required")]
public string Sexe { get; set; }
[Required(ErrorMessage = "Size is required")]
public float Size { get; set; }
[Required(ErrorMessage = "Weight is required")]
public float Weight { get; set; }
[Required(ErrorMessage = "Password is required")]
public string Password { get; set; }
[Required(ErrorMessage = "DateOfBirth is required")]
public DateTime DateOfBirth { get; set; }
public string ProfilePicture { get; set; } = "https://davidalmeida.site/assets/me_avatar.f77af006.png";
[Required(ErrorMessage = "Role is required")]
public bool IsCoach { get; set; }
}

@ -3,6 +3,7 @@ using Dto;
using Dto.Tiny;
using HeartTrackAPI.Request;
using HeartTrackAPI.Responce;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Shared;
using Model.Manager;
@ -12,6 +13,8 @@ namespace HeartTrackAPI.Controllers;
[ApiController]
[ApiVersion("1.0")]
[Route("api/v{version:apiVersion}/[controller]")]
[Authorize]
public class ActivityController : Controller
{
private readonly IActivityRepository _activityService;

@ -1,4 +1,5 @@
using Dto.Tiny;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace HeartTrackAPI.Controllers;
@ -6,6 +7,7 @@ namespace HeartTrackAPI.Controllers;
[ApiController]
[ApiVersion("1.0")]
[Route("api/[controller]")]
[Authorize]
public class AnalysisController : Controller
{
private readonly List<HeartRateZone> _heartRateZones = new()

@ -20,6 +20,7 @@ namespace HeartTrackAPI.Controllers;
[ApiController]
[ApiVersion("1.0")]
[Route("api/v{version:apiVersion}/[controller]")]
[Authorize]
public class UsersController : Controller
{
private readonly ILogger<UsersController> _logger;

@ -0,0 +1,48 @@
using System.IdentityModel.Tokens.Jwt;
using System.Security.Claims;
using System.Text;
using Entities;
using Microsoft.IdentityModel.Tokens;
namespace HeartTrackAPI.Services;
public interface ITokenService
{
string CreateToken(AthleteEntity user);
}
public class TokenService : ITokenService
{
private readonly IConfiguration _config;
private readonly SymmetricSecurityKey _key;
public TokenService(IConfiguration config)
{
_config = config;
_key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_config["JWT:SigningKey"]));
}
public string CreateToken(AthleteEntity user)
{
var claims = new List<Claim>
{
new (JwtRegisteredClaimNames.Email, user.Email),
new (JwtRegisteredClaimNames.GivenName, user.UserName)
};
var creds = new SigningCredentials(_key, SecurityAlgorithms.HmacSha512Signature);
var tokenDescriptor = new SecurityTokenDescriptor
{
Subject = new ClaimsIdentity(claims),
Expires = DateTime.Now.AddDays(7),
SigningCredentials = creds,
Issuer = _config["JWT:Issuer"],
Audience = _config["JWT:Audience"]
};
var tokenHandler = new JwtSecurityTokenHandler();
var token = tokenHandler.CreateToken(tokenDescriptor);
return tokenHandler.WriteToken(token);
}
}

@ -1,6 +1,7 @@
using System.Reflection;
using DbContextLib;
using Entities;
using HeartTrackAPI.Services;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc.Versioning;
@ -15,23 +16,22 @@ using StubbedContextLib;
using Swashbuckle.AspNetCore.SwaggerGen;
namespace HeartTrackAPI.Utils;
public class AppBootstrap(IConfiguration configuration)
{
private IConfiguration Configuration { get; } = configuration;
public void ConfigureServices(IServiceCollection services)
{
services.AddControllers();
services.AddEndpointsApiExplorer();
AddSwagger(services);
AddHeartTrackContextServices(services);
AddModelService(services);
AddIdentityServices(services,configuration);
AddIdentityServices(services, configuration);
AddApiVersioning(services);
services.AddHealthChecks();
}
private void AddHeartTrackContextServices(IServiceCollection services)
@ -52,8 +52,8 @@ public class AppBootstrap(IConfiguration configuration)
Console.WriteLine(connectionString);
Console.WriteLine("====================================================");
services.AddDbContext<HeartTrackContext>(options =>
options.UseMySql($"{connectionString}", new MySqlServerVersion(new Version(10, 11, 1)))
, ServiceLifetime.Singleton);
options.UseMySql($"{connectionString}", new MySqlServerVersion(new Version(10, 11, 1)))
, ServiceLifetime.Singleton);
break;
default:
Console.WriteLine("====== RUNNING USING THE IN SQLITE DATABASE ======");
@ -68,8 +68,8 @@ public class AppBootstrap(IConfiguration configuration)
{
services.AddDbContext<TrainingStubbedContext>();
}
break;
break;
}
}
@ -78,7 +78,8 @@ public class AppBootstrap(IConfiguration configuration)
switch (Environment.GetEnvironmentVariable("TYPE"))
{
case "BDD":
services.AddSingleton<IDataManager>(provider => new DbDataManager(provider.GetRequiredService<HeartTrackContext>()));
services.AddSingleton<IDataManager>(provider =>
new DbDataManager(provider.GetRequiredService<HeartTrackContext>()));
break;
case "STUB-MODEL":
services.AddSingleton<IDataManager, StubData>();
@ -93,24 +94,26 @@ public class AppBootstrap(IConfiguration configuration)
// services.AddSingleton<IDataManager>(provider => new DbDataManager(provider.GetRequiredService<TrainingStubbedContext>()));
break;
}
// Auth
services.AddScoped<ITokenService, TokenService>();
}
private void AddIdentityServices(IServiceCollection services, IConfiguration config)
{
services.AddAuthorization();
/*services.AddAuthorization();
services.AddIdentityApiEndpoints<AthleteEntity>()
.AddEntityFrameworkStores<TrainingStubbedContext>();
.AddEntityFrameworkStores<TrainingStubbedContext>();*/
/*services.AddIdentity<AthleteEntity, IdentityRole<int>>(options =>
services.AddIdentity<AthleteEntity, IdentityRole<int>>(options =>
{
options.PasswordHash.RequireDigit = true;
options.PasswordHash.RequireLowercase = true;
options.PasswordHash.RequireUppercase = true;
options.PasswordHash.RequireNonAlphanumeric = true;
options.PasswordHash.RequiredLength = 8;
options.Password.RequireDigit = true;
options.Password.RequireLowercase = true;
options.Password.RequireUppercase = true;
options.Password.RequireNonAlphanumeric = true;
options.Password.RequiredLength = 8;
})
.AddEntityFrameworkStores<HeartTrackContext>();
.AddEntityFrameworkStores<TrainingStubbedContext>();
services.AddAuthentication(options =>
@ -126,15 +129,15 @@ public class AppBootstrap(IConfiguration configuration)
options.TokenValidationParameters = new TokenValidationParameters
{
ValidateIssuer = true,
//ValidIssuer =config["JWT:Issuer"],
ValidIssuer =config["JWT:Issuer"],
ValidateAudience = true,
//ValidAudience = config["JWT:Audience"],
ValidAudience = config["JWT:Audience"],
ValidateIssuerSigningKey = true,
IssuerSigningKey = new SymmetricSecurityKey(
System.Text.Encoding.UTF8.GetBytes(config["JWT:SigningKey"])
)
};
});*/
});
/*
app.UseCors(x => x
@ -154,7 +157,6 @@ public class AppBootstrap(IConfiguration configuration)
private void AddApiVersioning(IServiceCollection services)
{
services.AddApiVersioning(opt =>
{
opt.ReportApiVersions = true;
@ -164,8 +166,8 @@ public class AppBootstrap(IConfiguration configuration)
new HeaderApiVersionReader("x-api-version"),
new MediaTypeApiVersionReader("x-api-version"));
});
}
private void AddSwagger(IServiceCollection services)
{
services.AddSwaggerGen(options =>
@ -180,7 +182,9 @@ public class AppBootstrap(IConfiguration configuration)
"JWT Authorization header using the Bearer scheme. Example: \"Authorization: Bearer {token}\"",
Name = "Authorization",
In = ParameterLocation.Header,
Type = SecuritySchemeType.ApiKey
Type = SecuritySchemeType.Http,
Scheme = "Bearer",
BearerFormat = "JWT"
});
var scheme = new OpenApiSecurityRequirement
{
@ -202,16 +206,14 @@ public class AppBootstrap(IConfiguration configuration)
options.AddSecurityRequirement(scheme);
options.OperationFilter<SwaggerDefaultValues>();
});
//services.AddTransient<IConfigureOptions<SwaggerGenOptions>, SwaggerOptions>();
/*
services.AddTransient<IConfigureOptions<SwaggerGenOptions>, SwaggerOptions>();
services.AddVersionedApiExplorer(setup =>
{
setup.GroupNameFormat = "'v'VVV";
setup.SubstituteApiVersionInUrl = true;
});*/
});
}
public void Configure(WebApplication app, IWebHostEnvironment env)
@ -220,7 +222,8 @@ public class AppBootstrap(IConfiguration configuration)
app.UseAuthentication();
app.UseAuthorization();
app.MapIdentityApi<AthleteEntity>();
// app.MapIdentityApi<AthleteEntity>();
app.MapControllers();
@ -233,13 +236,12 @@ public class AppBootstrap(IConfiguration configuration)
{
options.PreSerializeFilters.Add((swagger, httpReq) =>
{
if (httpReq.Headers.ContainsKey("X-Forwarded-Host"))
{
string basePath;
switch (Environment.GetEnvironmentVariable("TYPE")) // httpReq.Host.Value
{
case "STUB" :
case "STUB":
basePath = "containers/HeartDev-heart_stub";
break;
case "BDD":
@ -249,15 +251,14 @@ public class AppBootstrap(IConfiguration configuration)
basePath = httpReq.Host.Value;
break;
}
var serverUrl = $"https://{httpReq.Headers["X-Forwarded-Host"]}/{basePath}";
swagger.Servers = new List<OpenApiServer> { new() { Url = serverUrl } };
swagger.Servers = new List<OpenApiServer> { new() { Url = serverUrl } };
}
});
});
app.UseSwaggerUI();
app.MapSwagger();
}
}
}

@ -9,9 +9,9 @@
"ConnectionStrings": {
"HeartTrackAuthConnection": "Data Source=uca_HeartTrack.db"
},
"Jwt": {
"JWT": {
"Issuer": "HeartTrack",
"Audience": "HeartTrack",
"SigningKey": "ThisIsMySuperKey"
"SigningKey": "jythgfbhtgdfytrhdgfythrydfghtrydfythrjgfytjgfjkhljkloijijlijoukhjuhygyhdhcesxeqaewxsfcgevfbtgjnh61689346843njfdvcgdv"
}
}

Loading…
Cancel
Save