PR and version updates

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.Hubspot.Core/Controllers/FormsController.cs

@@ -228,7 +228,7 @@ public async Task<ResponseDto> ValidateAccessToken()
                     Error = Constants.ErrorMessages.OAuthInvalidToken
                 };
 
-            var requestMessage = new HttpRequestMessage
+            using var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Get,
                 RequestUri = new Uri(HubspotFormsApiEndpoint)
@@ -239,18 +239,34 @@ public async Task<ResponseDto> ValidateAccessToken()
             if (response.StatusCode == HttpStatusCode.Unauthorized)
             {
                 // Attempt to refresh the access token
-                await _authorizationService.RefreshAccessTokenAsync();
-
-                _tokenService.TryGetParameters(Constants.AccessTokenDbKey, out string newAccessToken);
+                var refreshAccessTokenResponse = await _authorizationService.RefreshAccessTokenAsync();
+                if (string.IsNullOrEmpty(refreshAccessTokenResponse) || refreshAccessTokenResponse == "error")
+                {
+                    return new ResponseDto
+                    {
+                        IsValid = false,
+                        Error = Constants.ErrorMessages.OAuthInvalidToken
+                    };
+                }
+
+                if (!_tokenService.TryGetParameters(Constants.AccessTokenDbKey, out string newAccessToken) 
+                    || string.IsNullOrEmpty(newAccessToken))
+                {
+                    return new ResponseDto
+                    {
+                        IsValid = false,
+                        Error = Constants.ErrorMessages.OAuthInvalidToken
+                    };
+                }
 
                 // Retry the request with the new access token
-                requestMessage = new HttpRequestMessage
+                using var newRequestMessage = new HttpRequestMessage
                 {
                     Method = HttpMethod.Get,
                     RequestUri = new Uri(HubspotFormsApiEndpoint)
                 };
-                requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", newAccessToken);
-                response = await ClientFactory().SendAsync(requestMessage);
+                newRequestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", newAccessToken);
+                response = await ClientFactory().SendAsync(newRequestMessage);
             }
 
             return new ResponseDto

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

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