Merge pull request #579 from akunzai/simplify-oidc

Simplify OIDC configuration for samples
akunzai · Apr 14, 2024 · 49a9892 · 49a9892
2 parents e1c2cca + 4da3e50
commit 49a9892
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 28 deletions.
diff --git a/samples/AspNetCoreIdentitySample/Program.cs b/samples/AspNetCoreIdentitySample/Program.cs
@@ -56,13 +56,9 @@
         options.ClientId = builder.Configuration["OIDC:ClientId"];
         options.ClientSecret = builder.Configuration["OIDC:ClientSecret"];
         options.Authority = builder.Configuration["OIDC:Authority"];
-        options.MetadataAddress = builder.Configuration["OIDC:MetadataAddress"];
         options.RequireHttpsMetadata = !builder.Environment.IsDevelopment();
         options.SaveTokens = builder.Configuration.GetValue("OIDC:SaveTokens", false);
-        options.ResponseType =
-            builder.Configuration.GetValue("OIDC:ResponseType", OpenIdConnectResponseType.Code)!;
-        options.ResponseMode =
-            builder.Configuration.GetValue("OIDC:ResponseMode", OpenIdConnectResponseMode.Query)!;
+        options.ResponseType = OpenIdConnectResponseType.Code;
         var scope = builder.Configuration["OIDC:Scope"];
         if (!string.IsNullOrWhiteSpace(scope))
         {

diff --git a/samples/AspNetCoreReactSample/Program.cs b/samples/AspNetCoreReactSample/Program.cs
@@ -91,13 +91,9 @@ await context.Options.Events.RedirectToLogout(new RedirectContext<CookieAuthenti
         options.ClientId = builder.Configuration["OIDC:ClientId"];
         options.ClientSecret = builder.Configuration["OIDC:ClientSecret"];
         options.Authority = builder.Configuration["OIDC:Authority"];
-        options.MetadataAddress = builder.Configuration["OIDC:MetadataAddress"];
         options.RequireHttpsMetadata = !builder.Environment.IsDevelopment();
         options.SaveTokens = builder.Configuration.GetValue("OIDC:SaveTokens", false);
-        options.ResponseType =
-            builder.Configuration.GetValue("OIDC:ResponseType", OpenIdConnectResponseType.Code)!;
-        options.ResponseMode =
-            builder.Configuration.GetValue("OIDC:ResponseMode", OpenIdConnectResponseMode.Query)!;
+        options.ResponseType = OpenIdConnectResponseType.Code;
         var scope = builder.Configuration["OIDC:Scope"];
         if (!string.IsNullOrWhiteSpace(scope))
         {

diff --git a/samples/AspNetCoreSample/Program.cs b/samples/AspNetCoreSample/Program.cs
@@ -132,13 +132,9 @@ await context.Options.Events.RedirectToLogout(new RedirectContext<CookieAuthenti
         options.ClientId = builder.Configuration["OIDC:ClientId"];
         options.ClientSecret = builder.Configuration["OIDC:ClientSecret"];
         options.Authority = builder.Configuration["OIDC:Authority"];
-        options.MetadataAddress = builder.Configuration["OIDC:MetadataAddress"];
         options.RequireHttpsMetadata = !builder.Environment.IsDevelopment();
         options.SaveTokens = builder.Configuration.GetValue("OIDC:SaveTokens", false);
-        options.ResponseType =
-            builder.Configuration.GetValue("OIDC:ResponseType", OpenIdConnectResponseType.Code)!;
-        options.ResponseMode =
-            builder.Configuration.GetValue("OIDC:ResponseMode", OpenIdConnectResponseMode.Query)!;
+        options.ResponseType = OpenIdConnectResponseType.Code;
         var scope = builder.Configuration["OIDC:Scope"];
         if (!string.IsNullOrWhiteSpace(scope))
         {

diff --git a/samples/BlazorSample/Program.cs b/samples/BlazorSample/Program.cs
@@ -94,13 +94,9 @@ await context.Options.Events.RedirectToLogout(new RedirectContext<CookieAuthenti
         options.ClientId = builder.Configuration["OIDC:ClientId"];
         options.ClientSecret = builder.Configuration["OIDC:ClientSecret"];
         options.Authority = builder.Configuration["OIDC:Authority"];
-        options.MetadataAddress = builder.Configuration["OIDC:MetadataAddress"];
         options.RequireHttpsMetadata = !builder.Environment.IsDevelopment();
         options.SaveTokens = builder.Configuration.GetValue("OIDC:SaveTokens", false);
-        options.ResponseType =
-            builder.Configuration.GetValue("OIDC:ResponseType", OpenIdConnectResponseType.Code)!;
-        options.ResponseMode =
-            builder.Configuration.GetValue("OIDC:ResponseMode", OpenIdConnectResponseMode.Query)!;
+        options.ResponseType = OpenIdConnectResponseType.Code;
         var scope = builder.Configuration["OIDC:Scope"];
         if (!string.IsNullOrWhiteSpace(scope))
         {

diff --git a/samples/OwinSample/Startup.cs b/samples/OwinSample/Startup.cs
@@ -173,17 +173,11 @@ public void Configuration(IAppBuilder app)
                 ClientId = configuration["OIDC:ClientId"],
                 ClientSecret = configuration["OIDC:ClientSecret"],
                 Authority = configuration["OIDC:Authority"],
-                MetadataAddress = configuration["OIDC:MetadataAddress"],
                 RequireHttpsMetadata = !env.Equals("Development", StringComparison.OrdinalIgnoreCase),
                 SaveTokens = configuration.GetValue("OIDC:SaveTokens", false),
-                ResponseType =
-                    configuration.GetValue("OIDC:ResponseType", OpenIdConnectResponseType.Code),
-                ResponseMode =
-                    configuration.GetValue("OIDC:ResponseMode", OpenIdConnectResponseMode.Query),
+                ResponseType = OpenIdConnectResponseType.Code,
                 // https://github.com/aspnet/AspNetKatana/issues/348
-                RedeemCode =
-                    configuration.GetValue("OIDC:ResponseType", OpenIdConnectResponseType.Code)
-                        .Contains(OpenIdConnectResponseType.Code),
+                RedeemCode = true,
                 Scope = configuration.GetValue("OIDC:Scope", OpenIdConnectScope.OpenIdProfile),
                 TokenValidationParameters = { NameClaimType = configuration.GetValue("OIDC:NameClaimType", "name") },
                 // https://github.com/aspnet/AspNetKatana/wiki/System.Web-response-cookie-integration-issues