From a540bd0bcc5e4e03a9dc5d031443f9e4f7bf38b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sat, 16 Jan 2021 16:58:25 +0300
Subject: [PATCH] Make blazor UI working

---
 .../EventHub.Admin/wwwroot/appsettings.json   |  2 +-
 .../src/EventHub.DbMigrator/appsettings.json  | 14 +++-------
 .../src/EventHub.Web/EventHubWebModule.cs     | 28 +++++++++++++++++++
 .../src/EventHub.Web/appsettings.json         |  3 +-
 event-organizer/src/EventHub.Web/tempkey.jwk  |  1 +
 5 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 event-organizer/src/EventHub.Web/tempkey.jwk

diff --git a/event-organizer/src/EventHub.Admin/wwwroot/appsettings.json b/event-organizer/src/EventHub.Admin/wwwroot/appsettings.json
index fb6e93f..656c815 100644
--- a/event-organizer/src/EventHub.Admin/wwwroot/appsettings.json
+++ b/event-organizer/src/EventHub.Admin/wwwroot/appsettings.json
@@ -9,7 +9,7 @@
   },
   "RemoteServices": {
     "Default": {
-      "BaseUrl": "https://localhost:44349"
+      "BaseUrl": "https://localhost:44361"
     }
   },
   "AbpCli": {
diff --git a/event-organizer/src/EventHub.DbMigrator/appsettings.json b/event-organizer/src/EventHub.DbMigrator/appsettings.json
index 594b632..85a72a0 100644
--- a/event-organizer/src/EventHub.DbMigrator/appsettings.json
+++ b/event-organizer/src/EventHub.DbMigrator/appsettings.json
@@ -4,15 +4,9 @@
   },
   "IdentityServer": {
     "Clients": {
-      "EventHub_Web": {
-        "ClientId": "EventHub_Web",
-        "ClientSecret": "1q2w3e*",
-        "RootUrl": "https://localhost:44361"
-      },
-      "EventHub_App": {
-        "ClientId": "EventHub_App",
-        "ClientSecret": "1q2w3e*",
-        "RootUrl": "http://localhost:4200"
+      "EventHub_Blazor": {
+        "ClientId": "EventHub_Blazor",
+        "RootUrl": "https://localhost:44307"
       },
       "EventHub_Swagger": {
         "ClientId": "EventHub_Swagger",
@@ -21,4 +15,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/event-organizer/src/EventHub.Web/EventHubWebModule.cs b/event-organizer/src/EventHub.Web/EventHubWebModule.cs
index 188482d..72b0cc5 100644
--- a/event-organizer/src/EventHub.Web/EventHubWebModule.cs
+++ b/event-organizer/src/EventHub.Web/EventHubWebModule.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Linq;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -9,6 +10,7 @@ using EventHub.EntityFrameworkCore;
 using EventHub.Localization;
 using EventHub.MultiTenancy;
 using EventHub.Web.Menus;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.OpenApi.Models;
 using Volo.Abp;
 using Volo.Abp.Account.Web;
@@ -54,6 +56,8 @@ namespace EventHub.Web
         )]
     public class EventHubWebModule : AbpModule
     {
+        private const string DefaultCorsPolicyName = "Default";
+
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.PreConfigure<AbpMvcDataAnnotationsLocalizationOptions>(options =>
@@ -74,6 +78,7 @@ namespace EventHub.Web
             var hostingEnvironment = context.Services.GetHostingEnvironment();
             var configuration = context.Services.GetConfiguration();
 
+            ConfigureCors(context, configuration);
             ConfigureUrls(configuration);
             ConfigureBundles();
             ConfigureAuthentication(context, configuration);
@@ -85,6 +90,28 @@ namespace EventHub.Web
             ConfigureSwaggerServices(context.Services);
         }
 
+        private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration)
+        {
+            context.Services.AddCors(options =>
+            {
+                options.AddPolicy(DefaultCorsPolicyName, builder =>
+                {
+                    builder
+                        .WithOrigins(
+                            configuration["App:CorsOrigins"]
+                                .Split(",", StringSplitOptions.RemoveEmptyEntries)
+                                .Select(o => o.RemovePostFix("/"))
+                                .ToArray()
+                        )
+                        .WithAbpExposedHeaders()
+                        .SetIsOriginAllowedToAllowWildcardSubdomains()
+                        .AllowAnyHeader()
+                        .AllowAnyMethod()
+                        .AllowCredentials();
+                });
+            });
+        }
+
         private void ConfigureUrls(IConfiguration configuration)
         {
             Configure<AppUrlOptions>(options =>
@@ -209,6 +236,7 @@ namespace EventHub.Web
             app.UseCorrelationId();
             app.UseVirtualFiles();
             app.UseRouting();
+            app.UseCors(DefaultCorsPolicyName);
             app.UseAuthentication();
             app.UseJwtTokenMiddleware();
 
diff --git a/event-organizer/src/EventHub.Web/appsettings.json b/event-organizer/src/EventHub.Web/appsettings.json
index 6798a6f..cad2297 100644
--- a/event-organizer/src/EventHub.Web/appsettings.json
+++ b/event-organizer/src/EventHub.Web/appsettings.json
@@ -1,6 +1,7 @@
 {
   "App": {
-    "SelfUrl": "https://localhost:44361"
+    "SelfUrl": "https://localhost:44361",
+    "CorsOrigins": "https://localhost:44307"
   },
   "ConnectionStrings": {
     "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=EventHub;Trusted_Connection=True"
diff --git a/event-organizer/src/EventHub.Web/tempkey.jwk b/event-organizer/src/EventHub.Web/tempkey.jwk
new file mode 100644
index 0000000..f776273
--- /dev/null
+++ b/event-organizer/src/EventHub.Web/tempkey.jwk
@@ -0,0 +1 @@
+{"AdditionalData":{},"Alg":"RS256","Crv":null,"D":"csMD2n17GE8y-VNzzTdSfdQCz_tKKvE_mniO3bkAnWpYn6CIkJI5BhXOM00cMdnznzDwOnjnnR5LvQuOTrc-EGmhQUvLt0DnanMNI33hEesOlsmPVYk7NY7uvPpHB5zDGpvtp0Aeen0TRuW1qAwwEKxX2jiAOPVL5gBZMLVmaDC08bNe8gVFM96LjT_Myp4qoLlf7rtAupi8uwyoz7fA0eKh4SKZQUxc5a4bNHAm_Ly8ZG6bhJWWFinjZi8OKwcSykI9DbA3EjyZ4FGxRyMjSYPlWNWMhKrGb2PIG9tJHLTAU1EctJ9wptvGMsGs6hnFxwawVlFrA_r-zBmldSL5sQ","DP":"BlvYqPmXXSCR9vpGr8DGev9MFWXPLCgSaLJbbiWZVLeKgj9uy8hoNM-6t-5c6LJnvyxcmNKdM0w63ZmUrgUQ6n3___mAdXn-1_7LzHUI6-w58TjW4tmBpbIoWwBQKFa5M9oRtbbSBTwzk2clqk26eRuQ3rU4sdlzCfqhykLKp4U","DQ":"CQ26697rEKID3T9Z58FrQYmPu0ewAfpImB_wsRQf4eIyOLvHlunh1dyTvc2xPPlXqNjNrbSeW6_pwQ4fLJ0_B7B4nMCJtG3i3q43WZ7fdv1ubqZlK6lxtFHmVt4DwsxhvBVw44v9M9OIvUFpPcCoc7lp9xZ_soXNij4AU6d4YzU","E":"AQAB","K":null,"KeyId":"22203EC871C35BB74EDBD1E5407EB51F","Kid":"22203EC871C35BB74EDBD1E5407EB51F","Kty":"RSA","N":"mrfC-7sbA7LLPEzUQIRI_tVjras_KfU6bqIJgyCe3LCjg9m0jUZiwNIUkKXnQ7ajoxYYCCMQD98vhMR3s7DHkNGPnSYMXCldOq2n231WmJ1mBr3TYU0Uco-59Y6mjETlZFOLUWdPiH9NupNknVJCKz-DVMmaQ9DBmjzJ4-Rmh9Oz7Iu3vR3empsYfHOPcU9fXHv8sSN_znFOlNx3UEXhc58oyjcQK_EpXTptjAOTa8MkEm7HO068PyblN4yPh7k0XdQEsJiEvjgZZtjKib4dVQddwV0QiSxLh4NKSCCcE-_RE4rVH-mNtTUW8VKJLLoiZmXAJThXr4hLIxtjVeLcNQ","Oth":null,"P":"xkGlfTq-UlI3979pOqL7WCXi2vaR5ha4ubMLgnB4H0i8Qn1Tc5ou6lBSxmdhEqwFEFU5Yo2FeEIHh7oglzsPSqVy9yunNp3gk87FsatnJmGofQzsO3sRMmWT_iH_l5zO3g3UnecfbaMNWTzH6QelP1W8j_cokHWDN_uWZWYro2c","Q":"x8fMa7rzuLkwuRRxAt9VPk2vZMxk0dMOK9VRSKWT6WxxVzrQIprfDSMiKogbH2zVQ3HStIS_CPzZS6s0IBnT8tr2R3gF8dQnAlWuRdZgAn2fd-H9EwQVLwdMFyF_d3qdmuh3YSGuRV1P4oi_oFCGJx8A57ug7a77WW5hBrSrPgM","QI":"aqt6y8XYfJdOcLPMVXwyy00JShjCiV3GjhqflVFNqlq9jQWgGcQ_1J_Kct1Lz9-Hh3BDy-dr4J-FhwfFhTS_J9xDEWJYU0Xi0K7uElI56wPkt0q29aQ_-xffhBqpbQSNCz5HPqVS9MRe95CWOIE1XNrb-6KuXM1jf3bBmL61ovI","Use":null,"X":null,"X5t":null,"X5tS256":null,"X5u":null,"Y":null,"KeySize":2048,"HasPrivateKey":true,"CryptoProviderFactory":{"CryptoProviderCache":{},"CustomCryptoProvider":null,"CacheSignatureProviders":true}}
\ No newline at end of file