Skip to content

Commit 35084a8

Browse files
committed
Update auth client config and versioning
1 parent 7e68558 commit 35084a8

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "Umbraco.Cms.Integrations.Crm.ActiveCampaign",
33
"name": "Umbraco CMS Integrations: CRM - ActiveCampaign",
4-
"version": "",
4+
"version": "5.0.0",
55
"extensions": [
66
{
77
"name": "Umbraco EntryPoint",

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { manifest as activecampaignContext } from "./context/manifest.js";
55
import { manifest as activeCampaignModal } from "./modal/manifest.js";
66

77
import { client } from "@umbraco-integrations/activecampaign-forms/generated";
8+
import { umbHttpClient } from "@umbraco-cms/backoffice/http-client";
89

910
export const onInit: UmbEntryPointOnInit = (host, extensionRegistry) => {
1011
extensionRegistry.registerMany([
@@ -13,13 +14,9 @@ export const onInit: UmbEntryPointOnInit = (host, extensionRegistry) => {
1314
activeCampaignModal
1415
]);
1516

16-
host.consumeContext(UMB_AUTH_CONTEXT, async (auth) => {
17-
const config = auth?.getOpenApiConfiguration();
17+
host.consumeContext(UMB_AUTH_CONTEXT, async (auth) => {
18+
if (!auth) return;
1819

19-
client.setConfig({
20-
auth: config?.token ?? undefined,
21-
baseUrl: config?.base ?? "",
22-
credentials: config?.credentials ?? "same-origin",
23-
});
20+
client.setConfig(umbHttpClient.getConfig());
2421
});
2522
};

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,4 @@
6464
<Target Name="ClientAssetsBuildOutputPath" BeforeTargets="ClientAssetsBuild">
6565
<WriteLinesToFile File="Client\config.outputPath.js" Lines="export const outputPath = '../$(IntermediateOutputPath.Replace('\', '/'))clientassets';" Overwrite="true" />
6666
</Target>
67-
68-
<!-- Update umbraco-package.json files with current build version after client assets build -->
69-
<Target Name="UpdatePackageManifestVersion" DependsOnTargets="ClientAssetsBuild" AfterTargets="GetBuildVersion;GetUmbracoBuildVersion">
70-
<ItemGroup>
71-
<_PackageManifestFiles Include="$(IntermediateOutputPath)clientassets\**\umbraco-package.json" />
72-
</ItemGroup>
73-
<JsonPathUpdateValue JsonFile="%(_PackageManifestFiles.FullPath)" Path="$.version" Value="&quot;$(PackageVersion)&quot;" />
74-
</Target>
7567
</Project>

0 commit comments

Comments
 (0)