mz/DiunaBI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP: duplicate administration layer

Browse Source
This commit is contained in:
Michał Zieliński
2023-11-12 17:54:15 +01:00
parent 3a8fa60aea
commit 5ea180c8b1
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WebAPI/Controllers/AuthController.cs
View File

@@ -30,7 +30,7 @@ namespace WebAPI.Controllers
{ {
var settings = new GoogleJsonWebSignature.ValidationSettings() var settings = new GoogleJsonWebSignature.ValidationSettings()
{ {
Audience = new List<string> { configuration.GetValue<string>("GoogleClientId") } Audience = new List<string> { configuration.GetValue<string>("GoogleClientId")! }
}; };
var payload = await GoogleJsonWebSignature.ValidateAsync(credential, settings); var payload = await GoogleJsonWebSignature.ValidateAsync(credential, settings);
var user = db.Users.Where(x => x.Email == payload.Email).FirstOrDefault(); var user = db.Users.Where(x => x.Email == payload.Email).FirstOrDefault();
@@ -46,7 +46,7 @@ namespace WebAPI.Controllers
private dynamic JWTGenerator(User user) private dynamic JWTGenerator(User user)
{ {
var key = Encoding.ASCII.GetBytes(configuration.GetValue<string>("Secret")); var key = Encoding.ASCII.GetBytes(configuration.GetValue<string>("Secret")!);
var expirationTime = DateTime.UtcNow.AddMinutes(5); var expirationTime = DateTime.UtcNow.AddMinutes(5);
var tokenDescriptor = new SecurityTokenDescriptor var tokenDescriptor = new SecurityTokenDescriptor
{ {

2
WebAPI/Models/Layer.cs
View File

@@ -18,7 +18,7 @@ namespace WebAPI.Models
[Required] [Required]
public string? Source { get; set; } public string? Source { get; set; }
[Required] [Required]
public string Name { get; set; } public string? Name { get; set; }
[Required] [Required]
public LayerType Type { get; set; } public LayerType Type { get; set; }
[Required] [Required]

4
WebAPI/Program.cs
View File

@@ -32,6 +32,7 @@ builder.Services.AddCors(options =>
builder.Services.AddControllers(); builder.Services.AddControllers();
builder.Services.AddAuthentication(options => builder.Services.AddAuthentication(options =>
{ {
options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -51,6 +52,7 @@ builder.Services.AddAuthentication(options =>
}); });
builder.Services.AddAuthentication(); builder.Services.AddAuthentication();
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
builder.Services.AddEndpointsApiExplorer(); builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen(); builder.Services.AddSwaggerGen();
@@ -60,6 +62,7 @@ builder.Services.AddSingleton(typeof(GoogleDriveHelper));
var app = builder.Build(); var app = builder.Build();
app.Use(async (context, next) => app.Use(async (context, next) =>
{ {
string token = context.Request.Headers["Authorization"].ToString(); string token = context.Request.Headers["Authorization"].ToString();
@@ -71,6 +74,7 @@ app.Use(async (context, next) =>
await next(context); await next(context);
}); });
// Configure the HTTP request pipeline. // Configure the HTTP request pipeline.
if (app.Environment.IsDevelopment()) if (app.Environment.IsDevelopment())
{ {