Update samples

alec-petersen · alec-petersen · commit 2e1176c30eed · 2026-01-04T13:01:47.000-07:00
diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Org.OpenAPITools.Authentication
@@ -57,16 +58,17 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
         private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement)
         {
+            var httpContext = (context.Resource as AuthorizationFilterContext)?.HttpContext
+                ?? context.Resource as HttpContext;
 
-            if (context.Resource is AuthorizationFilterContext authorizationFilterContext)
+            if (httpContext == null)
+                return;
+
+            var apiKey = httpContext.Request.Headers["api_key"].FirstOrDefault();
+            if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
             {
-                var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault();
-                if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
-                {
-                    context.Succeed(requirement);
-                }
+                context.Succeed(requirement);
             }
-
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Org.OpenAPITools.Authentication
@@ -57,16 +58,17 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
         private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement)
         {
+            var httpContext = (context.Resource as AuthorizationFilterContext)?.HttpContext
+                ?? context.Resource as HttpContext;
 
-            if (context.Resource is AuthorizationFilterContext authorizationFilterContext)
+            if (httpContext == null)
+                return;
+
+            var apiKey = httpContext.Request.Headers["api_key"].FirstOrDefault();
+            if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
             {
-                var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault();
-                if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
-                {
-                    context.Succeed(requirement);
-                }
+                context.Succeed(requirement);
             }
-
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Org.OpenAPITools.Authentication
@@ -57,16 +58,17 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
         private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement)
         {
+            var httpContext = (context.Resource as AuthorizationFilterContext)?.HttpContext
+                ?? context.Resource as HttpContext;
 
-            if (context.Resource is AuthorizationFilterContext authorizationFilterContext)
+            if (httpContext == null)
+                return;
+
+            var apiKey = httpContext.Request.Headers["api_key"].FirstOrDefault();
+            if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
             {
-                var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault();
-                if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
-                {
-                    context.Succeed(requirement);
-                }
+                context.Succeed(requirement);
             }
-
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Org.OpenAPITools.Authentication
@@ -57,16 +58,17 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
         private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement)
         {
+            var httpContext = (context.Resource as AuthorizationFilterContext)?.HttpContext
+                ?? context.Resource as HttpContext;
 
-            if (context.Resource is AuthorizationFilterContext authorizationFilterContext)
+            if (httpContext == null)
+                return;
+
+            var apiKey = httpContext.Request.Headers["api_key"].FirstOrDefault();
+            if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
             {
-                var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault();
-                if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
-                {
-                    context.Succeed(requirement);
-                }
+                context.Succeed(requirement);
             }
-
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Org.OpenAPITools.Authentication
@@ -57,16 +58,17 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
         private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement)
         {
+            var httpContext = (context.Resource as AuthorizationFilterContext)?.HttpContext
+                ?? context.Resource as HttpContext;
 
-            if (context.Resource is AuthorizationFilterContext authorizationFilterContext)
+            if (httpContext == null)
+                return;
+
+            var apiKey = httpContext.Request.Headers["api_key"].FirstOrDefault();
+            if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
             {
-                var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault();
-                if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
-                {
-                    context.Succeed(requirement);
-                }
+                context.Succeed(requirement);
             }
-
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Org.OpenAPITools.Authentication
@@ -57,16 +58,17 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
         private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement)
         {
+            var httpContext = (context.Resource as AuthorizationFilterContext)?.HttpContext
+                ?? context.Resource as HttpContext;
 
-            if (context.Resource is AuthorizationFilterContext authorizationFilterContext)
+            if (httpContext == null)
+                return;
+
+            var apiKey = httpContext.Request.Headers["api_key"].FirstOrDefault();
+            if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
             {
-                var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault();
-                if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
-                {
-                    context.Succeed(requirement);
-                }
+                context.Succeed(requirement);
             }
-
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Org.OpenAPITools.Authentication
@@ -57,16 +58,17 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
         private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement)
         {
+            var httpContext = (context.Resource as AuthorizationFilterContext)?.HttpContext
+                ?? context.Resource as HttpContext;
 
-            if (context.Resource is AuthorizationFilterContext authorizationFilterContext)
+            if (httpContext == null)
+                return;
+
+            var apiKey = httpContext.Request.Headers["api_key"].FirstOrDefault();
+            if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
             {
-                var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault();
-                if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
-                {
-                    context.Succeed(requirement);
-                }
+                context.Succeed(requirement);
             }
-
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Org.OpenAPITools.Authentication
@@ -57,16 +58,17 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
         private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement)
         {
+            var httpContext = (context.Resource as AuthorizationFilterContext)?.HttpContext
+                ?? context.Resource as HttpContext;
 
-            if (context.Resource is AuthorizationFilterContext authorizationFilterContext)
+            if (httpContext == null)
+                return;
+
+            var apiKey = httpContext.Request.Headers["api_key"].FirstOrDefault();
+            if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
             {
-                var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault();
-                if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
-                {
-                    context.Succeed(requirement);
-                }
+                context.Succeed(requirement);
             }
-
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Org.OpenAPITools.Authentication
@@ -57,16 +58,17 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
         private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement)
         {
+            var httpContext = (context.Resource as AuthorizationFilterContext)?.HttpContext
+                ?? context.Resource as HttpContext;
 
-            if (context.Resource is AuthorizationFilterContext authorizationFilterContext)
+            if (httpContext == null)
+                return;
+
+            var apiKey = httpContext.Request.Headers["api_key"].FirstOrDefault();
+            if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
             {
-                var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault();
-                if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
-                {
-                    context.Succeed(requirement);
-                }
+                context.Succeed(requirement);
             }
-
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Org.OpenAPITools.Authentication
@@ -57,16 +58,17 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
         private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement)
         {
+            var httpContext = (context.Resource as AuthorizationFilterContext)?.HttpContext
+                ?? context.Resource as HttpContext;
 
-            if (context.Resource is AuthorizationFilterContext authorizationFilterContext)
+            if (httpContext == null)
+                return;
+
+            var apiKey = httpContext.Request.Headers["api_key"].FirstOrDefault();
+            if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
             {
-                var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault();
-                if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
-                {
-                    context.Succeed(requirement);
-                }
+                context.Succeed(requirement);
             }
-
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Org.OpenAPITools.Authentication
@@ -57,16 +58,17 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
         private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement)
         {
+            var httpContext = (context.Resource as AuthorizationFilterContext)?.HttpContext
+                ?? context.Resource as HttpContext;
 
-            if (context.Resource is AuthorizationFilterContext authorizationFilterContext)
+            if (httpContext == null)
+                return;
+
+            var apiKey = httpContext.Request.Headers["api_key"].FirstOrDefault();
+            if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
             {
-                var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault();
-                if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
-                {
-                    context.Succeed(requirement);
-                }
+                context.Succeed(requirement);
             }
-
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Org.OpenAPITools.Authentication
@@ -57,16 +58,17 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
         private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement)
         {
+            var httpContext = (context.Resource as AuthorizationFilterContext)?.HttpContext
+                ?? context.Resource as HttpContext;
 
-            if (context.Resource is AuthorizationFilterContext authorizationFilterContext)
+            if (httpContext == null)
+                return;
+
+            var apiKey = httpContext.Request.Headers["api_key"].FirstOrDefault();
+            if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
             {
-                var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault();
-                if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))
-                {
-                    context.Succeed(requirement);
-                }
+                context.Succeed(requirement);
             }
-
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
diff --git a/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
diff --git a/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs
diff --git a/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using System.Linq;`
`13`	`13`	`using System.Threading.Tasks;`
`14`	`14`	`using Microsoft.AspNetCore.Authorization;`
	`15`	`+using Microsoft.AspNetCore.Http;`
`15`	`16`	`using Microsoft.AspNetCore.Mvc.Filters;`
`16`	`17`
`17`	`18`	`namespace Org.OpenAPITools.Authentication`
`@@ -57,16 +58,17 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte`
`57`	`58`
`58`	`59`	`private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement)`
`59`	`60`	`{`
	`61`	`+ var httpContext = (context.Resource as AuthorizationFilterContext)?.HttpContext`
	`62`	`+ ?? context.Resource as HttpContext;`
`60`	`63`
`61`		`- if (context.Resource is AuthorizationFilterContext authorizationFilterContext)`
	`64`	`+ if (httpContext == null)`
	`65`	`+ return;`
	`66`	`+`
	`67`	`+ var apiKey = httpContext.Request.Headers["api_key"].FirstOrDefault();`
	`68`	`+ if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))`
`62`	`69`	`{`
`63`		`- var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault();`
`64`		`- if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey))`
`65`		`- {`
`66`		`- context.Succeed(requirement);`
`67`		`- }`
	`70`	`+ context.Succeed(requirement);`
`68`	`71`	`}`
`69`		`-`
`70`	`72`	`}`
`71`	`73`	`}`
`72`	`74`	`}`