Code formatting and use const for error handling

Author: acoumb

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();
@@ -240,7 +240,7 @@ public async Task<ResponseDto> ValidateAccessToken()
             {
                 // Attempt to refresh the access token
                 var refreshAccessTokenResponse = await _authorizationService.RefreshAccessTokenAsync();
-                if (string.IsNullOrEmpty(refreshAccessTokenResponse) || refreshAccessTokenResponse == "error")
+                if (string.IsNullOrEmpty(refreshAccessTokenResponse) || refreshAccessTokenResponse == BaseAuthorizationService.ErrorPrefix)
                 {
                     return new ResponseDto
                     {

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;
         }
     }
 }

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;

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;
         }
     }
 }