Merge pull request #45 from umbraco/bugfix/dynamics-property-editor

Handle oauth success event raised multiple times

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/configuration.controller.js

@@ -2,6 +2,7 @@
     var vm = this;
 
     vm.oauthConfig = {};
+    vm.oauthSuccessEventCount = 0;
 
     umbracoCmsIntegrationsCrmDynamicsResource.checkOAuthConfiguration().then(function (response) {
         if (response && response.isAuthorized) {
@@ -39,30 +40,34 @@
     // authorization listener
     window.addEventListener("message", function (event) {
         if (event.data.type === "hubspot:oauth:success") {
-
-            umbracoCmsIntegrationsCrmDynamicsResource.getAccessToken(event.data.code).then(function (response) {
-                if (response.startsWith("Error:")) {
-
-                    // if directive runs from property editor, the notifications should be hidden, because they will not be displayed properly behind the overlay window.
-                    // if directive runs from data type, the notifications are displayed
-                    if (typeof $scope.connected === "undefined")
-                        notificationsService.error("Dynamics Configuration", response);
-                } else {
-                    vm.oauthConfig.isConnected = true;
-
-                    // if directive runs from property editor, the notifications should be hidden, because they will not be displayed properly behind the overlay window.
-                    // if directive runs from data type, the notifications are displayed
-                    if (typeof $scope.connected === "undefined")
-                        notificationsService.success("Dynamics Configuration", "OAuth connected.");
-
-                    umbracoCmsIntegrationsCrmDynamicsResource.getSystemUserFullName().then(function(response) {
-                        vm.oauthConfig.fullName = response;
-                    });
-
-                    if (typeof $scope.connected === "function")
-                        $scope.connected();
-                }
-            });
+            vm.oauthSuccessEventCount += 1;
+            
+            if (vm.oauthSuccessEventCount == 1) {
+                umbracoCmsIntegrationsCrmDynamicsResource.getAccessToken(event.data.code).then(function (response) {
+
+                    if (response.startsWith("Error:")) {
+
+                        // if directive runs from property editor, the notifications should be hidden, because they will not be displayed properly behind the overlay window.
+                        // if directive runs from data type, the notifications are displayed
+                        if (typeof $scope.connected === "undefined")
+                            notificationsService.error("Dynamics Configuration", response);
+                    } else {
+                        vm.oauthConfig.isConnected = true;
+
+                        // if directive runs from property editor, the notifications should be hidden, because they will not be displayed properly behind the overlay window.
+                        // if directive runs from data type, the notifications are displayed
+                        if (typeof $scope.connected === "undefined")
+                            notificationsService.success("Dynamics Configuration", "OAuth connected.");
+
+                        umbracoCmsIntegrationsCrmDynamicsResource.getSystemUserFullName().then(function (response) {
+                            vm.oauthConfig.fullName = response;
+                        });
+
+                        if (typeof $scope.connected === "function")
+                            $scope.connected();
+                    }
+                });
+            }
         }
     }, false);
 }

src/Umbraco.Cms.Integrations.Crm.Dynamics/Controllers/FormsController.cs

@@ -124,7 +124,7 @@ public async Task<string> GetAccessToken([FromBody] OAuthRequestDto authRequestD
                 var errorResult = await response.Content.ReadAsStringAsync();
                 var errorDto = JsonConvert.DeserializeObject<ErrorDto>(errorResult);
 
-                return "Error: " + errorDto.Message;
+                return "Error: " + errorDto.ErrorDescription;
             }
 
             return "Error: An unexpected error occurred.";

src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/Dtos/ErrorDto.cs

@@ -9,5 +9,8 @@ public class ErrorDto
 
         [JsonProperty("message")]
         public string Message { get; set; }
+
+        [JsonProperty("error_description")]
+        public string ErrorDescription { get; set; }
     }
 }