API configureation retrieval async

Author: acoumb

src/Umbraco.Cms.Integrations.Commerce.Shopify/Controllers/ProductsController.cs

@@ -50,7 +50,7 @@ public ProductsController(IShopifyService apiService, AuthorizationImplementatio
         }
 
         [HttpGet]
-        public EditorSettings CheckConfiguration() => _apiService.GetApiConfiguration();
+        public async Task<EditorSettings> CheckConfiguration() => await _apiService.GetApiConfiguration();
 
         [HttpGet]
         public string GetAuthorizationUrl() => _authorizationService.GetAuthorizationUrl();

src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/IShopifyService.cs

@@ -7,7 +7,7 @@ namespace Umbraco.Cms.Integrations.Commerce.Shopify.Services
 {
     public interface IShopifyService
     {
-        EditorSettings GetApiConfiguration();
+        Task<EditorSettings> GetApiConfiguration();
 
         Task<ResponseDto<ProductsListDto>> ValidateAccessToken();
 

src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/ShopifyService.cs

@@ -93,7 +93,7 @@ public ShopifyService(ILogger logger, ITokenService tokenService)
         }
 #endif
 
-        public EditorSettings GetApiConfiguration()
+        public async Task<EditorSettings> GetApiConfiguration()
         {
             if (string.IsNullOrEmpty(_settings.Shop)
                 || string.IsNullOrEmpty(_settings.ApiVersion))
@@ -105,11 +105,12 @@ public EditorSettings GetApiConfiguration()
 
             // validate OAuth configuration if AuthorizationService is used.
             // if authorization is managed through UmbracoAuthorizationService, the properties client ID and proxy URL are set correctly.
+            var accessTokenValidationResponse = await ValidateAccessToken();
             if (_settings.UseUmbracoAuthorization)
             {
                 var editorSettings = new EditorSettings { IsValid = true, Type = ConfigurationType.OAuth };
 
-                editorSettings.IsConnected = ValidateAccessToken().ConfigureAwait(false).GetAwaiter().GetResult().IsValid;
+                editorSettings.IsConnected = accessTokenValidationResponse.IsValid;
 
                 return editorSettings;
             }
@@ -120,7 +121,7 @@ public EditorSettings GetApiConfiguration()
                         && !string.IsNullOrEmpty(_oauthSettings.RedirectUri)
                         ? new EditorSettings { 
                             IsValid = true,
-                            IsConnected = ValidateAccessToken().ConfigureAwait(false).GetAwaiter().GetResult().IsValid, 
+                            IsConnected = accessTokenValidationResponse.IsValid, 
                             Type = ConfigurationType.OAuth 
                         }
                         : new EditorSettings();
@@ -164,7 +165,9 @@ public void RevokeAccessToken()
         public async Task<ResponseDto<ProductsListDto>> GetResults(string pageInfo)
         {
             string accessToken;
-            if (GetApiConfiguration().Type.Value == ConfigurationType.OAuth.Value)
+
+            var apiConfiguration = await GetApiConfiguration();
+            if (apiConfiguration.Type.Value == ConfigurationType.OAuth.Value)
                 _tokenService.TryGetParameters(Constants.AccessTokenDbKey, out accessToken);
             else
             {
@@ -222,7 +225,8 @@ public async Task<ResponseDto<ProductsListDto>> GetResults(string pageInfo)
         public async Task<ResponseDto<ProductsListDto>> GetProductsByIds(long[] ids)
         {
             string accessToken;
-            if (GetApiConfiguration().Type.Value == ConfigurationType.OAuth.Value)
+            var apiConfiguration = await GetApiConfiguration();
+            if (apiConfiguration.Type.Value == ConfigurationType.OAuth.Value)
                 _tokenService.TryGetParameters(Constants.AccessTokenDbKey, out accessToken);
             else
             {
@@ -272,7 +276,8 @@ public async Task<ResponseDto<ProductsListDto>> GetProductsByIds(long[] ids)
         public async Task<int> GetCount()
         {
             string accessToken;
-            if (GetApiConfiguration().Type.Value == ConfigurationType.OAuth.Value)
+            var apiConfiguration = await GetApiConfiguration();
+            if (apiConfiguration.Type.Value == ConfigurationType.OAuth.Value)
                 _tokenService.TryGetParameters(Constants.AccessTokenDbKey, out accessToken);
             else
             {