Merge remote-tracking branch 'origin/master'

2 files changed, 15 insertions, 2 deletions

diff --git a/Timeline/Startup.cs b/Timeline/Startup.cs
index 7552df2e..8e8a6393 100644
--- a/Timeline/Startup.cs
+++ b/Timeline/Startup.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Builder;

+using Microsoft.AspNetCore.Cors.Infrastructure;

 using Microsoft.AspNetCore.Hosting;

 using Microsoft.AspNetCore.HttpOverrides;

 using Microsoft.EntityFrameworkCore;

@@ -34,10 +35,19 @@ namespace Timeline
 

             services.Configure<JwtConfig>(Configuration.GetSection(nameof(JwtConfig)));

             var jwtConfig = Configuration.GetSection(nameof(JwtConfig)).Get<JwtConfig>();

-

             services.AddAuthentication(AuthConstants.Scheme)

                 .AddScheme<AuthOptions, AuthHandler>(AuthConstants.Scheme, AuthConstants.DisplayName, o => { });

 

+            var corsConfig = Configuration.GetSection("Cors").Get<string[]>();

+            services.AddCors(setup =>

+            {

+                setup.AddDefaultPolicy(new CorsPolicyBuilder()

+                    .AllowAnyHeader()

+                    .AllowAnyMethod()

+                    .WithOrigins(corsConfig).Build()

+                );

+            });

+

             services.AddScoped<IUserService, UserService>();

             services.AddScoped<IJwtService, JwtService>();

             services.AddTransient<IPasswordService, PasswordService>();

@@ -68,6 +78,8 @@ namespace Timeline
 

             app.UseRouting();

 

+            app.UseCors();

+

             app.UseAuthentication();

             app.UseAuthorization();

 

diff --git a/Timeline/appsettings.json b/Timeline/appsettings.json
index 2d0f2b9f..61491ff5 100644
--- a/Timeline/appsettings.json
+++ b/Timeline/appsettings.json
@@ -7,5 +7,6 @@
   "JwtConfig": {

     "Issuer": "api.crupest.xyz",

     "Audience": "api.crupest.xyz"

-  }

+  },

+  "Cors": [ "https://www.crupest.xyz", "https://crupest.xyz" ]

 }