Disabled HttpsRouting

server/nt.microservice/infrastructure/nt.orchestrator.AppHost/Program.cs

@@ -18,7 +18,8 @@
 var consulServiceDiscovery = builder.AddContainer(Constants.Infrastructure.Consul.ServiceName, infrastructureSettings.Consul.DockerImage)
             .WithContainerName(Constants.Infrastructure.Consul.ContainerName)
             .WithHttpEndpoint(port: infrastructureSettings.Consul.HostPort, targetPort: infrastructureSettings.Consul.TargetPort)
-            .WithArgs("agent", "-dev", "-client=0.0.0.0"); // dev mode
+            .WithArgs("agent", "-dev", "-client=0.0.0.0") // dev mode
+            .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Dashboard ({u.Endpoint?.Port})")); 
 
 
 var rabbitMqusername = builder.AddParameter(Constants.Infrastructure.RabbitMq.UserNameKey, infrastructureSettings.RabbitMq.UserName, secret: true);
@@ -33,7 +34,7 @@
                            target: @"/etc/rabbitmq/definitions.json")
             .WithHttpEndpoint(infrastructureSettings.RabbitMq.HttpPort,targetPort: infrastructureSettings.RabbitMq.HttpPort, name:"http1")
             .WithHttpEndpoint(infrastructureSettings.RabbitMq.HttpsPort, targetPort: infrastructureSettings.RabbitMq.HttpsPort, name: "http2")
-            .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Manage ({u.Endpoint?.EndpointName})")); 
+            .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Dashboard ({u.Endpoint?.Port})")); 
 
 
 var postgresUsername = builder.AddParameter(Constants.AuthService.Database.UserNameKey, infrastructureSettings.Postgres.UserName, secret: true);
@@ -60,7 +61,6 @@
 var blobStorage = builder.AddContainer("nt-userservice-blobstorage", infrastructureSettings.BlobStorage.DockerImage)
             .WithVolume("//d/Source/nt/server/nt.microservice/services/UserService/BlobStorage:/data")
             .WithArgs("azurite-blob", "--blobHost", "0.0.0.0", "-l", "/data")
-
             .WithHttpEndpoint(port: infrastructureSettings.BlobStorage.HostPort, targetPort: infrastructureSettings.BlobStorage.TargetPort, isProxied: true);
 
 
@@ -84,7 +84,7 @@
             .WithEnvironment(Constants.AuthService.Environment.RabbitMqPassword, infrastructureSettings.RabbitMq.Password)
             .WaitFor(consulServiceDiscovery)
             .WaitFor(rabbitmq)
-            .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Open API")));
+            .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Open API ({u.Endpoint?.Port})")));
 }
 
 var authServiceLoadBalancer = builder.AddContainer(Constants.AuthService.LoadBalancer.InstanceName, serviceSettings.AuthService.LoadBalancer.DockerImage)
@@ -121,7 +121,7 @@
             .WithReference(sqlDb)
             .WaitFor(sqlDb)
             .WaitFor(consulServiceDiscovery)
-            .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Open API ({u.Endpoint?.EndpointName})"));
+            .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Open API ({u.Endpoint?.Port})"));
 
 
 userService.WithEnvironment(Constants.Infrastructure.Consul.Environement.ServicePort, ()=>userService.GetEndpoint("http").Port.ToString())
@@ -144,7 +144,8 @@
             .WaitFor(consulServiceDiscovery)
             .WaitFor(authServiceLoadBalancer)
             .WaitFor(authServiceSideCar)
-            .WaitFor(userService);
+            .WaitFor(userService)
+            .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Open API ({u.Endpoint?.Port})")); ;
 
 aggregatorService.WithEnvironment(Constants.Infrastructure.Consul.Environement.ServicePort, () => aggregatorService.GetEndpoint("http").Port.ToString())
            .WithEnvironment(Constants.Infrastructure.Consul.Environement.ServiceHealthCheckUrl,
@@ -160,7 +161,9 @@
         .WithEnvironment(Constants.Infrastructure.Consul.Environement.RegistryUri, consulServiceDiscovery.GetEndpoint("http"))
         .WithEnvironment(Constants.Infrastructure.Consul.Environement.DeregisterAfter, serviceSettings.MovieService.ServiceRegistrationConfig.DeregisterAfterMinutes.ToString())
         .WithReference(mongoDb)
-        .WaitFor(mongoDb);
+        .WaitFor(mongoDb)
+        .WaitFor(consulServiceDiscovery)
+        .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Open API ({u.Endpoint?.Port})")); ;
 
 movieService.WithEnvironment(Constants.Infrastructure.Consul.Environement.ServicePort, () => movieService.GetEndpoint("http").Port.ToString())
            .WithEnvironment(Constants.Infrastructure.Consul.Environement.ServiceHealthCheckUrl,
@@ -178,7 +181,8 @@
            .WaitFor(userService)
            .WaitFor(aggregatorService)
            .WaitFor(movieService)
-           .WaitFor(reviewService);
+           .WaitFor(reviewService)
+           .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Open API ({u.Endpoint?.Port})")); ;
 
 
 builder.Build().Run();

server/nt.microservice/services/MovieService/MovieService.Api/Program.cs

@@ -1,6 +1,4 @@
 using Consul;
-using Microsoft.AspNetCore.Cors.Infrastructure;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using MongoDB.Driver;
 using MovieService.Api;
@@ -9,7 +7,6 @@
 using MovieService.Api.Settings;
 using MovieService.Data;
 using nt.shared.dto.Configurations;
-using System;
 using System.Text.Json.Serialization;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -27,6 +24,10 @@
         });
 });
 
+builder.Configuration
+.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+.AddEnvironmentVariables(); // <- This ensures env vars are considered
+
 builder.Services.Configure<ServiceRegistrationConfig>(builder.Configuration.GetSection(nameof(ServiceRegistrationConfig)));
 // Add services to the container.
 
@@ -89,7 +90,7 @@
     app.UseSwaggerUI();
 }
 
-app.UseHttpsRedirection();
+//app.UseHttpsRedirection();
 app.UseCors(corsPolicy);
 app.UseAuthorization();
 

server/nt.microservice/services/UserService/UserService.Api/Program.cs

@@ -1,9 +1,6 @@
 using Consul;
-using Grpc.Net.Client.Configuration;
 using MassTransit;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Hosting.Server;
-using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;