Skip to content

Commit f760c1b

Browse files
committed
Update auth client config
1 parent f462655 commit f760c1b

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

src/Umbraco.Cms.Integrations.Automation.Zapier/Client/src/index.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { UMB_AUTH_CONTEXT } from "@umbraco-cms/backoffice/auth";
33
import { manifest as zapierContext } from "./context/manifests";
44
import { manifests as zapierDashboard } from "./dashboard/manifests";
55
import { client } from "@umbraco-integrations/zapier/generated";
6+
import { umbHttpClient } from "@umbraco-cms/backoffice/http-client";
67

78
export const onInit: UmbEntryPointOnInit = (host, extensionRegistry) => {
89
extensionRegistry.registerMany([
@@ -11,12 +12,8 @@ export const onInit: UmbEntryPointOnInit = (host, extensionRegistry) => {
1112
]);
1213

1314
host.consumeContext(UMB_AUTH_CONTEXT, async (auth) => {
14-
const config = auth?.getOpenApiConfiguration();
15+
if (!auth) return;
1516

16-
client.setConfig({
17-
auth: config?.token ?? undefined,
18-
baseUrl: config?.base ?? "",
19-
credentials: config?.credentials ?? "same-origin",
20-
});
17+
client.setConfig(umbHttpClient.getConfig());
2118
});
2219
}

src/Umbraco.Cms.Integrations.Automation.Zapier/Umbraco.Cms.Integrations.Automation.Zapier.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,4 @@
5757
<Target Name="ClientAssetsBuildOutputPath" BeforeTargets="ClientAssetsBuild">
5858
<WriteLinesToFile File="Client\config.outputPath.js" Lines="export const outputPath = '../$(IntermediateOutputPath.Replace('\', '/'))clientassets';" Overwrite="true" />
5959
</Target>
60-
61-
<!-- Update umbraco-package.json files with current build version after client assets build -->
62-
<Target Name="UpdatePackageManifestVersion" DependsOnTargets="ClientAssetsBuild" AfterTargets="GetBuildVersion;GetUmbracoBuildVersion">
63-
<ItemGroup>
64-
<_PackageManifestFiles Include="$(IntermediateOutputPath)clientassets\**\umbraco-package.json" />
65-
</ItemGroup>
66-
<JsonPathUpdateValue JsonFile="%(_PackageManifestFiles.FullPath)" Path="$.version" Value="&quot;$(PackageVersion)&quot;" />
67-
</Target>
6860
</Project>

0 commit comments

Comments
 (0)