add async to CallWebApiAsync (#358)

AzureAD · Jul 23, 2020 · 32e8caa · 32e8caa
1 parent a141b88
commit 32e8caa
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/ProjectTemplates/templates/BlazorServerWeb-CSharp/Pages/CallWebApi.razor b/ProjectTemplates/templates/BlazorServerWeb-CSharp/Pages/CallWebApi.razor
@@ -23,6 +23,6 @@ else
 
     protected override async Task OnInitializedAsync()
     {
-        apiResult = await downstreamAPI.CallWebApi();
+        apiResult = await downstreamAPI.CallWebApiAsync();
     }
 }
diff --git a/ProjectTemplates/templates/BlazorServerWeb-CSharp/Services/DownstreamWebApi.cs b/ProjectTemplates/templates/BlazorServerWeb-CSharp/Services/DownstreamWebApi.cs
@@ -9,7 +9,7 @@ namespace BlazorServerWeb_CSharp
 {
     public interface IDownstreamWebApi
     {
-        Task<string> CallWebApi(string relativeEndpoint = "", string[] requiredScopes = null);
+        Task<string> CallWebApiAsync(string relativeEndpoint = "", string[] requiredScopes = null);
     }
 
     public static class DownstreamWebApiExtensions
@@ -46,7 +46,7 @@ public DownstreamWebApi(
         /// not specified, uses scopes from the configuration</param>
         /// <param name="relativeEndpoint">Endpoint relative to the CalledApiUrl configuration</param>
         /// <returns>A JSON string representing the result of calling the Web API</returns>
-        public async Task<string> CallWebApi(string relativeEndpoint = "", string[] requiredScopes = null)
+        public async Task<string> CallWebApiAsync(string relativeEndpoint = "", string[] requiredScopes = null)
         {
             string[] scopes = requiredScopes ?? _configuration["CalledApi:CalledApiScopes"]?.Split(' ');
             string apiUrl = (_configuration["CalledApi:CalledApiUrl"] as string)?.TrimEnd('/') + $"/{relativeEndpoint}";

diff --git a/...es/templates/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs b/...es/templates/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs
@@ -52,7 +52,7 @@ public async Task<IEnumerable<WeatherForecast>> Get()
         {
             HttpContext.VerifyUserHasAnyAcceptedScope(scopeRequiredByApi);
 
-            string downstreamApiResult = await _downstreamWebApi.CallWebApi();
+            string downstreamApiResult = await _downstreamWebApi.CallWebApiAsync();
 
             var rng = new Random();
             return Enumerable.Range(1, 5).Select(index => new WeatherForecast

diff --git a/ProjectTemplates/templates/ComponentsWebAssembly-CSharp/Server/Services/DownstreamWebApi.cs b/ProjectTemplates/templates/ComponentsWebAssembly-CSharp/Server/Services/DownstreamWebApi.cs
@@ -9,7 +9,7 @@ namespace ComponentsWebAssembly_CSharp.Server
 {
     public interface IDownstreamWebApi
     {
-        Task<string> CallWebApi(string relativeEndpoint = "", string[] requiredScopes = null);
+        Task<string> CallWebApiAsync(string relativeEndpoint = "", string[] requiredScopes = null);
     }
 
     public static class DownstreamWebApiExtensions
@@ -46,7 +46,7 @@ public DownstreamWebApi(
         /// not specified, uses scopes from the configuration</param>
         /// <param name="relativeEndpoint">Endpoint relative to the CalledApiUrl configuration</param>
         /// <returns>A JSON string representing the result of calling the Web API</returns>
-        public async Task<string> CallWebApi(string relativeEndpoint = "", string[] requiredScopes = null)
+        public async Task<string> CallWebApiAsync(string relativeEndpoint = "", string[] requiredScopes = null)
         {
             string[] scopes = requiredScopes ?? _configuration["CalledApi:CalledApiScopes"]?.Split(' ');
             string apiUrl = (_configuration["CalledApi:CalledApiUrl"] as string)?.TrimEnd('/') + $"/{relativeEndpoint}";

diff --git a/ProjectTemplates/templates/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs b/ProjectTemplates/templates/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs
@@ -36,7 +36,7 @@ public IndexModel(ILogger<IndexModel> logger,
 
         public async Task OnGet()
         {
-            ViewData["ApiResult"] = await _downstreamWebApi.CallWebApi();
+            ViewData["ApiResult"] = await _downstreamWebApi.CallWebApiAsync();
         }
 #elseif (GenerateGraph)
         private readonly GraphServiceClient _graphServiceClient;

diff --git a/ProjectTemplates/templates/RazorPagesWeb-CSharp/Services/DownstreamWebApi.cs b/ProjectTemplates/templates/RazorPagesWeb-CSharp/Services/DownstreamWebApi.cs
@@ -9,7 +9,7 @@ namespace Company.WebApplication1
 {
     public interface IDownstreamWebApi
     {
-        Task<string> CallWebApi(string relativeEndpoint = "", string[] requiredScopes = null);
+        Task<string> CallWebApiAsync(string relativeEndpoint = "", string[] requiredScopes = null);
     }
 
     public static class DownstreamWebApiExtensions
@@ -46,7 +46,7 @@ public DownstreamWebApi(
         /// not specified, uses scopes from the configuration</param>
         /// <param name="relativeEndpoint">Endpoint relative to the CalledApiUrl configuration</param>
         /// <returns>A JSON string representing the result of calling the Web API</returns>
-        public async Task<string> CallWebApi(string relativeEndpoint = "", string[] requiredScopes = null)
+        public async Task<string> CallWebApiAsync(string relativeEndpoint = "", string[] requiredScopes = null)
         {
             string[] scopes = requiredScopes ?? _configuration["CalledApi:CalledApiScopes"]?.Split(' ');
             string apiUrl = (_configuration["CalledApi:CalledApiUrl"] as string)?.TrimEnd('/') + $"/{relativeEndpoint}";

diff --git a/ProjectTemplates/templates/StarterWeb-CSharp/Controllers/HomeController.cs b/ProjectTemplates/templates/StarterWeb-CSharp/Controllers/HomeController.cs
@@ -41,7 +41,7 @@ public HomeController(ILogger<HomeController> logger,
         [AuthorizeForScopes(ScopeKeySection = "CalledApi:CalledApiScopes")]
         public async Task<IActionResult> Index()
         {
-            ViewData["ApiResult"] = await _downstreamWebApi.CallWebApi();
+            ViewData["ApiResult"] = await _downstreamWebApi.CallWebApiAsync();
             return View();
         }
 #elseif (GenerateGraph)

diff --git a/ProjectTemplates/templates/StarterWeb-CSharp/Services/DownstreamWebApi.cs b/ProjectTemplates/templates/StarterWeb-CSharp/Services/DownstreamWebApi.cs
@@ -9,7 +9,7 @@ namespace Company.WebApplication1
 {
     public interface IDownstreamWebApi
     {
-        Task<string> CallWebApi(string relativeEndpoint = "", string[] requiredScopes = null);
+        Task<string> CallWebApiAsync(string relativeEndpoint = "", string[] requiredScopes = null);
     }
 
     public static class DownstreamWebApiExtensions
@@ -46,7 +46,7 @@ public DownstreamWebApi(
         /// not specified, uses scopes from the configuration</param>
         /// <param name="relativeEndpoint">Endpoint relative to the CalledApiUrl configuration</param>
         /// <returns>A JSON string representing the result of calling the Web API</returns>
-        public async Task<string> CallWebApi(string relativeEndpoint = "", string[] requiredScopes = null)
+        public async Task<string> CallWebApiAsync(string relativeEndpoint = "", string[] requiredScopes = null)
         {
             string[] scopes = requiredScopes ?? _configuration["CalledApi:CalledApiScopes"]?.Split(' ');
             string apiUrl = (_configuration["CalledApi:CalledApiUrl"] as string)?.TrimEnd('/') + $"/{relativeEndpoint}";

diff --git a/ProjectTemplates/templates/WebApi-CSharp/Controllers/WeatherForecastController.cs b/ProjectTemplates/templates/WebApi-CSharp/Controllers/WeatherForecastController.cs
@@ -54,7 +54,7 @@ public async Task<IEnumerable<WeatherForecast>> Get()
         {
             HttpContext.VerifyUserHasAnyAcceptedScope(scopeRequiredByApi);
 
-            string downstreamApiResult = await _downstreamWebApi.CallWebApi();
+            string downstreamApiResult = await _downstreamWebApi.CallWebApiAsync();
 
             var rng = new Random();
             return Enumerable.Range(1, 5).Select(index => new WeatherForecast

diff --git a/ProjectTemplates/templates/WebApi-CSharp/Services/DownstreamWebApi.cs b/ProjectTemplates/templates/WebApi-CSharp/Services/DownstreamWebApi.cs
@@ -9,7 +9,7 @@ namespace Company.WebApplication1
 {
     public interface IDownstreamWebApi
     {
-        Task<string> CallWebApi(string relativeEndpoint = "", string[] requiredScopes = null);
+        Task<string> CallWebApiAsync(string relativeEndpoint = "", string[] requiredScopes = null);
     }
 
     public static class DownstreamWebApiExtensions
@@ -46,7 +46,7 @@ public DownstreamWebApi(
         /// not specified, uses scopes from the configuration</param>
         /// <param name="relativeEndpoint">Endpoint relative to the CalledApiUrl configuration</param>
         /// <returns>A JSON string representing the result of calling the Web API</returns>
-        public async Task<string> CallWebApi(string relativeEndpoint = "", string[] requiredScopes = null)
+        public async Task<string> CallWebApiAsync(string relativeEndpoint = "", string[] requiredScopes = null)
         {
             string[] scopes = requiredScopes ?? _configuration["CalledApi:CalledApiScopes"]?.Split(' ');
             string apiUrl = (_configuration["CalledApi:CalledApiUrl"] as string)?.TrimEnd('/') + $"/{relativeEndpoint}";

diff --git a/tests/BlazorServerCallsGraph/Pages/CallWebApi.razor b/tests/BlazorServerCallsGraph/Pages/CallWebApi.razor
@@ -23,6 +23,6 @@ else
 
     protected override async Task OnInitializedAsync()
     {
-        apiResult = await downstreamAPI.CallWebApi();
+        apiResult = await downstreamAPI.CallWebApiAsync();
     }
 }
diff --git a/tests/BlazorServerCallsGraph/Services/DownstreamWebApi.cs b/tests/BlazorServerCallsGraph/Services/DownstreamWebApi.cs
@@ -12,7 +12,7 @@ namespace blazor
 {
     public interface IDownstreamWebApi
     {
-        Task<string> CallWebApi(string relativeEndpoint = "", string[] requiredScopes = null);
+        Task<string> CallWebApiAsync(string relativeEndpoint = "", string[] requiredScopes = null);
     }
 
     public static class DownstreamWebApiExtensions
@@ -49,7 +49,7 @@ public DownstreamWebApi(
         /// not specified, uses scopes from the configuration</param>
         /// <param name="relativeEndpoint">Endpoint relative to the CalledApiUrl configuration</param>
         /// <returns>A JSON string representing the result of calling the Web API</returns>
-        public async Task<string> CallWebApi(string relativeEndpoint = "", string[] requiredScopes = null)
+        public async Task<string> CallWebApiAsync(string relativeEndpoint = "", string[] requiredScopes = null)
         {
             string[] scopes = requiredScopes ?? _configuration["CalledApi:CalledApiScopes"]?.Split(' ');
             string apiUrl = (_configuration["CalledApi:CalledApiUrl"] as string)?.TrimEnd('/') + $"/{relativeEndpoint}";