Merge pull request #72 from CodebreakerApp/71-blazor-communication-with-gateway

71 blazor communication with gateway

Author: christiannagel

src/CodeBreaker.Blazor.Client/Configuration/RemoteServiceDiscovery.cs

@@ -1,6 +1,5 @@
 using BlazorApplicationInsights;
 using Codebreaker.GameAPIs.Client;
-using CodeBreaker.Blazor.Client.Configuration;
 using CodeBreaker.Blazor.Client.Contracts.Services;
 using CodeBreaker.Blazor.Client.Extensions;
 using CodeBreaker.Blazor.Client.Services;
@@ -10,8 +9,6 @@
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
-builder.Configuration.AddRemoteServiceDiscovery(new Uri (builder.HostEnvironment.BaseAddress));
-
 builder.Services.AddFluentUIComponents();
 
 builder.Services.AddLocalization();
@@ -33,14 +30,12 @@
 builder.Services.AddTransient<AllAuthorizationMessageHandler>();
 
 builder.Services.AddHttpClient<IGamerNameSuggestionClient, GamerNameSuggestionClient>(configure =>
-    configure.BaseAddress = new Uri("https://gateway/users/public")
-)
-.ConfigureRemoteServiceDiscovery();
+    configure.BaseAddress = new Uri(builder.Configuration.GetRequired("UserServicePublicBaseAddress"))
+);
 
 builder.Services.AddHttpClient<IGamesClient, GamesClient>(configure =>
-    configure.BaseAddress = new Uri("https://gateway/games/")
+    configure.BaseAddress = new Uri(builder.Configuration.GetRequired("GameServiceBaseAddress"))
 )
-.ConfigureRemoteServiceDiscovery()
 .AddHttpMessageHandler<AllAuthorizationMessageHandler>();
 
 builder.Services.AddScoped<IMobileDetectorService, MobileDetectorService>();

src/CodeBreaker.Blazor.Client/Program.cs

@@ -1,3 +1,6 @@
 {
-  "DetailedErrors": true
+  "DetailedErrors": true,
+  "AzureAdB2C:RedirectUri": "http://localhost:5208/authentication/login-callback",
+  "GameServiceBaseAddress": "http://localhost:5011/games",
+  "UserServicePublicBaseAddress": "http://localhost:5011/users/public"
 }

src/CodeBreaker.Blazor.Client/wwwroot/appsettings.Development.json

@@ -2,6 +2,9 @@
   "AzureAdB2C": {
     "Authority": "https://codebreaker3000.b2clogin.com/codebreaker3000.onmicrosoft.com/B2C_1_SUSI",
     "ClientId": "558b37b7-0a71-4463-9d3c-d74220b7e5ee",
-    "ValidateAuthority": false
-  }
+    "ValidateAuthority": false,
+    "RedirectUri": "https://blazor.codebreaker.app/authentication/login-callback"
+  },
+  "GameServiceBaseAddress": "https://codebreaker.cninnovation.com/games",
+  "UserServicePublicBaseAddress": "https://codebreaker.cninnovation.com/users/public"
 }

src/CodeBreaker.Blazor.Client/wwwroot/appsettings.json

@@ -1,6 +1,7 @@
 using CodeBreaker.Blazor.Client.Pages;
 using Codebreaker.GameAPIs.Client;
 using CodeBreaker.Blazor.Components;
+using CodeBreaker.Blazor.Client.Extensions;
 using CodeBreaker.Blazor.Client.Services;
 using CodeBreaker.Blazor.Client.Contracts.Services;
 using Microsoft.FluentUI.AspNetCore.Components;
@@ -19,11 +20,11 @@
 
 builder.Services.AddHttpClient<IGamerNameSuggestionClient, GamerNameSuggestionClient>(configure =>
     configure.BaseAddress =
-        new Uri("https://userapis") // Utilize Aspire service discovery
+        new Uri(builder.Configuration.GetRequired("UserServicePublicBaseAddress"))
     );
 
 builder.Services.AddHttpClient<IGamesClient, GamesClient>(configure =>
-    configure.BaseAddress = new Uri("https://gameapis") // Utilize Aspire service discovery
+    configure.BaseAddress = new Uri(builder.Configuration.GetRequired("GameServiceBaseAddress"))
 );
 
 builder.Services.AddScoped<IMobileDetectorService, MobileDetectorService>();
@@ -57,31 +58,4 @@
     .AddInteractiveWebAssemblyRenderMode()
     .AddAdditionalAssemblies(typeof(GamePage).Assembly);
 
-/// <summary>
-/// Reads the environment variables for services and returns a mapping of service names to URLs.
-/// </summary>
-app.MapGet("/service-discovery", () =>
-{
-    var serviceMapping = new Dictionary<string, string>();
-    var environmentVariables = Environment.GetEnvironmentVariables();
-
-    foreach (var key in environmentVariables.Keys)
-    {
-        var keyText = key.ToString()!;
-
-        // Check if the key is a service URL (e.g. services__gameapis__http)
-        if (keyText.StartsWith("services__"))
-        {
-            // Extract the service name from the key (e.g. gameapis
-            var serviceName = keyText.Split("__")[1];
-
-            // Add the service name and URL to the mapping if it doesn't already exist
-            if (!serviceMapping.ContainsKey(serviceName))
-                serviceMapping.Add(serviceName, environmentVariables[key]!.ToString()!);
-        }
-    }
-
-    return Results.Json(serviceMapping);
-});
-
 app.Run();

src/CodeBreaker.Blazor/Program.cs

@@ -1,3 +1,5 @@
 {
-  "DetailedErrors": true
+  "DetailedErrors": true,
+  "GameServiceBaseAddress": "http://localhost:5011/games",
+  "UserServicePublicBaseAddress": "http://localhost:5011/users/public"
 }

src/CodeBreaker.Blazor/appsettings.Development.json

@@ -1,2 +1,4 @@
 {
+  "GameServiceBaseAddress": "https://codebreaker.cninnovation.com/games",
+  "UserServicePublicBaseAddress": "https://codebreaker.cninnovation.com/users/public"
 }