Skip to content

Commit

Permalink
Move auth to config
Browse files Browse the repository at this point in the history
  • Loading branch information
TheEadie committed Aug 1, 2023
1 parent cea675b commit 0200554
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/cli/src/Worms.Cli.Resources/Remote/WormsServerApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public WormsServerApi(
_fileSystem = fileSystem;
_httpClient = new HttpClient();
#if DEBUG
_httpClient.BaseAddress = new Uri("http://127.0.0.1:5005/");
_httpClient.BaseAddress = new Uri("https://localhost:5001/");
#else
_httpClient.BaseAddress = new Uri("https://worms.davideadie.dev/");
#endif
Expand Down
22 changes: 0 additions & 22 deletions src/hub/src/Worms.Gateway/Auth/AllowAnonymous.cs

This file was deleted.

25 changes: 15 additions & 10 deletions src/hub/src/Worms.Gateway/Program.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System.Security.Claims;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
Expand All @@ -15,18 +14,19 @@
var builder = WebApplication.CreateBuilder(args);
builder.Logging.AddSimpleConsole(options => { options.SingleLine = true; });
builder.Configuration.AddEnvironmentVariables("WORMS_");

builder.Services.AddControllers();
builder.Services.AddApiVersioning();
builder.Services.AddAuthentication()
.AddJwtBearer(
options =>
{
options.Authority = "https://eadie.eu.auth0.com/";
options.Audience = "worms.davideadie.dev";
options.Authority = builder.Configuration.GetValue<string>("Auth:Authority");
options.Audience = builder.Configuration.GetValue<string>("Auth:Audience");
options.TokenValidationParameters = new TokenValidationParameters
{
NameClaimType = ClaimTypes.NameIdentifier,
RoleClaimType = "permissions"
NameClaimType = builder.Configuration.GetValue<string>("Auth:NameClaim"),
RoleClaimType = builder.Configuration.GetValue<string>("Auth:PermissionsClaim")
};
});
builder.Services.AddAuthorization();
Expand All @@ -36,14 +36,19 @@
builder.Services.AddSingleton<ReplayFileValidator>();

var app = builder.Build();
app.UseHttpsRedirection();
app.UseRouting();
app.UseAuthentication();
app.UseAuthorization();

if (app.Environment.IsDevelopment())
{
app.UseDeveloperExceptionPage();
app.MapControllers(); //.AllowAnonymous();
}
else
{
app.MapControllers();
}

app.UseHttpsRedirection();
app.UseRouting();
app.UseAuthentication();
app.UseAuthorization();
app.MapControllers();
app.Run();
8 changes: 7 additions & 1 deletion src/hub/src/Worms.Gateway/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,11 @@
"Microsoft.Hosting.Lifetime": "Information"
}
},
"AllowedHosts": "*"
"AllowedHosts": "*",
"Auth": {
"Authority": "https://eadie.eu.auth0.com/",
"Audience": "worms.davideadie.dev",
"NameClaim": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier",
"PermissionsClaim": "permissions"
}
}

0 comments on commit 0200554

Please sign in to comment.