From 68c56ca05faa94ea73055919a14ce4f0d636c89d Mon Sep 17 00:00:00 2001 From: Maxime Adler Date: Mon, 17 Feb 2025 22:07:34 +0100 Subject: [PATCH] Add cors policy --- .../GameIdeas.BlazorApp.csproj | 10 +++++-- .../Layout/MainLayout.razor | 1 + .../Layout/MainLayout.razor.cs | 24 +++++++++++++++++ .../Client/GameIdeas.BlazorApp/Program.cs | 21 ++++++++++++--- .../Client/GameIdeas.BlazorApp/_Imports.razor | 4 +-- .../wwwroot/sample-data/weather.json | 27 ------------------- .../Server/GameIdeas.WebAPI/Program.cs | 9 +++++-- 7 files changed, 60 insertions(+), 36 deletions(-) create mode 100644 src/GameIdeas/Client/GameIdeas.BlazorApp/Layout/MainLayout.razor.cs delete mode 100644 src/GameIdeas/Client/GameIdeas.BlazorApp/wwwroot/sample-data/weather.json diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/GameIdeas.BlazorApp.csproj b/src/GameIdeas/Client/GameIdeas.BlazorApp/GameIdeas.BlazorApp.csproj index 2ede3a0..c1da829 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/GameIdeas.BlazorApp.csproj +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/GameIdeas.BlazorApp.csproj @@ -4,11 +4,17 @@ net9.0 enable enable + 5637e3c4-2341-4bdb-85ec-c75faeee9847 - - + + + + + + + diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Layout/MainLayout.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Layout/MainLayout.razor index 76eb725..7cd63fe 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Layout/MainLayout.razor +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Layout/MainLayout.razor @@ -1,4 +1,5 @@ @inherits LayoutComponentBase +
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Layout/MainLayout.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Layout/MainLayout.razor.cs new file mode 100644 index 0000000..2b97705 --- /dev/null +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Layout/MainLayout.razor.cs @@ -0,0 +1,24 @@ +using Microsoft.AspNetCore.Components; +using System.Net.Http.Json; +using GameIdeas.Resources; + +namespace GameIdeas.BlazorApp.Layout; + +public partial class MainLayout( + IHttpClientFactory HttpClientFactory, + TranslationService TranslationService, + Translations Translations) : LayoutComponentBase +{ + protected override async Task OnInitializedAsync() + { + var client = HttpClientFactory.CreateClient("GameIdeas.WebAPI"); + var response = await client.GetAsync("api/Translations"); + var dictionary = await response.Content.ReadFromJsonAsync>(); + if (dictionary != null) + { + TranslationService.Initialize(dictionary); + ResourcesKey.Initialize(Translations); + } + + } +} \ No newline at end of file diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs index 0eb7278..bf5571b 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs @@ -1,4 +1,5 @@ -using GameIdeas.WebApp; +using GameIdeas.BlazorApp; +using GameIdeas.Resources; using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; @@ -6,6 +7,20 @@ var builder = WebAssemblyHostBuilder.CreateDefault(args); builder.RootComponents.Add("#app"); builder.RootComponents.Add("head::after"); -builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }); +UriBuilder uriBuilder = new(builder.HostEnvironment.BaseAddress) +{ + Port = 8000 +}; -await builder.Build().RunAsync(); +builder.Services.AddHttpClient( + "GameIdeas.WebAPI", + client => + { + client.BaseAddress = uriBuilder.Uri; + client.Timeout = TimeSpan.FromMinutes(3); + }); + +builder.Services.AddSingleton(); +builder.Services.AddSingleton(); + +await builder.Build().RunAsync(); \ No newline at end of file diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/_Imports.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/_Imports.razor index e941df8..f688796 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/_Imports.razor +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/_Imports.razor @@ -6,5 +6,5 @@ @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.AspNetCore.Components.WebAssembly.Http @using Microsoft.JSInterop -@using GameIdeas.WebApp -@using GameIdeas.WebApp.Layout +@using GameIdeas.BlazorApp +@using GameIdeas.BlazorApp.Layout diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/wwwroot/sample-data/weather.json b/src/GameIdeas/Client/GameIdeas.BlazorApp/wwwroot/sample-data/weather.json deleted file mode 100644 index b745973..0000000 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/wwwroot/sample-data/weather.json +++ /dev/null @@ -1,27 +0,0 @@ -[ - { - "date": "2022-01-06", - "temperatureC": 1, - "summary": "Freezing" - }, - { - "date": "2022-01-07", - "temperatureC": 14, - "summary": "Bracing" - }, - { - "date": "2022-01-08", - "temperatureC": -13, - "summary": "Freezing" - }, - { - "date": "2022-01-09", - "temperatureC": -16, - "summary": "Balmy" - }, - { - "date": "2022-01-10", - "temperatureC": -2, - "summary": "Chilly" - } -] diff --git a/src/GameIdeas/Server/GameIdeas.WebAPI/Program.cs b/src/GameIdeas/Server/GameIdeas.WebAPI/Program.cs index 325080b..b5be7c3 100644 --- a/src/GameIdeas/Server/GameIdeas.WebAPI/Program.cs +++ b/src/GameIdeas/Server/GameIdeas.WebAPI/Program.cs @@ -9,6 +9,11 @@ builder.Services.AddControllers(); // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi builder.Services.AddOpenApi(); +builder.Services.AddCors(option => option.AddDefaultPolicy(policy => + policy.WithOrigins("http://localhost:5172") + .AllowAnyHeader() + .WithMethods("GET", "POST"))); + builder.Services.AddSingleton(); builder.Services.AddSingleton(); @@ -32,9 +37,9 @@ foreach (var file in translationFiles) } app.Services.GetRequiredService().Initialize(dictionary); -var resourcesKey = app.Services.GetRequiredService(); -ResourcesKey.Initialize(resourcesKey); +ResourcesKey.Initialize(app.Services.GetRequiredService()); +app.UseCors(); app.UseAuthorization(); app.MapControllers();