Merge pull request #74 from umbraco/v10/feature/hubspot-private-access-token

HubSpot support for Private Access Tokens.

Author: acoumb

src/Umbraco.Forms.Integrations.Crm.Hubspot/App_Plugins/UmbracoForms.Integrations/Crm/Hubspot/hubspot-field-mapper-template.html

@@ -6,7 +6,7 @@
 
     <div ng-show="!vm.loading && vm.authorizationStatus === 'Unauthenticated'">
         <p>Umbraco Forms is not configured with a HubSpot CRM account.</p>
-        <p>To do this you can either create and save an API key into the <i>UmbracoForms.config</i> file.</p>
+        <p>To do this you can either create and save an API key or a Private Access Token into the <i>appsettings.json</i> file.</p>
         <p>Or you can click <a ng-click="vm.openAuth()" style="text-decoration: underline">here</a> to complete an OAuth connection.</p>
         <p><em>If your browser is unable to process the automated connection, paste the provided authorization code below and click to complete the authentication.</em>
         <input type="text" placeholder="Enter authorization code" ng-model="vm.authorizationCode" />
@@ -15,7 +15,11 @@
 
     <div ng-show="!vm.loading && vm.authorizationStatus !== 'Unauthenticated'">
 
-        <div class="umb-forms-mappings" ng-show="vm.mappings.length > 0 && vm.hubspotFields.length > 0">
+        <div class="umb-forms-settings-note ng-scope">
+            Umbraco Forms is configured with a HubSpot CRM account using: <b>{{ vm.authorizationStatus }}</b></p>
+        </div>
+
+        <div class="umb-forms-mappings mt2" ng-show="vm.mappings.length > 0 && vm.hubspotFields.length > 0">
 
             <div class="umb-forms-mapping-header">
                 <div class="umb-forms-mapping-field -no-margin-left">Form Field</div>
@@ -54,10 +58,12 @@
             </div>
         </div>
 
-        <umb-button type="button" action="vm.addMapping()" label="Add mapping"></umb-button>
+        <div class="mt2">
+            <umb-button type="button" action="vm.addMapping()" label="Add mapping"></umb-button>
 
-        <div ng-show="vm.authorizationStatus === 'OAuth'" style="margin-top: 20px">
-            <umb-button type="button" action="vm.deauthorize()" label="De-authorize from Hubspot"></umb-button>
+            <div ng-show="vm.authorizationStatus === 'OAuth'" style="margin-top: 20px">
+                <umb-button type="button" action="vm.deauthorize()" label="De-authorize from Hubspot"></umb-button>
+            </div>
         </div>
 
     </div>

src/Umbraco.Forms.Integrations.Crm.Hubspot/Configuration/HubspotSettings.cs

@@ -5,6 +5,8 @@ public class HubspotSettings
     {
         public string ApiKey { get; set; }
 
+        public string PrivateAccessToken { get; set; }
+
         public bool AllowContactUpdate { get; set; }
     }
 }

src/Umbraco.Forms.Integrations.Crm.Hubspot/Services/AuthenticationDetail.cs

@@ -4,20 +4,37 @@ public enum AuthenticationMode
     {
         Unauthenticated,
         ApiKey,
+        PrivateAccessToken,
         OAuth
     }
 
     public class AuthenticationDetail
     {
         public string ApiKey { get; set; }
 
+        public string PrivateAccessToken { get; set; }
+
         public string RefreshToken { get; set; }
 
-        public AuthenticationMode Mode =>
-            !string.IsNullOrEmpty(ApiKey)
-                ? AuthenticationMode.ApiKey
-                : !string.IsNullOrEmpty(RefreshToken)
-                    ? AuthenticationMode.OAuth
-                    : AuthenticationMode.Unauthenticated;
+        public AuthenticationMode Mode
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(ApiKey)
+                    && string.IsNullOrEmpty(PrivateAccessToken)
+                    && string.IsNullOrEmpty(RefreshToken))
+                    return AuthenticationMode.Unauthenticated;
+
+                if(!string.IsNullOrEmpty(ApiKey))
+                {
+                    return AuthenticationMode.ApiKey;
+                } else if(!string.IsNullOrEmpty(PrivateAccessToken))
+                {
+                    return AuthenticationMode.PrivateAccessToken;
+                }
+
+                return AuthenticationMode.OAuth;
+            }
+        }
     }
 }

src/Umbraco.Forms.Integrations.Crm.Hubspot/Services/HubspotContactService.cs

@@ -273,6 +273,10 @@ private AuthenticationDetail GetConfiguredAuthenticationDetails()
             {
                 authentication.ApiKey = apiKey;
             }
+            else if (TryGetPrivateAccessToken(out string privateAccessToken))
+            {
+                authentication.PrivateAccessToken = privateAccessToken;
+            }
             else if (TryGetSavedRefreshToken(out string refreshToken))
             {
                 authentication.RefreshToken = refreshToken;
@@ -288,6 +292,13 @@ private bool TryGetApiKey(out string apiKey)
             return !string.IsNullOrEmpty(apiKey);
         }
 
+        private bool TryGetPrivateAccessToken(out string accessToken)
+        {
+            accessToken = _settings.PrivateAccessToken;
+
+            return !string.IsNullOrEmpty(accessToken);
+        }
+
         private bool TryGetSavedRefreshToken(out string refreshToken)
         {
             refreshToken = _keyValueService.GetValue(RefreshTokenDatabaseKey);
@@ -367,6 +378,10 @@ private async Task<HttpResponseMessage> GetResponse(
                     case AuthenticationMode.ApiKey:
                         requestMessage.RequestUri = new Uri($"{url}?hapikey={authenticationDetails.ApiKey}");
                         break;
+                    case AuthenticationMode.PrivateAccessToken:
+                        requestMessage.Headers.Authorization =
+                           new AuthenticationHeaderValue("Bearer", authenticationDetails.PrivateAccessToken);
+                        break;
                     case AuthenticationMode.OAuth:
                         requestMessage.Headers.Authorization =
                             new AuthenticationHeaderValue("Bearer",