Merge pull request #272 from umbraco/bugfix/v13/hubspot-refresh-token-attempt

acoumb · web-flow · commit ec2180b25cf7 · 2025-08-06T19:11:41.000+03:00
Bugfix/v13/hubspot refresh token attempt
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot.Core/Controllers/FormsController.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot.Core/Controllers/FormsController.cs
@@ -77,7 +77,7 @@ public async Task<ResponseDto> GetAll()
             try
             {
                 var requestMessage = CreateRequest(hubspotApiKey);
-
+                
                 var response = await ClientFactory().SendAsync(requestMessage);
 
                 responseContent = await response.Content.ReadAsStringAsync();
@@ -145,7 +145,7 @@ public async Task<ResponseDto> GetAllOAuth()
                     Forms = ParseForms(forms).ToList()
                 };
             }
-            catch(HttpRequestException ex) when (ex.Message.Contains(HttpStatusCode.Unauthorized.ToString()))
+            catch (HttpRequestException ex) when (ex.Message.Contains(HttpStatusCode.Unauthorized.ToString()))
             {
                 _logger.LogError(string.Format(LoggingResources.OAuthFetchFormsFailed, responseContent));
 
@@ -228,14 +228,46 @@ 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)
             };
             requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
 
             var response = await ClientFactory().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 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
+                using var newRequestMessage = new HttpRequestMessage
+                {
+                    Method = HttpMethod.Get,
+                    RequestUri = new Uri(HubspotFormsApiEndpoint)
+                };
+                newRequestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", newAccessToken);
+                response = await ClientFactory().SendAsync(newRequestMessage);
+            }
 
             return new ResponseDto
             {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot.Core/Services/AuthorizationService.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot.Core/Services/AuthorizationService.cs
@@ -68,10 +68,10 @@ public async Task<string> GetAccessTokenAsync(string code)
                 var errorResult = await response.Content.ReadAsStringAsync();
                 var errorDto = JsonConvert.DeserializeObject<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() =>
@@ -83,9 +83,9 @@ public async Task<string> RefreshAccessTokenAsync()
 
             var data = new Dictionary<string, string>
             {
-                {"grant_type", "refresh_token"},
-                {"client_id", _oauthSettings.ClientId },
-                {"client_secret", _oauthSettings.ClientSecret },
+                { "grant_type", "refresh_token" },
+                { "client_id", _oauthSettings.ClientId },
+                { "client_secret", _oauthSettings.ClientSecret },
                 { "refresh_token", refreshToken }
             };
 
@@ -109,7 +109,7 @@ public async Task<string> RefreshAccessTokenAsync()
                 return result;
             }
 
-            return "error";
+            return ErrorPrefix;
         }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot.Core/Services/BaseAuthorizationService.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot.Core/Services/BaseAuthorizationService.cs
@@ -18,6 +18,8 @@ public class BaseAuthorizationService
 
         protected readonly ITokenService TokenService;
 
+        public const string ErrorPrefix = "Error";
+
         public BaseAuthorizationService(ITokenService tokenService)
         {
             TokenService = tokenService;
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot.Core/Services/UmbracoAuthorizationService.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot.Core/Services/UmbracoAuthorizationService.cs
@@ -75,10 +75,10 @@ public async Task<string> GetAccessTokenAsync(string code)
                 var errorResult = await response.Content.ReadAsStringAsync();
                 var errorDto = JsonConvert.DeserializeObject<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() =>
@@ -90,8 +90,8 @@ public async Task<string> RefreshAccessTokenAsync()
 
             var data = new Dictionary<string, string>
             {
-                {"grant_type", "refresh_token"},
-                {"client_id", ClientId },
+                { "grant_type", "refresh_token" },
+                { "client_id", ClientId },
                 { "refresh_token", refreshToken }
             };
 
@@ -116,7 +116,7 @@ public async Task<string> RefreshAccessTokenAsync()
                 return result;
             }
 
-            return "error";
+            return ErrorPrefix;
         }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot.Core/Umbraco.Cms.Integrations.Crm.Hubspot.Core.csproj b/src/Umbraco.Cms.Integrations.Crm.Hubspot.Core/Umbraco.Cms.Integrations.Crm.Hubspot.Core.csproj
@@ -11,7 +11,7 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/tree/main/src/Umbraco.Cms.Integrations.Crm.Hubspot</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
-		<Version>4.0.2</Version>
+		<Version>4.0.3</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 	</PropertyGroup>
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/Umbraco.Cms.Integrations.Crm.Hubspot.csproj b/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>

Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,10 @@ public async Task<string> GetAccessTokenAsync(string code)`
`68`	`68`	`var errorResult = await response.Content.ReadAsStringAsync();`
`69`	`69`	`var errorDto = JsonConvert.DeserializeObject<ErrorDto>(errorResult);`
`70`	`70`
`71`		`- return "Error: " + errorDto.Message;`
	`71`	`+ return string.Format("{0}: {1}", ErrorPrefix, errorDto.Message);`
`72`	`72`	`}`
`73`	`73`
`74`		`- return "Error: An unexpected error occurred.";`
	`74`	`+ return string.Format("{0}: An unexpected error occurred.", ErrorPrefix);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public string RefreshAccessToken() =>`
`@@ -83,9 +83,9 @@ public async Task<string> RefreshAccessTokenAsync()`
`83`	`83`
`84`	`84`	`var data = new Dictionary<string, string>`
`85`	`85`	`{`
`86`		`- {"grant_type", "refresh_token"},`
`87`		`- {"client_id", _oauthSettings.ClientId },`
`88`		`- {"client_secret", _oauthSettings.ClientSecret },`
	`86`	`+ { "grant_type", "refresh_token" },`
	`87`	`+ { "client_id", _oauthSettings.ClientId },`
	`88`	`+ { "client_secret", _oauthSettings.ClientSecret },`
`89`	`89`	`{ "refresh_token", refreshToken }`
`90`	`90`	`};`
`91`	`91`
`@@ -109,7 +109,7 @@ public async Task<string> RefreshAccessTokenAsync()`
`109`	`109`	`return result;`
`110`	`110`	`}`
`111`	`111`
`112`		`- return "error";`
	`112`	`+ return ErrorPrefix;`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ public class BaseAuthorizationService`
`18`	`18`
`19`	`19`	`protected readonly ITokenService TokenService;`
`20`	`20`
	`21`	`+ public const string ErrorPrefix = "Error";`
	`22`	`+`
`21`	`23`	`public BaseAuthorizationService(ITokenService tokenService)`
`22`	`24`	`{`
`23`	`25`	`TokenService = tokenService;`
Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,10 @@ public async Task<string> GetAccessTokenAsync(string code)`
`75`	`75`	`var errorResult = await response.Content.ReadAsStringAsync();`
`76`	`76`	`var errorDto = JsonConvert.DeserializeObject<ErrorDto>(errorResult);`
`77`	`77`
`78`		`- return "Error: " + errorDto.Message;`
	`78`	`+ return string.Format("{0}: {1}", ErrorPrefix, errorDto.Message);`
`79`	`79`	`}`
`80`	`80`
`81`		`- return "Error: An unexpected error occurred.";`
	`81`	`+ return string.Format("{0}: An unexpected error occurred.", ErrorPrefix);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public string RefreshAccessToken() =>`
`@@ -90,8 +90,8 @@ public async Task<string> RefreshAccessTokenAsync()`
`90`	`90`
`91`	`91`	`var data = new Dictionary<string, string>`
`92`	`92`	`{`
`93`		`- {"grant_type", "refresh_token"},`
`94`		`- {"client_id", ClientId },`
	`93`	`+ { "grant_type", "refresh_token" },`
	`94`	`+ { "client_id", ClientId },`
`95`	`95`	`{ "refresh_token", refreshToken }`
`96`	`96`	`};`
`97`	`97`
`@@ -116,7 +116,7 @@ public async Task<string> RefreshAccessTokenAsync()`
`116`	`116`	`return result;`
`117`	`117`	`}`
`118`	`118`
`119`		`- return "error";`
	`119`	`+ return ErrorPrefix;`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`	`}`