Adding IsAuthenticationEnabled property (#35)

shibayan · web-flow · commit e6a5422fd938 · 2023-08-18T17:23:08.000+09:00
diff --git a/src/Azure.WebJobs.Extensions.HttpApi/Azure.WebJobs.Extensions.HttpApi.csproj b/src/Azure.WebJobs.Extensions.HttpApi/Azure.WebJobs.Extensions.HttpApi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
diff --git a/src/Azure.WebJobs.Extensions.HttpApi/Config/HttpApiWebJobsBuilderExtensions.cs b/src/Azure.WebJobs.Extensions.HttpApi/Config/HttpApiWebJobsBuilderExtensions.cs
@@ -10,10 +10,7 @@ public static class HttpApiWebJobsBuilderExtensions
 {
     public static IWebJobsBuilder AddHttpApi(this IWebJobsBuilder builder)
     {
-        if (builder is null)
-        {
-            throw new ArgumentNullException(nameof(builder));
-        }
+        ArgumentNullException.ThrowIfNull(builder);
 
         builder.AddExtension<RoutePrecedenceExtensionConfigProvider>();
 
diff --git a/src/Azure.WebJobs.Extensions.HttpApi/Core/LocalStaticAppResult.cs b/src/Azure.WebJobs.Extensions.HttpApi/Core/LocalStaticAppResult.cs
@@ -17,10 +17,7 @@ public class LocalStaticAppResult : IActionResult
 
     public Task ExecuteResultAsync(ActionContext context)
     {
-        if (context is null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgumentNullException.ThrowIfNull(context);
 
         return s_executor.ExecuteAsync(context, this);
     }
diff --git a/src/Azure.WebJobs.Extensions.HttpApi/Core/ProxyResult.cs b/src/Azure.WebJobs.Extensions.HttpApi/Core/ProxyResult.cs
@@ -10,7 +10,9 @@ public class ProxyResult : IActionResult
 {
     public ProxyResult(string backendUri)
     {
-        BackendUri = backendUri ?? throw new ArgumentNullException(nameof(backendUri));
+        ArgumentNullException.ThrowIfNull(backendUri);
+
+        BackendUri = backendUri;
     }
 
     public string BackendUri { get; }
@@ -23,10 +25,7 @@ public ProxyResult(string backendUri)
 
     public Task ExecuteResultAsync(ActionContext context)
     {
-        if (context is null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgumentNullException.ThrowIfNull(context);
 
         return s_executor.ExecuteAsync(context, this);
     }
diff --git a/src/Azure.WebJobs.Extensions.HttpApi/HttpFunctionBase.cs b/src/Azure.WebJobs.Extensions.HttpApi/HttpFunctionBase.cs
@@ -45,6 +45,7 @@ protected HttpFunctionBase(IHttpContextAccessor httpContextAccessor)
     protected HttpResponse Response => HttpContext?.Response;
     protected ClaimsPrincipal User => HttpContext?.User;
     protected ModelStateDictionary ModelState { get; } = new();
+    protected bool IsAuthenticationEnabled => FunctionAppEnvironment.IsAuthenticationEnabled;
 
     protected IUrlHelper Url
     {
@@ -134,10 +135,7 @@ protected ObjectResult Problem(string detail = null, string instance = null, int
 
     protected BadRequestObjectResult ValidationProblem(ValidationProblemDetails descriptor)
     {
-        if (descriptor is null)
-        {
-            throw new ArgumentNullException(nameof(descriptor));
-        }
+        ArgumentNullException.ThrowIfNull(descriptor);
 
         return new BadRequestObjectResult(descriptor);
     }
@@ -153,20 +151,14 @@ protected ObjectResult ValidationProblem(string detail = null, string instance =
 
     protected CreatedResult Created(string uri, object value)
     {
-        if (uri is null)
-        {
-            throw new ArgumentNullException(nameof(uri));
-        }
+        ArgumentNullException.ThrowIfNull(uri);
 
         return new CreatedResult(uri, value);
     }
 
     protected CreatedResult Created(Uri uri, object value)
     {
-        if (uri is null)
-        {
-            throw new ArgumentNullException(nameof(uri));
-        }
+        ArgumentNullException.ThrowIfNull(uri);
 
         return new CreatedResult(uri, value);
     }
@@ -182,10 +174,7 @@ protected CreatedResult CreatedAtFunction(string functionName, object routeValue
 
     protected AcceptedResult Accepted(Uri uri)
     {
-        if (uri is null)
-        {
-            throw new ArgumentNullException(nameof(uri));
-        }
+        ArgumentNullException.ThrowIfNull(uri);
 
         return new AcceptedResult(uri, null);
     }
@@ -194,10 +183,7 @@ protected AcceptedResult Accepted(Uri uri)
 
     protected AcceptedResult Accepted(Uri uri, object value)
     {
-        if (uri is null)
-        {
-            throw new ArgumentNullException(nameof(uri));
-        }
+        ArgumentNullException.ThrowIfNull(uri);
 
         return new AcceptedResult(uri, value);
     }
@@ -215,20 +201,14 @@ protected AcceptedResult AcceptedAtFunction(string functionName, object routeVal
 
     protected ProxyResult Proxy(string backendUri, Action<HttpRequestMessage> beforeSend = null, Action<HttpResponseMessage> afterSend = null)
     {
-        if (backendUri is null)
-        {
-            throw new ArgumentNullException(nameof(backendUri));
-        }
+        ArgumentNullException.ThrowIfNull(backendUri);
 
         return new ProxyResult(backendUri) { BeforeSend = beforeSend, AfterSend = afterSend };
     }
 
     protected RemoteStaticAppResult RemoteStaticApp(string backendUri, string fallbackExclude = null)
     {
-        if (backendUri is null)
-        {
-            throw new ArgumentNullException(nameof(backendUri));
-        }
+        ArgumentNullException.ThrowIfNull(backendUri);
 
         return new RemoteStaticAppResult(backendUri) { FallbackExclude = fallbackExclude };
     }
diff --git a/src/Azure.WebJobs.Extensions.HttpApi/Internal/FunctionEnvironment.cs b/src/Azure.WebJobs.Extensions.HttpApi/Internal/FunctionEnvironment.cs
@@ -6,5 +6,7 @@ internal static class FunctionAppEnvironment
 {
     public static bool IsAvailable => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME"));
 
+    public static bool IsAuthenticationEnabled => bool.TryParse(Environment.GetEnvironmentVariable("WEBSITE_AUTH_ENABLED"), out var result) && result;
+
     public static string RootPath => IsAvailable ? Environment.ExpandEnvironmentVariables("%HOME%/site/wwwroot") : Environment.CurrentDirectory;
 }
diff --git a/src/Azure.WebJobs.Extensions.HttpApi/Internal/HttpForwarder.cs b/src/Azure.WebJobs.Extensions.HttpApi/Internal/HttpForwarder.cs
@@ -43,13 +43,13 @@ private static HttpMethod GetHttpMethod(string method)
     {
         return method switch
         {
-            { } when HttpMethods.IsGet(method) => HttpMethod.Get,
-            { } when HttpMethods.IsPost(method) => HttpMethod.Post,
-            { } when HttpMethods.IsPut(method) => HttpMethod.Put,
-            { } when HttpMethods.IsDelete(method) => HttpMethod.Delete,
-            { } when HttpMethods.IsOptions(method) => HttpMethod.Options,
-            { } when HttpMethods.IsHead(method) => HttpMethod.Head,
-            { } when HttpMethods.IsPatch(method) => HttpMethod.Patch,
+            not null when HttpMethods.IsGet(method) => HttpMethod.Get,
+            not null when HttpMethods.IsPost(method) => HttpMethod.Post,
+            not null when HttpMethods.IsPut(method) => HttpMethod.Put,
+            not null when HttpMethods.IsDelete(method) => HttpMethod.Delete,
+            not null when HttpMethods.IsOptions(method) => HttpMethod.Options,
+            not null when HttpMethods.IsHead(method) => HttpMethod.Head,
+            not null when HttpMethods.IsPatch(method) => HttpMethod.Patch,
             _ => throw new ArgumentOutOfRangeException(nameof(method), method, null)
         };
     }
@@ -64,12 +64,7 @@ private static bool HasRequestBody(HttpContext httpContext)
             return true;
         }
 
-        if (HttpMethods.IsGet(method) || HttpMethods.IsHead(method) || HttpMethods.IsDelete(method))
-        {
-            return false;
-        }
-
-        return true;
+        return !HttpMethods.IsGet(method) && !HttpMethods.IsHead(method) && !HttpMethods.IsDelete(method);
     }
 
     private static void CopyRequestHeaders(HttpContext httpContext, HttpRequestMessage request)

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,7 @@ public static class HttpApiWebJobsBuilderExtensions`
`10`	`10`	`{`
`11`	`11`	`public static IWebJobsBuilder AddHttpApi(this IWebJobsBuilder builder)`
`12`	`12`	`{`
`13`		`- if (builder is null)`
`14`		`- {`
`15`		`- throw new ArgumentNullException(nameof(builder));`
`16`		`- }`
	`13`	`+ ArgumentNullException.ThrowIfNull(builder);`
`17`	`14`
`18`	`15`	`builder.AddExtension<RoutePrecedenceExtensionConfigProvider>();`
`19`	`16`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,7 @@ public class LocalStaticAppResult : IActionResult`
`17`	`17`
`18`	`18`	`public Task ExecuteResultAsync(ActionContext context)`
`19`	`19`	`{`
`20`		`- if (context is null)`
`21`		`- {`
`22`		`- throw new ArgumentNullException(nameof(context));`
`23`		`- }`
	`20`	`+ ArgumentNullException.ThrowIfNull(context);`
`24`	`21`
`25`	`22`	`return s_executor.ExecuteAsync(context, this);`
`26`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,9 @@ public class ProxyResult : IActionResult`
`10`	`10`	`{`
`11`	`11`	`public ProxyResult(string backendUri)`
`12`	`12`	`{`
`13`		`- BackendUri = backendUri ?? throw new ArgumentNullException(nameof(backendUri));`
	`13`	`+ ArgumentNullException.ThrowIfNull(backendUri);`
	`14`	`+`
	`15`	`+ BackendUri = backendUri;`
`14`	`16`	`}`
`15`	`17`
`16`	`18`	`public string BackendUri { get; }`
`@@ -23,10 +25,7 @@ public ProxyResult(string backendUri)`
`23`	`25`
`24`	`26`	`public Task ExecuteResultAsync(ActionContext context)`
`25`	`27`	`{`
`26`		`- if (context is null)`
`27`		`- {`
`28`		`- throw new ArgumentNullException(nameof(context));`
`29`		`- }`
	`28`	`+ ArgumentNullException.ThrowIfNull(context);`
`30`	`29`
`31`	`30`	`return s_executor.ExecuteAsync(context, this);`
`32`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ protected HttpFunctionBase(IHttpContextAccessor httpContextAccessor)`
`45`	`45`	`protected HttpResponse Response => HttpContext?.Response;`
`46`	`46`	`protected ClaimsPrincipal User => HttpContext?.User;`
`47`	`47`	`protected ModelStateDictionary ModelState { get; } = new();`
	`48`	`+ protected bool IsAuthenticationEnabled => FunctionAppEnvironment.IsAuthenticationEnabled;`
`48`	`49`
`49`	`50`	`protected IUrlHelper Url`
`50`	`51`	`{`
`@@ -134,10 +135,7 @@ protected ObjectResult Problem(string detail = null, string instance = null, int`
`134`	`135`
`135`	`136`	`protected BadRequestObjectResult ValidationProblem(ValidationProblemDetails descriptor)`
`136`	`137`	`{`
`137`		`- if (descriptor is null)`
`138`		`- {`
`139`		`- throw new ArgumentNullException(nameof(descriptor));`
`140`		`- }`
	`138`	`+ ArgumentNullException.ThrowIfNull(descriptor);`
`141`	`139`
`142`	`140`	`return new BadRequestObjectResult(descriptor);`
`143`	`141`	`}`
`@@ -153,20 +151,14 @@ protected ObjectResult ValidationProblem(string detail = null, string instance =`
`153`	`151`
`154`	`152`	`protected CreatedResult Created(string uri, object value)`
`155`	`153`	`{`
`156`		`- if (uri is null)`
`157`		`- {`
`158`		`- throw new ArgumentNullException(nameof(uri));`
`159`		`- }`
	`154`	`+ ArgumentNullException.ThrowIfNull(uri);`
`160`	`155`
`161`	`156`	`return new CreatedResult(uri, value);`
`162`	`157`	`}`
`163`	`158`
`164`	`159`	`protected CreatedResult Created(Uri uri, object value)`
`165`	`160`	`{`
`166`		`- if (uri is null)`
`167`		`- {`
`168`		`- throw new ArgumentNullException(nameof(uri));`
`169`		`- }`
	`161`	`+ ArgumentNullException.ThrowIfNull(uri);`
`170`	`162`
`171`	`163`	`return new CreatedResult(uri, value);`
`172`	`164`	`}`
`@@ -182,10 +174,7 @@ protected CreatedResult CreatedAtFunction(string functionName, object routeValue`
`182`	`174`
`183`	`175`	`protected AcceptedResult Accepted(Uri uri)`
`184`	`176`	`{`
`185`		`- if (uri is null)`
`186`		`- {`
`187`		`- throw new ArgumentNullException(nameof(uri));`
`188`		`- }`
	`177`	`+ ArgumentNullException.ThrowIfNull(uri);`
`189`	`178`
`190`	`179`	`return new AcceptedResult(uri, null);`
`191`	`180`	`}`
`@@ -194,10 +183,7 @@ protected AcceptedResult Accepted(Uri uri)`
`194`	`183`
`195`	`184`	`protected AcceptedResult Accepted(Uri uri, object value)`
`196`	`185`	`{`
`197`		`- if (uri is null)`
`198`		`- {`
`199`		`- throw new ArgumentNullException(nameof(uri));`
`200`		`- }`
	`186`	`+ ArgumentNullException.ThrowIfNull(uri);`
`201`	`187`
`202`	`188`	`return new AcceptedResult(uri, value);`
`203`	`189`	`}`
`@@ -215,20 +201,14 @@ protected AcceptedResult AcceptedAtFunction(string functionName, object routeVal`
`215`	`201`
`216`	`202`	`protected ProxyResult Proxy(string backendUri, Action<HttpRequestMessage> beforeSend = null, Action<HttpResponseMessage> afterSend = null)`
`217`	`203`	`{`
`218`		`- if (backendUri is null)`
`219`		`- {`
`220`		`- throw new ArgumentNullException(nameof(backendUri));`
`221`		`- }`
	`204`	`+ ArgumentNullException.ThrowIfNull(backendUri);`
`222`	`205`
`223`	`206`	`return new ProxyResult(backendUri) { BeforeSend = beforeSend, AfterSend = afterSend };`
`224`	`207`	`}`
`225`	`208`
`226`	`209`	`protected RemoteStaticAppResult RemoteStaticApp(string backendUri, string fallbackExclude = null)`
`227`	`210`	`{`
`228`		`- if (backendUri is null)`
`229`		`- {`
`230`		`- throw new ArgumentNullException(nameof(backendUri));`
`231`		`- }`
	`211`	`+ ArgumentNullException.ThrowIfNull(backendUri);`
`232`	`212`
`233`	`213`	`return new RemoteStaticAppResult(backendUri) { FallbackExclude = fallbackExclude };`
`234`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,7 @@ internal static class FunctionAppEnvironment`
`6`	`6`	`{`
`7`	`7`	`public static bool IsAvailable => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME"));`
`8`	`8`
	`9`	`+ public static bool IsAuthenticationEnabled => bool.TryParse(Environment.GetEnvironmentVariable("WEBSITE_AUTH_ENABLED"), out var result) && result;`
	`10`	`+`
`9`	`11`	`public static string RootPath => IsAvailable ? Environment.ExpandEnvironmentVariables("%HOME%/site/wwwroot") : Environment.CurrentDirectory;`
`10`	`12`	`}`