Merge branch 'main' of https://github.com/CodebreakerApp/Codebreaker.Blazor

christiannagel · christiannagel · commit 3049f456b95c · 2024-09-02T09:16:13.000+02:00
diff --git a/icons/codebreaker_240.jpg b/icons/codebreaker_240.jpg
diff --git a/src/CodeBreaker.Blazor.Client/CodeBreaker.Blazor.Client.csproj b/src/CodeBreaker.Blazor.Client/CodeBreaker.Blazor.Client.csproj
@@ -13,16 +13,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorApplicationInsights" Version="3.0.5" />
-    <PackageReference Include="CNinnovation.Codebreaker.GamesClient" Version="3.6.0-beta.24" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.5" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Authentication.WebAssembly.Msal" Version="8.0.5" />
+    <PackageReference Include="BlazorApplicationInsights" Version="3.1.0" />
+    <PackageReference Include="CNinnovation.Codebreaker.GamesClient" Version="3.7.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Authentication.WebAssembly.Msal" Version="8.0.8" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.5" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.7.2" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.7.2" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.8" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.3" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.9.3" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CodeBreaker.Blazor.Client/Pages/Authentication.razor b/src/CodeBreaker.Blazor.Client/Pages/Authentication.razor
@@ -42,4 +42,21 @@
 
 @code {
     [Parameter] public string? Action { get; set; }
+
+    [Inject] private NavigationManager NavigationManager { get; set; } = null!;
+
+    protected override void OnInitialized()
+    {
+        if (Action == "logout-callback")
+            NavigateToHome();
+    }
+
+    private void NavigateToHome()
+    {
+        Task.Run(async () =>
+        {
+            await Task.Delay(3000);
+            NavigationManager.NavigateTo("/", false, true);
+        });
+    }
 }
diff --git a/src/CodeBreaker.Blazor.Client/Pages/GamePage.razor b/src/CodeBreaker.Blazor.Client/Pages/GamePage.razor
@@ -1,4 +1,5 @@
 ﻿@page "/game"
+@attribute [Authorize]
 @using CodeBreaker.Blazor.Client.Models
 @using Codebreaker.GameAPIs.Client.Models
 
@@ -14,15 +15,17 @@
                     <FluentTextField
                         Class="full-width"
                         Label="@Loc["GamePage_NameInput"]"
+                        Placeholder="@Loc["GamePage_NameInput_Placeholder"]"
                         Required
                         Value="@_gamerName"
-                        ReadOnly />
+                        Disabled />
                 }
                 else
                 {
                     <FluentSelect
                         Class="full-width"
                         Label="@Loc["GamePage_NameInput"]"
+                        Placeholder="@Loc["GamePage_NameInput_Placeholder"]"
                         Items="_gamerNameSuggestions"
                         @bind-Value="_gamerName"
                         Required>
@@ -35,6 +38,7 @@
                     Class="full-width"
                     Items="@_gameTypes.Keys"
                     Label="@Loc["GamePage_GameTypeInput"]"
+                    Placeholder="@Loc["GamePage_SelectGameType_Placeholder"]"
                     @bind-Value="SelectedGameTypeKey"
                     Required />
             </FluentGridItem>
diff --git a/src/CodeBreaker.Blazor.Client/Pages/GamePage.razor.cs b/src/CodeBreaker.Blazor.Client/Pages/GamePage.razor.cs
@@ -18,7 +18,7 @@ public partial class GamePage : IDisposable
     //TODO: Get Data from API
     private readonly FrozenDictionary<string, GameType> _gameTypes = new Dictionary<string, GameType>() {
         { "6x4", GameType.Game6x4 },
-        //{ "6x4 Mini", GameType.Game6x4Mini },
+        { "6x4 Mini", GameType.Game6x4Mini },
         { "8x5", GameType.Game8x5 },
         { "5x5x4", GameType.Game5x5x4 },
     }.ToFrozenDictionary();
@@ -56,7 +56,10 @@ public partial class GamePage : IDisposable
 
     private GameType? SelectedGameType => SelectedGameTypeKey is null ? null : _gameTypes[SelectedGameTypeKey];
 
-    private bool CanStartGame => !string.IsNullOrWhiteSpace(_gamerName) && !_loadingGame;
+    private bool CanStartGame =>
+        !string.IsNullOrWhiteSpace(_gamerName)
+        && !_loadingGame
+        && SelectedGameType is not null;
 
     protected override async Task OnInitializedAsync()
     {
diff --git a/src/CodeBreaker.Blazor.Client/Pages/ReportsPage.razor b/src/CodeBreaker.Blazor.Client/Pages/ReportsPage.razor
@@ -1,4 +1,5 @@
 ﻿@page "/reports"
+@attribute [Authorize]
 @using Codebreaker.GameAPIs.Client.Models
 
 <FluentCard>
diff --git a/src/CodeBreaker.Blazor.Client/Pages/UserInformationPage.razor b/src/CodeBreaker.Blazor.Client/Pages/UserInformationPage.razor
@@ -1,5 +1,4 @@
 ﻿@page "/user-information"
-@using Microsoft.AspNetCore.Authorization;
 @attribute [Authorize]
 
 @if (_user is not null) {
diff --git a/src/CodeBreaker.Blazor.Client/Program.cs b/src/CodeBreaker.Blazor.Client/Program.cs
@@ -3,6 +3,7 @@
 using CodeBreaker.Blazor.Client.Contracts.Services;
 using CodeBreaker.Blazor.Client.Extensions;
 using CodeBreaker.Blazor.Client.Services;
+using CodeBreaker.Blazor.Client.Services.HttpMessageHandlers;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.FluentUI.AspNetCore.Components;
 
@@ -16,16 +17,26 @@
 builder.Services.AddMsalAuthentication(options =>
 {
     builder.Configuration.Bind("AzureAdB2C", options.ProviderOptions.Authentication);
-    //options.ProviderOptions.DefaultAccessTokenScopes.Add("");  // TODO
+    options.ProviderOptions.DefaultAccessTokenScopes.Add("openid");
+    options.ProviderOptions.DefaultAccessTokenScopes.Add("profile");
+    options.ProviderOptions.DefaultAccessTokenScopes.Add("offline_access");
+    options.ProviderOptions.DefaultAccessTokenScopes.Add("https://codebreaker3000.onmicrosoft.com/gateway/games.play");
+    //options.ProviderOptions.DefaultAccessTokenScopes.Add("https://codebreaker3000.onmicrosoft.com/gateway/live.observe");
+    //options.ProviderOptions.DefaultAccessTokenScopes.Add("https://codebreaker3000.onmicrosoft.com/gateway/ranking.query");
+    //options.ProviderOptions.DefaultAccessTokenScopes.Add("https://codebreaker3000.onmicrosoft.com/gateway/bot.trigger");
     options.UserOptions.NameClaim = "extension_GamerName";
 });
 
+builder.Services.AddTransient<AllAuthorizationMessageHandler>();
+
 builder.Services.AddHttpClient<IGamerNameSuggestionClient, GamerNameSuggestionClient>(configure =>
-    configure.BaseAddress = new Uri(builder.Configuration.GetRequired("UserApiBase")));
+    configure.BaseAddress = new Uri(builder.Configuration.GetRequired("UserServicePublicBaseAddress"))
+);
 
 builder.Services.AddHttpClient<IGamesClient, GamesClient>(configure =>
-    configure.BaseAddress = new Uri(builder.Configuration.GetRequired("GameApiBase")));
-//.AddHttpMessageHandler<>(); // TODO
+    configure.BaseAddress = new Uri(builder.Configuration.GetRequired("GameServiceBaseAddress"))
+)
+.AddHttpMessageHandler<AllAuthorizationMessageHandler>();
 
 builder.Services.AddScoped<IMobileDetectorService, MobileDetectorService>();
 
diff --git a/src/CodeBreaker.Blazor.Client/Resources/Resource.Designer.cs b/src/CodeBreaker.Blazor.Client/Resources/Resource.Designer.cs
diff --git a/src/CodeBreaker.Blazor.Client/Resources/Resource.de.resx b/src/CodeBreaker.Blazor.Client/Resources/Resource.de.resx
@@ -374,4 +374,10 @@
   <data name="Yes" xml:space="preserve">
     <value>Ja</value>
   </data>
+  <data name="GamePage_SelectGameType_Placeholder" xml:space="preserve">
+    <value>Wählen Sie einen Spieltyp</value>
+  </data>
+  <data name="GamePage_NameInput_Placeholder" xml:space="preserve">
+    <value>Wählen Sie Ihren Spielernamen</value>
+  </data>
 </root>
diff --git a/src/CodeBreaker.Blazor.Client/Resources/Resource.resx b/src/CodeBreaker.Blazor.Client/Resources/Resource.resx
@@ -386,4 +386,10 @@
   <data name="Yes" xml:space="preserve">
     <value>Yes</value>
   </data>
+  <data name="GamePage_SelectGameType_Placeholder" xml:space="preserve">
+    <value>Select a gametype</value>
+  </data>
+  <data name="GamePage_NameInput_Placeholder" xml:space="preserve">
+    <value>Choose your gamername</value>
+  </data>
 </root>
diff --git a/src/CodeBreaker.Blazor.Client/Routes.razor b/src/CodeBreaker.Blazor.Client/Routes.razor
@@ -1,6 +1,4 @@
-﻿@using Microsoft.AspNetCore.Components.Authorization
-
-<CascadingAuthenticationState>
+﻿<CascadingAuthenticationState>
     <Router AppAssembly="@typeof(Program).Assembly">
         <Found Context="routeData">
             <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
diff --git a/src/CodeBreaker.Blazor.Client/Services/GamerNameSuggestionClient.cs b/src/CodeBreaker.Blazor.Client/Services/GamerNameSuggestionClient.cs
@@ -7,7 +7,7 @@ public class GamerNameSuggestionClient(HttpClient httpClient) : IGamerNameSugges
 {
     public async Task<GamerNameSuggestionsResult> GetGamerNameSuggestionsAsync(int count = 10, CancellationToken cancellationToken = default)
     {
-        var response = await httpClient.GetAsync($"/gamer-names/suggestions?count={count}", cancellationToken);
+        var response = await httpClient.GetAsync($"gamer-names/suggestions?count={count}", cancellationToken);
         response.EnsureSuccessStatusCode();
         return await response.Content.ReadFromJsonAsync<GamerNameSuggestionsResult>(cancellationToken) ?? new ([]);
     }
diff --git a/src/CodeBreaker.Blazor.Client/Services/HttpMessageHandlers/AllAuthorizationMessageHandler.cs b/src/CodeBreaker.Blazor.Client/Services/HttpMessageHandlers/AllAuthorizationMessageHandler.cs
@@ -0,0 +1,74 @@
+﻿using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
+using Microsoft.AspNetCore.Components;
+using System.Net.Http.Headers;
+
+namespace CodeBreaker.Blazor.Client.Services.HttpMessageHandlers;
+
+/// <summary>
+/// A <see cref="DelegatingHandler"/> that attaches access tokens to outgoing <see cref="HttpResponseMessage"/> instances.
+/// <br />
+/// Access tokens will be added to <b>all requests</b>.
+/// </summary>
+internal class AllAuthorizationMessageHandler : DelegatingHandler, IDisposable
+{
+    private readonly IAccessTokenProvider _provider;
+    private readonly NavigationManager _navigation;
+    private readonly AuthenticationStateChangedHandler? _authenticationStateChangedHandler;
+    private AccessToken? _lastToken;
+    private AuthenticationHeaderValue? _cachedHeader;
+    private Uri[]? _authorizedUris;
+    private AccessTokenRequestOptions? _tokenOptions;
+
+    public AllAuthorizationMessageHandler(
+        IAccessTokenProvider provider,
+        NavigationManager navigation)
+    {
+        _provider = provider;
+        _navigation = navigation;
+
+        // Invalidate the cached _lastToken when the authentication state changes
+        if (_provider is AuthenticationStateProvider authStateProvider)
+        {
+            _authenticationStateChangedHandler = _ => { _lastToken = null; };
+            authStateProvider.AuthenticationStateChanged += _authenticationStateChangedHandler;
+        }
+    }
+
+    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        var now = DateTimeOffset.Now;
+
+        if (_lastToken == null || now >= _lastToken.Expires.AddMinutes(-5))
+        {
+            var tokenResult = _tokenOptions != null ?
+                await _provider.RequestAccessToken(_tokenOptions) :
+                await _provider.RequestAccessToken();
+
+            if (tokenResult.TryGetToken(out var token))
+            {
+                _lastToken = token;
+                _cachedHeader = new AuthenticationHeaderValue("Bearer", _lastToken.Value);
+            }
+            else
+            {
+                throw new AccessTokenNotAvailableException(_navigation, tokenResult, _tokenOptions?.Scopes);
+            }
+        }
+
+        // We don't try to handle 401s and retry the request with a new token automatically since that would mean we need to copy the request
+        // headers and buffer the body and we expect that the user instead handles the 401s. (Also, we can't really handle all 401s as we might
+        // not be able to provision a token without user interaction).
+        request.Headers.Authorization = _cachedHeader;
+
+        return await base.SendAsync(request, cancellationToken);
+    }
+
+    void IDisposable.Dispose()
+    {
+        if (_provider is AuthenticationStateProvider authStateProvider)
+            authStateProvider.AuthenticationStateChanged -= _authenticationStateChangedHandler;
+
+        Dispose(disposing: true);
+    }
+}
diff --git a/src/CodeBreaker.Blazor.Client/_Imports.razor b/src/CodeBreaker.Blazor.Client/_Imports.razor
@@ -1,5 +1,7 @@
 ﻿@using System.Net.Http
 @using System.Net.Http.Json
+@using Microsoft.AspNetCore.Authorization
+@using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
diff --git a/src/CodeBreaker.Blazor.Client/wwwroot/appsettings.Development.json b/src/CodeBreaker.Blazor.Client/wwwroot/appsettings.Development.json
@@ -1,4 +1,6 @@
 {
   "DetailedErrors": true,
-  "UserApiBase": "https://localhost:7133/"
+  "AzureAdB2C:RedirectUri": "http://localhost:5208/authentication/login-callback",
+  "GameServiceBaseAddress": "http://localhost:5011/games",
+  "UserServicePublicBaseAddress": "http://localhost:5011/users/public"
 }
diff --git a/src/CodeBreaker.Blazor.Client/wwwroot/appsettings.json b/src/CodeBreaker.Blazor.Client/wwwroot/appsettings.json
@@ -1,9 +1,10 @@
 {
-  "GameApiBase": "https://gameapis.kindbeach-def2191a.westeurope.azurecontainerapps.io",
-  "UserApiBase": "", // TODO
   "AzureAdB2C": {
-    "Authority": "https://codebreakertest.b2clogin.com/codebreakertest.onmicrosoft.com/B2C_1_SUSI",
-    "ClientId": "99375d10-1093-4aa7-badc-0b3be474fad6",
-    "ValidateAuthority": false
-  }
+    "Authority": "https://codebreaker3000.b2clogin.com/codebreaker3000.onmicrosoft.com/B2C_1_SUSI",
+    "ClientId": "558b37b7-0a71-4463-9d3c-d74220b7e5ee",
+    "ValidateAuthority": false,
+    "RedirectUri": "https://blazor.codebreaker.app/authentication/login-callback"
+  },
+  "GameServiceBaseAddress": "https://codebreaker.cninnovation.com/games",
+  "UserServicePublicBaseAddress": "https://codebreaker.cninnovation.com/users/public"
 }
diff --git a/src/CodeBreaker.Blazor.UI/CodeBreaker.Blazor.UI.csproj b/src/CodeBreaker.Blazor.UI/CodeBreaker.Blazor.UI.csproj
@@ -16,8 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="8.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="8.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
   </ItemGroup>
 
 </Project>
diff --git a/src/CodeBreaker.Blazor/CodeBreaker.Blazor.csproj b/src/CodeBreaker.Blazor/CodeBreaker.Blazor.csproj
@@ -1,25 +1,31 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>a3b22f52-7891-4ca2-816c-8ee5986f6424</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerfileContext>..\..\..</DockerfileContext>
+    <EnableSdkContainerSupport>true</EnableSdkContainerSupport>
+  </PropertyGroup>
+
+  <PropertyGroup>
+	<ContainerRepository>codebreaker-blazor</ContainerRepository>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" NoWarn="NU1605" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.1" NoWarn="NU1605" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.17.0" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.17.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.8" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.8" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.1.0" />
+    <PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\CodeBreaker.Blazor.Client\CodeBreaker.Blazor.Client.csproj" />
+    <ProjectReference Include="..\..\..\common\Codebreaker.ServiceDefaults\Codebreaker.ServiceDefaults.csproj" /> <!-- This project reference points to the ServiceDefaults project of the Codebreaker.Backend repository (when used as submodule in Codebreaker.Backend) -->
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CodeBreaker.Blazor/Program.cs b/src/CodeBreaker.Blazor/Program.cs
diff --git a/src/CodeBreaker.Blazor/appsettings.Development.json b/src/CodeBreaker.Blazor/appsettings.Development.json
diff --git a/src/CodeBreaker.Blazor/appsettings.json b/src/CodeBreaker.Blazor/appsettings.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`@page "/reports"`
	`2`	`+@attribute [Authorize]`
`2`	`3`	`@using Codebreaker.GameAPIs.Client.Models`
`3`	`4`
`4`	`5`	`<FluentCard>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`@page "/user-information"`
`2`		`-@using Microsoft.AspNetCore.Authorization;`
`3`	`2`	`@attribute [Authorize]`
`4`	`3`
`5`	`4`	`@if (_user is not null) {`