Fix CORS

Author: robinmanuelthiel

README.md

@@ -16,9 +16,9 @@ This is a small demo project to quickly setup a mix of containerized micro-servi
 
 The project consists of
 
-- An API Gateway, written in .NET Core, exposes port `8080`
-- A Radom Number Generator Service, written in .NET Core, exposes port `8090`
-- A Web Frontend, written in Angular, exposes port `5000`
+- An API Gateway, written in .NET Core, exposes port `8080` (`8080` when in a Container)
+- A Radom Number Generator Service, written in .NET Core, exposes port `8090` (`8080` when in a Container)
+- A Web Frontend, written in Angular, exposes port `4200` (`8080` when in a Container)
 
 ## Make it run
 

env/docker/docker-compose.yaml

@@ -7,11 +7,11 @@ services:
       context: ../../src/api
       dockerfile: Dockerfile
     ports:
-      - "8080:8080"
+      - "5100:8080"
     environment:
       - Database=CosmosDB
       - RandomApiUrl=http://random:8090
-      - Cors="http://localhost:5000"
+      - Cors=http://localhost:8080
     env_file:
       - .env
     depends_on:
@@ -21,8 +21,6 @@ services:
     build:
       context: ../../src/random
       dockerfile: Dockerfile
-    ports:
-      - "8090:8090"
     env_file:
       - .env
 
@@ -31,22 +29,8 @@ services:
       context: ../../src/web
       dockerfile: Dockerfile
     ports:
-      - "5000:8080"
+      - "8080:8080"
     environment:
-      - API_URL=http://localhost:8080
+      - API_URL=http://localhost:5100
     depends_on:
       - api
-
-  # cosmosdb:
-  #   image: mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator
-  #   hostname: cosmosdb
-  #   mem_limit: 3g
-  #   cpus: 2.0
-  #   ports:
-  #     - "8081:8081"
-  #     - "10251:10251"
-  #     - "10252:10252"
-  #     - "10254:10254"
-  #   environment:
-  #     - AZURE_COSMOS_EMULATOR_PARTITION_COUNT=10
-  #     - AZURE_COSMOS_EMULATOR_ENABLE_DATA_PERSISTENCE=true

src/api/MicroCommunication.Api/Startup.cs

@@ -93,6 +93,22 @@ public void ConfigureServices(IServiceCollection services)
                 Console.WriteLine("Using Azure Application Insights");
             }
 
+            // CORS
+            services.AddCors(options => options.AddPolicy("CorsPolicy", builder =>
+            {
+                var cors = string.IsNullOrEmpty(Configuration["Cors"])
+                    ? "http://localhost:5000"
+                    : Configuration["Cors"];
+                Console.WriteLine("CORS: " + Configuration["Cors"]);
+
+                builder
+                    .SetIsOriginAllowedToAllowWildcardSubdomains()
+                    .WithOrigins(Configuration["Cors"])
+                    .AllowAnyMethod()
+                    .AllowAnyHeader()
+                    .AllowCredentials();
+            }));
+
             // Enforce lowercase routes
             services.AddRouting(options => options.LowercaseUrls = true);
 
@@ -144,19 +160,6 @@ public void ConfigureServices(IServiceCollection services)
                     });
                 }
             });
-
-            // CORS
-            services.AddCors(options => options.AddPolicy("CorsPolicy", builder =>
-            {
-                builder
-                    .WithOrigins("http://localhost:5000")
-                    .AllowAnyMethod()
-                    .AllowAnyHeader()
-                    .AllowCredentials();
-
-                if (!string.IsNullOrEmpty(Configuration["Cors"]))
-                    builder.WithOrigins(Configuration["Cors"]);
-            }));
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -176,27 +179,30 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 });
             }
 
+            app.UseSwagger();
+            app.UseSwaggerUI(c =>
+            {
+                c.SwaggerEndpoint("/swagger/1.0/swagger.json", "Version 1.0");
+                c.RoutePrefix = string.Empty;
+            });
+
             app.UseRouting();
 
             app.UseCors("CorsPolicy");
 
             app.UseAuthorization();
 
+            app.UseOpenTelemetryPrometheusScrapingEndpoint();
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapControllers();
                 endpoints.MapHealthChecks("/healthz");
                 endpoints.MapHub<ChatHub>("/chat");
             });
 
-            app.UseOpenTelemetryPrometheusScrapingEndpoint();
 
-            app.UseSwagger();
-            app.UseSwaggerUI(c =>
-            {
-                c.SwaggerEndpoint("/swagger/1.0/swagger.json", "Version 1.0");
-                c.RoutePrefix = string.Empty;
-            });
+
+
         }
     }
 }

src/random/MicroCommunication.Random/Startup.cs

@@ -105,19 +105,6 @@ public void ConfigureServices(IServiceCollection services)
                 var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
                 c.IncludeXmlComments(xmlPath);
             });
-
-            // CORS
-            services.AddCors(options => options.AddPolicy("CorsPolicy", builder =>
-            {
-                builder
-                    .WithOrigins("http://localhost:4200")
-                    .AllowAnyMethod()
-                    .AllowAnyHeader()
-                    .AllowCredentials();
-
-                if (!string.IsNullOrEmpty(Configuration["Cors"]))
-                    builder.WithOrigins(Configuration["Cors"]);
-            }));
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -128,9 +115,14 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseDeveloperExceptionPage();
             }
 
-            app.UseRouting();
+            app.UseSwagger();
+            app.UseSwaggerUI(c =>
+            {
+                c.SwaggerEndpoint("/swagger/1.0/swagger.json", "Version 1.0");
+                c.RoutePrefix = string.Empty;
+            });
 
-            app.UseCors("CorsPolicy");
+            app.UseRouting();
 
             app.UseAuthorization();
 
@@ -139,13 +131,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 endpoints.MapHealthChecks("/healthz");
                 endpoints.MapControllers();
             });
-
-            app.UseSwagger();
-            app.UseSwaggerUI(c =>
-            {
-                c.SwaggerEndpoint("/swagger/1.0/swagger.json", "Version 1.0");
-                c.RoutePrefix = string.Empty;
-            });
         }
     }
 }

src/web/Dockerfile

@@ -17,7 +17,7 @@ RUN npm run build -- --configuration production --output-path=/dist
 #######################################################
 # Step 2: Run the build outcome in a container        #
 #######################################################
-FROM nginx:alpine
+FROM nginx:1.21.0-alpine
 
 # Copy the build outputs over to this container
 COPY nginx.conf /etc/nginx/nginx.conf
@@ -36,5 +36,6 @@ RUN echo "envsubst < /usr/share/nginx/html/assets/appsettings.template.js > /usr
 
 # Switch to new user
 USER node
+EXPOSE 8080
 
 CMD ["/bin/sh", "run.sh"]