Add CORS support in the Zirku.Server sample

openiddict · Dec 20, 2024 · 6e1b9aa · 6e1b9aa
1 parent 7388e2d
commit 6e1b9aa
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/samples/Hollastin/Hollastin.Server/Startup.cs b/samples/Hollastin/Hollastin.Server/Startup.cs
@@ -18,7 +18,6 @@ public Startup(IConfiguration configuration)
 
     public void ConfigureServices(IServiceCollection services)
     {
-        services.AddCors();
         services.AddControllersWithViews();
 
         services.AddDbContext<ApplicationDbContext>(options =>

diff --git a/samples/Imynusoph/Imynusoph.Server/Startup.cs b/samples/Imynusoph/Imynusoph.Server/Startup.cs
@@ -20,7 +20,6 @@ public Startup(IConfiguration configuration)
 
     public void ConfigureServices(IServiceCollection services)
     {
-        services.AddCors();
         services.AddControllersWithViews();
 
         services.AddDbContext<ApplicationDbContext>(options =>

diff --git a/samples/Zirku/Zirku.Api1/Program.cs b/samples/Zirku/Zirku.Api1/Program.cs
@@ -28,13 +28,17 @@
         options.UseAspNetCore();
     });
 
-builder.Services.AddCors();
+builder.Services.AddCors(options => options.AddDefaultPolicy(policy =>
+    policy.AllowAnyHeader()
+          .AllowAnyMethod()
+          .WithOrigins("http://localhost:5112")));
+
 builder.Services.AddAuthentication(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme);
 builder.Services.AddAuthorization();
 
 var app = builder.Build();
 
-app.UseCors(b => b.AllowAnyHeader().AllowAnyMethod().WithOrigins("http://localhost:5112"));
+app.UseCors();
 app.UseHttpsRedirection();
 
 app.UseAuthentication();

diff --git a/samples/Zirku/Zirku.Api2/Program.cs b/samples/Zirku/Zirku.Api2/Program.cs
@@ -33,11 +33,17 @@
         options.UseAspNetCore();
     });
 
+builder.Services.AddCors(options => options.AddDefaultPolicy(policy =>
+    policy.AllowAnyHeader()
+          .AllowAnyMethod()
+          .WithOrigins("http://localhost:5112")));
+
 builder.Services.AddAuthentication(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme);
 builder.Services.AddAuthorization();
 
 var app = builder.Build();
 
+app.UseCors();
 app.UseHttpsRedirection();
 
 app.UseAuthentication();

diff --git a/samples/Zirku/Zirku.Server/Program.cs b/samples/Zirku/Zirku.Server/Program.cs
@@ -99,12 +99,16 @@
         options.UseAspNetCore();
     });
 
-builder.Services.AddCors();
+builder.Services.AddCors(options => options.AddDefaultPolicy(policy =>
+    policy.AllowAnyHeader()
+          .AllowAnyMethod()
+          .WithOrigins("http://localhost:5112")));
+
 builder.Services.AddAuthorization();
 
 var app = builder.Build();
 
-app.UseCors(b => b.AllowAnyHeader().AllowAnyMethod().WithOrigins("http://localhost:5112"));
+app.UseCors();
 app.UseHttpsRedirection();
 
 // Create new application registrations matching the values configured in Zirku.Client1 and Zirku.Api1.
@@ -278,7 +282,7 @@ await manager.CreateAsync(new OpenIddictScopeDescriptor
     identity.SetScopes(identifier switch
     {
         1 => request.GetScopes(),
-        2 => new[] { "api1" }.Intersect(request.GetScopes()),
+        2 => new[] { Scopes.OpenId, "api1" }.Intersect(request.GetScopes()),
         _ => throw new InvalidOperationException()
     });