Merge pull request #1 from umbraco/feature/tidy-up-and-tweaks

Moved API key to config and a few other minor updates

Author: Warren Buckley

.gitignore

@@ -385,4 +385,14 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 .idea/
-*.sln.iml
+*.sln.iml
+
+# Solution specific
+src/Umbraco.Forms.Extensions.TestSite/App_Data
+src/Umbraco.Forms.Extensions.TestSite/App_Plugins
+src/Umbraco.Forms.Extensions.TestSite/config
+src/Umbraco.Forms.Extensions.TestSite/css
+src/Umbraco.Forms.Extensions.TestSite/Media
+src/Umbraco.Forms.Extensions.TestSite/scripts
+src/Umbraco.Forms.Extensions.TestSite/Umbraco
+src/Umbraco.Forms.Extensions.TestSite/Views

src/Umbraco.Forms.Extensions.Crm.Hubspot/App_Plugins/UmbracoFormsExtensions/Hubspot/hubspot-field-mapper-template.html

@@ -1,6 +1,8 @@
 <div>
+    <!--
     <pre>{{ vm.setting | json }}</pre>
     <pre>{{ vm.mappings | json }}</pre>    
+    -->
 
     <div class="umb-forms-mappings" ng-if="vm.mappings.length > 0 && vm.hubspotFields.length > 0">
 
@@ -18,7 +20,6 @@
                             ng-options="field.id as field.value for field in vm.fields"
                             ng-model="mapping.formField"
                             ng-change="vm.stringifyValue()">
-                        <option value="">Map form field</option>
                     </select>
                 </div>
 
@@ -27,7 +28,6 @@
                             ng-options="field.value as field.name for field in vm.hubspotFields track by field.value"
                             ng-model="mapping.hubspotField"
                             ng-change="vm.stringifyValue()">
-                        <option value="">Map hubspot field</option>
                     </select>
                 </div>
 

src/Umbraco.Forms.Extensions.Crm.Hubspot/App_Plugins/UmbracoFormsExtensions/Hubspot/hubspot.resource.js

@@ -10,13 +10,12 @@
                         [{ packageGuid: id }])),
                 'Failed to download package with guid ' + id);
         },
-        getAllProperties: function (apiKey) {
+        getAllProperties: function () {
             return umbRequestHelper.resourcePromise(
                 $http.get(
                     umbRequestHelper.getApiUrl(
                         "umbracoFormsExtensionsHubspotBaseUrl",
-                        "GetAllProperties",
-                        [{ apiKey: apiKey }])),
+                        "GetAllProperties")),
                 'Failed to get Hubspot Properties');
         },
     };

src/Umbraco.Forms.Extensions.Crm.Hubspot/App_Plugins/UmbracoFormsExtensions/Hubspot/hubspotfields.component.js

@@ -38,15 +38,8 @@ function HubSpotFieldsController($scope, $compile, $element, $routeParams, hubsp
                 vm.fields = response.data;
             });
 
-            // TODO: Remove hard coded API key & remember to revoke it later on
-            // Need to get API key from other field
-            // May need to do parent.parent scope traversal - YUK :S
-
-            // Niels recommendation that this is a component & be able to get the data from a parent item
-            // Using require (but finding which one it is I have no idea)
-
-            hubspotResource.getAllProperties('6a488b25-b7e7-489d-ad45-2da52a878ff9').then(function (response) {
-                vm.hubspotFields = response.map(x =>{
+            hubspotResource.getAllProperties().then(function (response) {
+                vm.hubspotFields = response.map(x => {
                     return {
                         value: x.name,
                         name: x.label,
@@ -62,7 +55,7 @@ function HubSpotFieldsController($scope, $compile, $element, $routeParams, hubsp
             return x.value === value;
         });
 
-        if(item){
+        if (item) {
             return item.description;
         }
 

src/Umbraco.Forms.Extensions.Crm.Hubspot/Controllers/HubspotController.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Umbraco.Forms.Extensions.Crm.Hubspot.Models.Responses;
+using Umbraco.Forms.Extensions.Crm.Hubspot.Services;
+using Umbraco.Web.Editors;
+using Umbraco.Web.Mvc;
+
+namespace Umbraco.Forms.Extensions.Crm.Hubspot.Controllers
+{
+    [PluginController("FormsExtensions")]
+    public class HubspotController : UmbracoAuthorizedJsonController
+    {
+        private readonly IContactService _contactService;
+
+        public HubspotController(IContactService contactService)
+        {
+            _contactService = contactService;
+        }
+
+        /// <summary>
+        /// ~/Umbraco/[YourAreaName]/[YourControllerName]
+        /// ~/Umbraco/FormsExtensions/Hubspot/GetAllProperties
+        /// </summary>
+        /// <returns></returns>
+        public async Task<IEnumerable<Property>> GetAllProperties() => await _contactService.GetContactProperties();
+    }
+}

src/Umbraco.Forms.Extensions.Crm.Hubspot/HubspotComponent.cs

@@ -4,13 +4,12 @@
 using System.Web.Mvc;
 using System.Web.Routing;
 using Umbraco.Core.Composing;
+using Umbraco.Forms.Extensions.Crm.Hubspot.Controllers;
 using Umbraco.Web;
 using Umbraco.Web.JavaScript;
 
 namespace Umbraco.Forms.Extensions.Crm.Hubspot
 {
-    public class HubspotComposer : ComponentComposer<HubspotComponent>, IUserComposer { }
-
     public class HubspotComponent : IComponent
     {
         public void Initialize()
@@ -33,7 +32,7 @@ private void ServerVariablesParser_Parsing(object sender, Dictionary<string, obj
             if (HttpContext.Current == null) throw new InvalidOperationException("HttpContext is null");
             var urlHelper = new UrlHelper(new RequestContext(new HttpContextWrapper(HttpContext.Current), new RouteData()));
 
-            umbracoUrls["umbracoFormsExtensionsHubspotBaseUrl"] = urlHelper.GetUmbracoApiServiceBaseUrl<HubspotController>(controller => controller.GetAllProperties(null));
+            umbracoUrls["umbracoFormsExtensionsHubspotBaseUrl"] = urlHelper.GetUmbracoApiServiceBaseUrl<HubspotController>(controller => controller.GetAllProperties());
         }
 
         public void Terminate()

src/Umbraco.Forms.Extensions.Crm.Hubspot/HubspotComposer.cs

@@ -0,0 +1,16 @@
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Forms.Extensions.Crm.Hubspot.Services;
+
+namespace Umbraco.Forms.Extensions.Crm.Hubspot
+{
+    public class HubspotComposer : IUserComposer
+    {
+        public void Compose(Composition composition)
+        {
+            composition.Register<IContactService, HubspotContactService>(Lifetime.Singleton);
+
+            composition.Components().Append<HubspotComponent>();
+        }
+    }
+}