Form picker and rendering component.

acoumb · acoumb · commit 1d0a0a6bb991 · 2022-07-12T17:10:58.000+03:00
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsFormV8.cshtml b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsFormV8.cshtml
@@ -0,0 +1,5 @@
+﻿@using Umbraco.Cms.Integrations.Crm.Dynamics.Models.ViewModels;
+
+@inherits Umbraco.Web.Mvc.UmbracoViewPage<FormViewModel>
+
+@Html.Raw(Model.EmbedCode)
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsFormV9.cshtml b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsFormV9.cshtml
@@ -0,0 +1,5 @@
+﻿@using Umbraco.Cms.Integrations.Crm.Dynamics.Models.ViewModels;
+
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<FormViewModel>
+
+<p>@Model.Name</p>
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/configuration.controller.js b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/configuration.controller.js
@@ -4,8 +4,7 @@
     vm.oauthConfig = {};
 
     umbracoCmsIntegrationsCrmDynamicsResource.checkOAuthConfiguration().then(function(response) {
-
-        if (response) {
+        if (response && response.isAuthorized) {
             vm.oauthConfig.isConnected = true;
             vm.oauthConfig.fullName = response.fullName;
         }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/dynamics.resource.js b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/dynamics.resource.js
@@ -29,6 +29,11 @@
                     $http.get(`${apiEndpoint}/GetForms`),
                     "Failed");
             },
+            getEmbedCode: function (formId) {
+                return umbRequestHelper.resourcePromise(
+                    $http.get(`${apiEndpoint}/GetEmbedCode?formId=${formId}`),
+                    "Failed");
+            },
             checkOAuthConfiguration: function () {
                 return umbRequestHelper.resourcePromise(
                     $http.get(`${apiEndpoint}/CheckOAuthConfiguration`),
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/formpicker.controller.js b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/formpicker.controller.js
@@ -1,11 +1,34 @@
 ﻿function formPickerController($scope, editorService, notificationsService, umbracoCmsIntegrationsCrmDynamicsResource) {
+
     var vm = this;
 
     vm.loading = false;
     vm.dynamicsFormsList = [];
     vm.searchTerm = "";
 
-    loadForms();
+    umbracoCmsIntegrationsCrmDynamicsResource.checkOAuthConfiguration().then(function (response) {
+        if (response.isAuthorized) {
+            loadForms();
+        } else {
+            let error = "Unable to connect to Dynamics. Please review the settings of the form picker property's data type.";
+            notificationsService.error("Dynamics API", error);
+            vm.error = error;
+        }
+    });
+
+    vm.saveForm = function (form) {
+
+        umbracoCmsIntegrationsCrmDynamicsResource.getEmbedCode(form.id).then(function (response) {
+
+            form.embedCode = response;
+
+            $scope.model.value = form;
+        });
+    }
+
+    vm.removeForm = function () {
+        $scope.model.value = null;
+    }
 
     vm.openDynamicsFormPickerOverlay = function () {
 
@@ -15,7 +38,7 @@
             view: "/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/views/formpickereditor.html",
             size: "medium",
             selectForm: function (form) {
-                //vm.saveForm(form);
+                vm.saveForm(form);
 
                 editorService.close();
             },
@@ -33,10 +56,10 @@
                 response.value.forEach(item => {
                     vm.dynamicsFormsList.push({
                         id: item.msdyncrm_marketingformid,
-                        name: item.msdyncrm_name
+                        name: item.msdyncrm_name,
+                        embedCode: ""
                     });
                 });
-                console.log(vm.dynamicsFormsList);
             }
         });
     }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/views/formpicker.html b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/views/formpicker.html
@@ -5,10 +5,8 @@
 
     <umb-node-preview ng-if="model.value"
                       name="model.value.name"
-                      icon="model.icon"
-                      description="model.value.fields"
                       allow-remove="true" ,
-                      on-remove="vm.remove()">
+                      on-remove="vm.removeForm()">
     </umb-node-preview>
 
     <a ng-if="!model.value && !vm.loading"
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/views/formpickereditor.html b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/views/formpickereditor.html
@@ -12,7 +12,7 @@
                     </div>
                     <div class="dynOverlayGroup">
                         <ul class="dynFormsList">
-                            <li ng-repeat="form in vm.dynamicsFormsList | orderBy:'name' | filter:vm.searchTerm" ng-click="model.pickForm(form)" class="ng-scope" role="button" tabindex="0">
+                            <li ng-repeat="form in vm.dynamicsFormsList | orderBy:'name' | filter:vm.searchTerm" ng-click="model.selectForm(form)" class="ng-scope" role="button" tabindex="0">
                                 <a href="" ng-attr-title="form.name">
                                     <i class="icon-umb-contour"></i>
                                     <span class="formLine">{{form.name}}</span>
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Controllers/FormsController.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Controllers/FormsController.cs
@@ -22,6 +22,7 @@
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
+using System.Linq;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Controllers
 {
@@ -47,8 +48,8 @@ public FormsController(IOptions<DynamicsSettings> options, IAuthorizationService
             DynamicsService dynamicsService, 
             DynamicsConfigurationService dynamicsConfigurationService)
 #else
-        public FormsController(IAuthorizationService authorizationService, 
-            DynamicsService dynamicsService, 
+        public FormsController(IAuthorizationService authorizationService,
+            DynamicsService dynamicsService,
             DynamicsConfigurationService dynamicsConfigurationService)
 #endif
         {
@@ -69,7 +70,20 @@ public FormsController(IAuthorizationService authorizationService,
         public string GetAuthorizationUrl() => _authorizationService.GetAuthorizationUrl();
 
         [HttpGet]
-        public OAuthConfigurationDto CheckOAuthConfiguration() => _dynamicsConfigurationService.GetOAuthConfiguration();
+        public async Task<OAuthConfigurationDto> CheckOAuthConfiguration()
+        {
+            var oauthConfiguration = _dynamicsConfigurationService.GetOAuthConfiguration();
+
+            if (oauthConfiguration == null) return new OAuthConfigurationDto();
+
+            var identity = await _dynamicsService.GetIdentity(oauthConfiguration.AccessToken);
+
+            if (!identity.IsAuthorized) return new OAuthConfigurationDto();
+
+            oauthConfiguration.IsAuthorized = true;
+
+            return oauthConfiguration;
+        } 
 
         [HttpPost]
         public async Task<string> GetAccessToken([FromBody] OAuthRequestDto authRequestDto)
@@ -99,8 +113,8 @@ public async Task<string> GetAccessToken([FromBody] OAuthRequestDto authRequestD
 
                 var identity = await _dynamicsService.GetIdentity(tokenDto.AccessToken);
 
-                if(identity != null)
-                     _dynamicsConfigurationService.AddorUpdateOAuthConfiguration(tokenDto.AccessToken, identity.UserId, identity.FullName);
+                if (identity != null)
+                    _dynamicsConfigurationService.AddorUpdateOAuthConfiguration(tokenDto.AccessToken, identity.UserId, identity.FullName);
 
                 return result;
             }
@@ -138,6 +152,9 @@ public async Task<ResponseDto<FormDto>> GetForms()
             return JsonConvert.DeserializeObject<ResponseDto<FormDto>>(result);
         }
 
+        [HttpGet]
+        public async Task<string> GetEmbedCode(string formId) => await _dynamicsService.GetEmbedCode(formId);
+
         [HttpGet]
         public string GetSystemUserFullName() => _dynamicsConfigurationService.GetSystemUserFullName();
 
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/DynamicsFormPickerPropertyEditor.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/DynamicsFormPickerPropertyEditor.cs
@@ -13,7 +13,8 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics
         name: "Dynamics Form Picker",
         view: "~/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/views/formpicker.html",
         Group = "Pickers",
-        Icon = "icon-handshake"
+        Icon = "icon-handshake", 
+        ValueType = ValueTypes.Json
         )]
     public class DynamicsFormPickerPropertyEditor : DataEditor
     {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs
@@ -0,0 +1,36 @@
+﻿using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+using System;
+
+using Umbraco.Cms.Integrations.Crm.Dynamics.Models.ViewModels;
+using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
+
+#if NETCOREAPP
+using Microsoft.Extensions.Options;
+
+using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Models.PublishedContent;
+#else
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors;
+#endif
+
+namespace Umbraco.Cms.Integrations.Crm.Dynamics.Editors
+{
+    public class DynamicsFormPickerValueConverter : PropertyValueConverterBase
+    {
+        public override bool IsConverter(IPublishedPropertyType propertyType) => propertyType.EditorAlias.Equals("Umbraco.Cms.Integrations.Crm.Dynamics.FormPicker");
+
+        public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType) => PropertyCacheLevel.Snapshot;
+
+        public override Type GetPropertyValueType(IPublishedPropertyType propertyType) => typeof(FormViewModel);
+
+        public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
+        {
+            if (source == null) return null;
+
+            return JsonConvert.DeserializeObject<FormViewModel>(source.ToString());
+        }
+    }
+}
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Helpers/DynamicsHtmlExtensions.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Helpers/DynamicsHtmlExtensions.cs
@@ -0,0 +1,28 @@
+﻿using Umbraco.Cms.Integrations.Crm.Dynamics.Models.ViewModels;
+
+#if NETCOREAPP
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+#else
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Mvc.Html;
+#endif
+
+namespace Umbraco.Cms.Integrations.Crm.Dynamics.Helpers
+{
+    public static class DynamicsHtmlExtensions
+    {
+#if NETCOREAPP
+        public static IHtmlContent RenderDynamicsForm(this IHtmlHelper<dynamic> htmlHelper, FormViewModel formVM)
+        {
+            return htmlHelper.Partial("~/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsFormV9.cshtml", formVM);
+        }
+#else
+        public static IHtmlString RenderDynamicsForm(this HtmlHelper helper, FormViewModel formVM)
+        {
+            return helper.Partial("~/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsFormV8.cshtml", formVM);
+        }
+#endif
+    }
+}
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/Dtos/FormDto.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/Dtos/FormDto.cs
@@ -12,5 +12,8 @@ public class FormDto
 
         [JsonProperty("msdyncrm_formdefinition")]
         public string Definition { get; set; }
+
+        [JsonProperty("msdyncrm_javascriptcode")]
+        public string EmbedCode { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/Dtos/IdentityDto.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/Dtos/IdentityDto.cs
@@ -1,11 +1,11 @@
-﻿using System.Collections.Generic;
-
-using Newtonsoft.Json;
+﻿using Newtonsoft.Json;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos
 {
     public class IdentityDto
     {
+        public bool IsAuthorized { get; set; } = true;
+
         [JsonProperty("systemuserid")]
         public string UserId { get; set; }
 
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/Dtos/OAuthConfigurationDto.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/Dtos/OAuthConfigurationDto.cs
@@ -16,5 +16,8 @@ public class OAuthConfigurationDto
 
         [JsonProperty("fullName")]
         public string FullName { get; set; }
+
+        [JsonProperty("isAuthorized")]
+        public bool IsAuthorized { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/ViewModels/FormViewModel.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/ViewModels/FormViewModel.cs
@@ -0,0 +1,16 @@
+﻿using Newtonsoft.Json;
+
+namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.ViewModels
+{
+    public class FormViewModel
+    {
+        [JsonProperty("id")]
+        public string Id { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("embedCode")]
+        public string EmbedCode { get; set; }
+    }
+}
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/AuthorizationService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/AuthorizationService.cs
@@ -31,7 +31,6 @@ public class AuthorizationService : IAuthorizationService
         protected const string DynamicsAuthorizationUrl =
             "https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id={0}&response_type=code&redirect_uri={1}&response_mode=query&scope={2}";
 
-
         public string GetAuthorizationUrl() =>
             string.Format(DynamicsAuthorizationUrl, ClientId, OAuthProxyBaseUrl, OAuthScopes);
     }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsService.cs
@@ -21,21 +21,27 @@ public class DynamicsService
     {
         private readonly DynamicsSettings _settings;
 
+        private readonly DynamicsConfigurationService _dynamicsConfigurationService;
+
         // Using a static HttpClient (see: https://www.aspnetmonsters.com/2016/08/2016-08-27-httpclientwrong/).
         private readonly static HttpClient s_client = new HttpClient();
 
         // Access to the client within the class is via ClientFactory(), allowing us to mock the responses in tests.
         public static Func<HttpClient> ClientFactory = () => s_client;
 
 #if NETCOREAPP
-        public DynamicsService(IOptions<DynamicsSettings> options)
+        public DynamicsService(IOptions<DynamicsSettings> options, DynamicsConfigurationService dynamicsConfigurationService)
         {
             _settings = options.Value;
+
+            _dynamicsConfigurationService = dynamicsConfigurationService;
         }
 #else
-        public DynamicsService()
+        public DynamicsService(DynamicsConfigurationService dynamicsConfigurationService)
         {
             _settings = new DynamicsSettings(ConfigurationManager.AppSettings);
+
+            _dynamicsConfigurationService = dynamicsConfigurationService;
         }
 #endif
 
@@ -52,13 +58,38 @@ public async Task<IdentityDto> GetIdentity(string accessToken)
 
             var response = await ClientFactory().SendAsync(requestMessage);
 
+            if (!response.IsSuccessStatusCode && response.StatusCode == System.Net.HttpStatusCode.Unauthorized) return new IdentityDto { IsAuthorized = false };
+
             var result = await response.Content.ReadAsStringAsync();
 
             var systemUsers = JsonConvert.DeserializeObject<ResponseDto<IdentityDto>>(result);
 
             return systemUsers.Value.FirstOrDefault(p => p.UserId == userId.ToString());
         }
 
+        public async Task<string> GetEmbedCode(string formId)
+        {
+            var oauthConfiguration = _dynamicsConfigurationService.GetOAuthConfiguration();
+
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Get,
+                RequestUri = new Uri($"{_settings.InstanceUrl}msdyncrm_formpages?$select=msdyncrm_javascriptcode,_msdyncrm_marketingformid_value" +
+                    $"&$filter=_msdyncrm_marketingformid_value eq {formId}")
+            };
+            requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", oauthConfiguration.AccessToken);
+
+            var response = await ClientFactory().SendAsync(requestMessage);
+
+            if (!response.IsSuccessStatusCode) return String.Empty;
+
+            var result = await response.Content.ReadAsStringAsync();
+
+            var embedCode = JsonConvert.DeserializeObject<ResponseDto<FormDto>>(result);
+
+            return embedCode.Value.First().EmbedCode;
+        }
+
         private async Task<string> GetUserId(string accessToken)
         {
             var requestMessage = new HttpRequestMessage
@@ -70,6 +101,8 @@ private async Task<string> GetUserId(string accessToken)
 
             var response = await ClientFactory().SendAsync(requestMessage);
 
+            if(!response.IsSuccessStatusCode) return String.Empty;
+
             var result = await response.Content.ReadAsStringAsync();
 
             return JObject.Parse(result)["UserId"].ToString();
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Umbraco.Cms.Integrations.Crm.Dynamics.csproj b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Umbraco.Cms.Integrations.Crm.Dynamics.csproj

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`	`vm.oauthConfig = {};`
`5`	`5`
`6`	`6`	`umbracoCmsIntegrationsCrmDynamicsResource.checkOAuthConfiguration().then(function(response) {`
`7`		`-`
`8`		`- if (response) {`
	`7`	`+ if (response && response.isAuthorized) {`
`9`	`8`	`vm.oauthConfig.isConnected = true;`
`10`	`9`	`vm.oauthConfig.fullName = response.fullName;`
`11`	`10`	`}`