Authorization directive

Author: acoumb

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

@@ -10,6 +10,7 @@
             vm.searchTerm = "";
             vm.error = "";
             vm.isValid = true;
+            vm.isConnected = false;
 
             // check configuration
             checkConfiguration(loadForms);
@@ -65,6 +66,7 @@
                 if (vm.status.useOAuth === true) {
                     // use OAuth
                     umbracoCmsIntegrationsCrmHubspotResource.validateAccessToken().then(function (response) {
+                        
                         if (response.isExpired === true || response.isValid === false) {
                             vm.loading = false;
                             notificationsService.warning("HubSpot API", "Unable to connect to HubSpot. Please review the settings of the form picker property's data type.");
@@ -77,7 +79,8 @@
 
                             if (data.isValid === false || data.isExpired === true) {
                                 notificationsService.error("HubSpot API", "Unable to retrieve the list of forms from HubSpot. Please review the settings of the form picker property's data type.");
-                            }
+                            } else
+                                vm.isConnected = true;
                         });
                     });
                 } else {
@@ -89,9 +92,20 @@
 
                         if (data.isValid === false || data.isExpired === true) {
                             notificationsService.error("HubSpot API", "Invalid API key");
-                        }
+                        } else
+                            vm.isConnected = true;
                     });
 
                 }
             }
+
+            $scope.connected = function () {
+                vm.isConnected = true;
+                loadForms();
+            };
+
+            $scope.revoked = function () {
+                vm.isConnected = false;
+                vm.hubspotFormsList = [];
+            };
         });

src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/hubspotauthorization.directive.js

@@ -0,0 +1,11 @@
+angular.module("umbraco.directives")
+    .directive("hubspotAuthorization", function () {
+        return {
+            restrict: "E",
+            scope: {
+                "connected": "&onConnected",
+                "revoked": "&onRevoked"
+            },
+            templateUrl: "/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/views/settings.html"
+        }
+    });

src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/package.manifest

@@ -3,7 +3,8 @@
     "~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/formpicker.controller.js",
     "~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/settings.controller.js",
     "~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/hubspot.resource.js",
-    "~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/hubspot.service.js"
+    "~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/hubspot.service.js",
+    "~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/hubspotauthorization.directive.js"
   ],
   "css": [
     "~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/css/styles.css"

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

@@ -4,13 +4,13 @@
             <umb-box>
                 <umb-box-header title="{{ model.title }}" description="{{ model.subtitle }}"></umb-box-header>
                 <umb-box-content>
-                    <div class="hsOverlayGroup">
+                    <div class="hsOverlayGroup" ng-if="vm.isConnected">
                         <div class="form-search">
                             <i class="icon-search"></i>
                             <input type="text" class="-full-width-input" ng-model="vm.searchTerm" placeholder="Type to search..." umb-auto-focus="" aria-invalid="false">
                         </div>
                     </div>
-                    <div class="hsOverlayGroup">
+                    <div class="hsOverlayGroup" ng-if="vm.isConnected">
                         <ul class="hsFormsList">
                             <li ng-repeat="form in vm.hubspotFormsList | orderBy:'name' | filter:vm.searchTerm" ng-click="model.pickForm(form)" class="ng-scope" role="button" tabindex="0">
                                 <a href="" ng-attr-title="form.name">
@@ -23,6 +23,14 @@
                     </div>
                 </umb-box-content>
             </umb-box>
+            <umb-box>
+                <umb-box-header title="HubSpot - Authorization Status" description="Please connect to HubSpot."></umb-box-header>
+                <umb-box-content>
+                    <div class="hsOverlayGroup">
+                        <hubspot-authorization on-connected="connected()" on-revoked="revoked()"></hubspot-authorization>
+                    </div>
+                </umb-box-content>
+            </umb-box>
         </umb-editor-container>
 
         <umb-editor-footer>

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</TargetFrameworks>
+		<TargetFrameworks>net472;net50;net60</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -19,7 +19,7 @@
 		<PackageReference Include="UmbracoCms.Web" version="8.4.0" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net50'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net50' OR '$(TargetFramework)' == 'net60'">
 		<PackageReference Include="Umbraco.Cms.Web.Website" version="9.0.1" />
 		<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.1" />
 		<PackageReference Include="Umbraco.Cms.Web.Common" version="9.0.1" />
@@ -43,10 +43,18 @@
 		</Content>
 	</ItemGroup>
 
+	<ItemGroup>
+	  <None Remove="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\js\hubspotauthorization.directive.js" />
+	</ItemGroup>
+
 	<Target Name="RemoveLuceneAnalyzer" BeforeTargets="CoreCompile">
 		<ItemGroup>
 			<Analyzer Remove="@(Analyzer)" Condition="%(FileName) == 'Lucene.Net.CodeAnalysis.CSharp'" />
 		</ItemGroup>
 	</Target>
 
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+	  <Exec Command=" set UmbracoCmsIntegrationsTestsiteV8Path=$(SolutionDir)\Umbraco.Cms.Integrations.Testsite.V8&#xD;&#xA;  set HubspotDir=%25UmbracoCmsIntegrationsTestsiteV8Path%25\App_Plugins\UmbracoCms.Integrations\Crm\Hubspot&#xD;&#xA;  if not exist %25HubspotDir%25 mkdir -p %25HubspotDir%25&#xD;&#xA;  xcopy &quot;$(ProjectDir)App_Plugins\UmbracoCms.Integrations\Crm\Hubspot&quot; &quot;%25HubspotDir%25&quot; /e /y" />
+	</Target>
+
 </Project>