Merge pull request #275 from umbraco/bugfix/15.x/hubspot-refresh-token-attempt

Attempt token refresh when token is validated

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.Hubspot/Api/Management/Controllers/ValidateAccessTokenController.cs

@@ -16,15 +16,18 @@ public class ValidateAccessTokenController : HubspotFormsControllerBase
     {
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly ITokenService _tokenService;
+        private readonly IHubspotAuthorizationService _authorizationService;
 
         public ValidateAccessTokenController(
             IOptions<HubspotSettings> settingsOptions,
             IHttpClientFactory httpClientFactory,
-            ITokenService tokenService) 
+            ITokenService tokenService,
+            IHubspotAuthorizationService authorizationService)
             : base(settingsOptions)
         {
             _httpClientFactory = httpClientFactory;
             _tokenService = tokenService;
+            _authorizationService = authorizationService;
         }
 
         [HttpGet("validate")]
@@ -42,14 +45,47 @@ public async Task<IActionResult> ValidateAccessToken()
                     Error = Constants.ErrorMessages.OAuthInvalidToken
                 });
 
-            var requestMessage = new HttpRequestMessage
+            using var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Get,
                 RequestUri = new Uri(HubspotFormsApiEndpoint)
             };
             requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
 
             var response = await client.SendAsync(requestMessage);
+            if (response.StatusCode == HttpStatusCode.Unauthorized)
+            {
+                // Attempt to refresh the access token
+                var refreshAccessTokenResponse = await _authorizationService.RefreshAccessTokenAsync();
+                if (string.IsNullOrEmpty(refreshAccessTokenResponse)
+                    || refreshAccessTokenResponse.StartsWith(BaseAuthorizationService.ErrorPrefix))
+                {
+                    return Ok(new ResponseDto
+                    {
+                        IsValid = false,
+                        Error = Constants.ErrorMessages.OAuthInvalidToken
+                    });
+                }
+
+                if (!_tokenService.TryGetParameters(Constants.AccessTokenDbKey, out string newAccessToken)
+                    || string.IsNullOrEmpty(newAccessToken))
+                {
+                    return Ok(new ResponseDto
+                    {
+                        IsValid = false,
+                        Error = Constants.ErrorMessages.OAuthInvalidToken
+                    });
+                }
+
+                // Retry the request with the new access token
+                using var newRequestMessage = new HttpRequestMessage
+                {
+                    Method = HttpMethod.Get,
+                    RequestUri = new Uri(HubspotFormsApiEndpoint)
+                };
+                newRequestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", newAccessToken);
+                response = await client.SendAsync(newRequestMessage);
+            }
 
             return Ok(new ResponseDto
             {

src/Umbraco.Cms.Integrations.Crm.Hubspot/Services/AuthorizationService.cs

@@ -61,10 +61,10 @@ public async Task<string> GetAccessTokenAsync(string code)
                 var errorResult = await response.Content.ReadAsStringAsync();
                 var errorDto = JsonSerializer.Deserialize<ErrorDto>(errorResult);
 
-                return "Error: " + errorDto.Message;
+                return string.Format("{0}: {1}", ErrorPrefix, errorDto.Message);
             }
 
-            return "Error: An unexpected error occurred.";
+            return string.Format("{0}: An unexpected error occurred.", ErrorPrefix);
         }
 
         public string RefreshAccessToken() =>
@@ -102,7 +102,7 @@ public async Task<string> RefreshAccessTokenAsync()
                 return result;
             }
 
-            return "error";
+            return ErrorPrefix;
         }
     }
 }

src/Umbraco.Cms.Integrations.Crm.Hubspot/Services/BaseAuthorizationService.cs

@@ -15,6 +15,8 @@ public class BaseAuthorizationService
 
         protected readonly ITokenService TokenService;
 
+        public const string ErrorPrefix = "Error";
+
         public BaseAuthorizationService(ITokenService tokenService)
         {
             TokenService = tokenService;

src/Umbraco.Cms.Integrations.Crm.Hubspot/Services/UmbracoAuthorizationService.cs

@@ -74,10 +74,10 @@ public async Task<string> GetAccessTokenAsync(string code)
                 var errorResult = await response.Content.ReadAsStringAsync();
                 var errorDto = JsonSerializer.Deserialize<ErrorDto>(errorResult);
 
-                return "Error: " + errorDto.Message;
+                return string.Format("{0}: {1}", ErrorPrefix, errorDto.Message);
             }
 
-            return "Error: An unexpected error occurred.";
+            return string.Format("{0}: An unexpected error occurred.", ErrorPrefix);
         }
 
         public string RefreshAccessToken() =>
@@ -115,7 +115,7 @@ public async Task<string> RefreshAccessTokenAsync()
                 return result;
             }
 
-            return "error";
+            return ErrorPrefix;
         }
     }
 }

src/Umbraco.Cms.Integrations.Crm.Hubspot/Umbraco.Cms.Integrations.Crm.Hubspot.csproj

@@ -15,7 +15,7 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/blob/main-v14/src/Umbraco.Cms.Integrations.Crm.Hubspot</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
-		<Version>6.0.0</Version>
+		<Version>6.0.1</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>