Update auth client config and versioning

Author: acoumb

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/Client/public/umbraco-package.json

@@ -1,7 +1,7 @@
 {
   "id": "Umbraco.Forms.Integrations.Crm.ActiveCampaign",
   "name": "Umbraco Forms Integrations: CRM - ActiveCampaign",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "extensions": [
     {
       "name": "Umbraco EntryPoint",

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/Client/src/index.ts

@@ -2,6 +2,7 @@
 import { UMB_AUTH_CONTEXT } from "@umbraco-cms/backoffice/auth";
 import { manifests as propertyEditorManifests } from "./property-editor/manifests";
 import { client } from "@umbraco-integrations/activecampaign/generated";
+import { umbHttpClient } from "@umbraco-cms/backoffice/http-client";
 import { manifests as localizationManifests } from "./lang/manifests.js";
 import { manifest as activecampaignContext } from "./context/manifest.js";
 
@@ -13,12 +14,8 @@ export const onInit: UmbEntryPointOnInit = (host, extensionRegistry) => {
   ]);
 
   host.consumeContext(UMB_AUTH_CONTEXT, async (auth) => {
-      const config = auth?.getOpenApiConfiguration();
+      if (!auth) return;
 
-      client.setConfig({
-          auth: config?.token ?? undefined,
-          baseUrl: config?.base ?? "",
-          credentials: config?.credentials ?? "same-origin",
-      });
+      client.setConfig(umbHttpClient.getConfig());
   });
 };

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/Umbraco.Forms.Integrations.Crm.ActiveCampaign.csproj

@@ -7,6 +7,7 @@
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<EnableDefaultContentItems>false</EnableDefaultContentItems>
 		<StaticWebAssetBasePath>/App_Plugins/ActiveCampaign</StaticWebAssetBasePath>
+		<CompressionEnabled>false</CompressionEnabled>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -62,14 +63,6 @@
 		<ShouldRunClientAssetsBuild>true</ShouldRunClientAssetsBuild>
 	</PropertyGroup>
 	<Target Name="ClientAssetsBuildOutputPath" BeforeTargets="ClientAssetsBuild">
-		<WriteLinesToFile File="Client\config.outputPath.js" Lines="export const outputPath = '$(Configuration)' !== 'Release' ? '../wwwroot' : '../$(IntermediateOutputPath.Replace('\', '/'))clientassets';" Overwrite="true" />
-	</Target>
-
-	<!-- Update umbraco-package.json files with current build version after client assets build -->
-	<Target Name="UpdatePackageManifestVersion" DependsOnTargets="ClientAssetsBuild" AfterTargets="GetBuildVersion;GetUmbracoBuildVersion">
-		<ItemGroup>
-			<_PackageManifestFiles Include="$(IntermediateOutputPath)clientassets\**\umbraco-package.json" />
-		</ItemGroup>
-		<JsonPathUpdateValue JsonFile="%(_PackageManifestFiles.FullPath)" Path="$.version" Value="&quot;$(PackageVersion)&quot;" />
+		<WriteLinesToFile File="Client\config.outputPath.js" Lines="export const outputPath = '../$(IntermediateOutputPath.Replace('\', '/'))clientassets';" Overwrite="true" />
 	</Target>
 </Project>