Hubspot authentication directive updates.

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/settings.controller.js

@@ -29,8 +29,11 @@
             }
 
             if (response.isValid !== true) {
-                notificationsService.warning("HubSpot Configuration",
-                    "Invalid setup. Please review the API/OAuth settings.");
+                // 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.warning("HubSpot Configuration",
+                        "Invalid setup. Please review the API/OAuth settings.");
             }
         });
 
@@ -46,7 +49,12 @@
     vm.onRevokeToken = function() {
         umbracoCmsIntegrationsCrmHubspotResource.revokeAccessToken().then(function (response) {
             vm.oauthSetup.isConnected = false;
-            notificationsService.success("HubSpot Configuration", "OAuth connection revoked.");
+
+            if(typeof $scope.connected === "undefined")
+                notificationsService.success("HubSpot Configuration", "OAuth connection revoked.");
+
+            if (typeof $scope.revoked === "function")
+                $scope.revoked();
         });
     }
 
@@ -56,11 +64,17 @@
 
             umbracoCmsIntegrationsCrmHubspotResource.getAccessToken(event.data.code).then(function (response) {
                 if (response.startsWith("Error:")) {
-                    notificationsService.error("HubSpot Configuration", response);
+                    if (typeof $scope.connected === "undefined")
+                        notificationsService.error("HubSpot Configuration", response);
                 } else {
                     vm.oauthSetup.isConnected = true;
                     vm.status.description = umbracoCmsIntegrationsCrmHubspotService.configDescription.OAuthConnected;
-                    notificationsService.success("HubSpot Configuration", "OAuth connected.");
+
+                    if (typeof $scope.connected === "undefined")
+                        notificationsService.success("HubSpot Configuration", "OAuth connected.");
+
+                    if (typeof $scope.connected === "function")
+                        $scope.connected();
                 }
             });
 

src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/views/formpickereditor.html

@@ -24,7 +24,7 @@
                 </umb-box-content>
             </umb-box>
             <umb-box>
-                <umb-box-header title="HubSpot - Authorization Status" description="Please connect to HubSpot."></umb-box-header>
+                <umb-box-header title="HubSpot API" description="Please connect to HubSpot."></umb-box-header>
                 <umb-box-content>
                     <div class="hsOverlayGroup">
                         <hubspot-authorization on-connected="connected()" on-revoked="revoked()"></hubspot-authorization>

src/Umbraco.Cms.Integrations.Crm.Hubspot/Umbraco.Cms.Integrations.Crm.Hubspot.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net472;net50;net60</TargetFrameworks>
+		<TargetFrameworks>net472;net50</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>