Skip to content

Commit 48ea105

Browse files
committed
Update auth client config and versioning.
1 parent 3e1f557 commit 48ea105

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

src/Umbraco.Cms.Integrations.Crm.Dynamics/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.Dynamics",
33
"name": "Umbraco CMS Integrations: Crm - Dynamics",
4-
"version": "",
4+
"version": "4.0.0",
55
"extensions": [
66
{
77
"name": "Umbraco EntryPoint",

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { manifest as dynamicsContext } from "./context/manifests";
44
import { manifests as dynamicsFormPicker } from "./property-editor/manifests";
55
import { manifest as dynamicsModal } from "./modal/manifests";
66
import { client } from "@umbraco-integrations/dynamics/generated";
7+
import { umbHttpClient } from "@umbraco-cms/backoffice/http-client";
78

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

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

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

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</PropertyGroup>
2626

2727
<PropertyGroup>
28-
<UmbracoCmsPackageVersion>[16.0.0-rc3, 17)</UmbracoCmsPackageVersion>
28+
<UmbracoCmsPackageVersion>[16.0.0, 17)</UmbracoCmsPackageVersion>
2929
</PropertyGroup>
3030

3131
<ItemGroup>
@@ -63,12 +63,4 @@
6363
<Target Name="ClientAssetsBuildOutputPath" BeforeTargets="ClientAssetsBuild">
6464
<WriteLinesToFile File="Client\config.outputPath.js" Lines="export const outputPath = '../$(IntermediateOutputPath.Replace('\', '/'))clientassets';" Overwrite="true" />
6565
</Target>
66-
67-
<!-- Update umbraco-package.json files with current build version after client assets build -->
68-
<Target Name="UpdatePackageManifestVersion" DependsOnTargets="ClientAssetsBuild" AfterTargets="GetBuildVersion;GetUmbracoBuildVersion">
69-
<ItemGroup>
70-
<_PackageManifestFiles Include="$(IntermediateOutputPath)clientassets\**\umbraco-package.json" />
71-
</ItemGroup>
72-
<JsonPathUpdateValue JsonFile="%(_PackageManifestFiles.FullPath)" Path="$.version" Value="&quot;$(PackageVersion)&quot;" />
73-
</Target>
7466
</Project>

0 commit comments

Comments
 (0)