Skip to content

Commit 7d65aa7

Browse files
committed
Update auth client config and versioning
1 parent 6fa46eb commit 7d65aa7

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

src/Umbraco.Cms.Integrations.SEO.Semrush/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.SEO.Semrush",
33
"name": "Umbraco CMS Integrations: SEO - Semrush",
4-
"version": "",
4+
"version": "3.0.0",
55
"extensions": [
66
{
77
"name": "Umbraco EntryPoint",
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { UmbEntryPointOnInit } from "@umbraco-cms/backoffice/extension-api";
22
import { UMB_AUTH_CONTEXT } from "@umbraco-cms/backoffice/auth";
33
import { client } from "@umbraco-integrations/semrush/generated";
4+
import { umbHttpClient } from "@umbraco-cms/backoffice/http-client";
45
import { manifest as semrushContext } from "./context/manifest";
56
import { manifests as workspaceManifest } from "./workspace/manifests";
67
import { manifest as modalManifest } from "./modal/manifest";
@@ -13,12 +14,8 @@ 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
};

src/Umbraco.Cms.Integrations.SEO.Semrush/Umbraco.Cms.Integrations.SEO.Semrush.csproj

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

0 commit comments

Comments
 (0)