Skip to content

Commit 51d0817

Browse files
robearlamrobearlam
committed
Updated MVP Site to connect using ContextID, aligned README and package.props to this change
1 parent 067bb0a commit 51d0817

File tree

6 files changed

+23
-65
lines changed

6 files changed

+23
-65
lines changed

‎README.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,18 @@ If you want more information about the Cloud plugin for the CLI then you access
4545

4646
## Running the MVP Site
4747
To run the MVP site you will need to create a Development instance of your settings.
48-
To this duplicate the `./headapps/MvpSite/Mvp.Project.MvpSite.Rendering/appsettings.json` and name it `appsettings.Development.json`. Then provide the Sitecore instance, and Okta sections, it's completed it look something like:
48+
49+
Duplicate the `./headapps/MvpSite/Mvp.Project.MvpSite.Rendering/appsettings.json` and name it `appsettings.Development.json`.
50+
51+
Populate the Sitecore, and Okta sections. You can find the `EdgeContextId` & `EditingSecret` in the XMC Deploy application, in the Developer Settings section for your environment. The Okta settings are available after completing the Okta Developer sign-up linked above.
52+
53+
When completed it will look something like:
4954

5055
```json
5156
"Sitecore": {
52-
"InstanceUri": "https://xmc-XXX-XXX-XXX.sitecorecloud.io/",
53-
"LayoutServicePath": "/sitecore/api/graph/edge",
54-
"DefaultSiteName": "mvp-site",
55-
"NotFoundPage": "/404",
56-
"ExperienceEdgeToken": "{B2F8A9B9-7203-4DCF-9314-8B28B043347E}"
57+
"EdgeContextId": "XXX",
58+
"EditingSecret": "XXX",
59+
...
5760
},
5861
...
5962
"Okta" : {

‎authoring/platform/Packages.props‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,5 @@
1818
<PackageReference Update="Sitecore.XmCloud.ContentSearch.Linq" Version="$(PlatformVersion)" />
1919
<PackageReference Update="Sitecore.XmCloud.LayoutService" Version="$(PlatformVersion)" />
2020
<PackageReference Update="Sitecore.XmCloud.Assemblies" Version="$(PlatformVersion)" />
21-
22-
<!-- Rendering Host -->
23-
<PackageReference Update="Sitecore.Assemblies.SitecoreHeadlessServicesServer" Version="$(SitecoreAspNetVersion)" />
24-
25-
<PackageReference Update="Sitecore.AspNetCore.SDK.LayoutService.Client" Version="$(AspNetCoreSdkVersion)" />
26-
<PackageReference Update="Sitecore.AspNetCore.SDK.RenderingEngine" Version="$(AspNetCoreSdkVersion)" />
27-
<PackageReference Update="Sitecore.AspNetCore.SDK.ExperienceEditor" Version="$(AspNetCoreSdkVersion)" />
28-
29-
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(DotNetVersion)" />
30-
<PackageReference Update="Microsoft.Extensions.Http" Version="$(DotNetVersion)"/>
31-
<PackageReference Update="System.ServiceModel.Syndication" Version="$(DotNetVersion)" />
32-
33-
<PackageReference Update="BuildWebCompiler" Version="1.12.405" />
34-
<PackageReference Update="GraphQL.Client" Version="4.0.2" />
35-
<PackageReference Update="GraphQL.Client.Serializer.Newtonsoft" Version="4.0.2" />
36-
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.2" />
37-
<PackageReference Update="Microsoft.AspNetCore.Session" Version="2.2.0" />
38-
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
39-
<PackageReference Update="Okta.AspNetCore" Version="4.5.0" />
40-
<PackageReference Update="Mvp.Selections.Client" Version="4.14.0" />
41-
<PackageReference Update="StyleCop.Analyzers" Version="1.2.0-beta.556" />
42-
<PackageReference Update="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
43-
<PackageReference Update="Markdig" Version="0.37.0" />
4421
</ItemGroup>
45-
</Project>
22+
</Project>

‎headapps/MvpSite/Directory.Packages.props‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,9 @@
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
<CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
77
<PlatformVersion>1.*</PlatformVersion>
8-
<AspNetCoreSdkVersion>0.0.7</AspNetCoreSdkVersion>
8+
<AspNetCoreSdkVersion>0.0.11</AspNetCoreSdkVersion>
99
</PropertyGroup>
1010

11-
<ItemGroup Label="Platform Package References">
12-
<PackageVersion Include="Sitecore.XmCloud.Kernel" Version="$(PlatformVersion)" />
13-
<PackageVersion Include="Sitecore.XmCloud.ContentSearch" Version="$(PlatformVersion)" />
14-
<PackageVersion Include="Sitecore.XmCloud.ContentSearch.Linq" Version="$(PlatformVersion)" />
15-
<PackageVersion Include="Sitecore.XmCloud.LayoutService" Version="$(PlatformVersion)" />
16-
<PackageVersion Include="Sitecore.XmCloud.Assemblies" Version="$(PlatformVersion)" />
17-
</ItemGroup>
18-
1911
<ItemGroup Label="Rendering Host Package References">
2012
<PackageVersion Include="Sitecore.AspNetCore.SDK.LayoutService.Client" Version="$(AspNetCoreSdkVersion)" />
2113
<PackageVersion Include="Sitecore.AspNetCore.SDK.RenderingEngine" Version="$(AspNetCoreSdkVersion)" />

‎headapps/MvpSite/MvpSite.Rendering/AppSettings/MvpSiteSettings.cs‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,17 @@ public class MvpSiteSettings
44
{
55
public static readonly string Key = "Sitecore";
66

7-
public Uri? InstanceUri { get; set; }
8-
9-
public string LayoutServicePath { get; set; } = "/sitecore/api/layout/render/jss";
10-
117
public string? DefaultSiteName { get; set; }
128

139
public string? NotFoundPage { get; set; }
1410

1511
public string MvpProfilePageItemPath { get; set; } = "/Directory/Profile/*";
1612

17-
public bool EnableExperienceEditor { get; set; }
18-
19-
public string JssEditingSecret { get; set; } = string.Empty;
13+
public bool EnableEditingMode { get; set; }
2014

21-
public string? ExperienceEdgeToken { get; set; }
15+
public string EditingSecret { get; set; } = string.Empty;
2216

23-
public Uri? LayoutServiceUri
24-
{
25-
get
26-
{
27-
if (InstanceUri == null)
28-
{
29-
return null;
30-
}
17+
public string? EdgeContextId { get; set; }
3118

32-
return new Uri(InstanceUri, LayoutServicePath);
33-
}
34-
}
19+
public string? EditingPath { get; set; }
3520
}

‎headapps/MvpSite/MvpSite.Rendering/Startup.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void ConfigureServices(IServiceCollection services)
3535

3636
// Register the GraphQL version of the Sitecore Layout Service Client for use against experience edge & local edge endpoint
3737
services.AddSitecoreLayoutService()
38-
.AddGraphQlHandler("default", Configuration.DefaultSiteName!, Configuration.ExperienceEdgeToken!, Configuration.LayoutServiceUri!)
38+
.AddGraphQlWithContextHandler("default", Configuration.EdgeContextId!, siteName: Configuration.DefaultSiteName!)
3939
.AsDefaultHandler();
4040

4141
services.AddFeatureUser(DotNetConfiguration);
@@ -59,7 +59,7 @@ public void ConfigureServices(IServiceCollection services)
5959
.ForwardHeaders()
6060

6161
// Enable support for the Experience Editor.
62-
.WithExperienceEditor(options => { options.JssEditingSecret = Configuration.JssEditingSecret; });
62+
.WithExperienceEditor(options => { options.JssEditingSecret = Configuration.EditingSecret; });
6363

6464
// Register MVP Functionality specific services
6565
services.AddFeatureSocialServices()
@@ -104,7 +104,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
104104
// ReSharper restore StringLiteralTypo - Uri segments
105105
// The Experience Editor endpoint should not be enabled in production DMZ.
106106
// See the SDK documentation for details.
107-
if (Configuration.EnableExperienceEditor)
107+
if (Configuration.EnableEditingMode)
108108
{
109109
// Enable the Sitecore Experience Editor POST endpoint.
110110
app.UseSitecoreExperienceEditor();

‎headapps/MvpSite/MvpSite.Rendering/appsettings.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"Sitecore": {
3-
"InstanceUri": "<<EDGE_DOMAIN>>",
4-
"LayoutServicePath": "/api/graphql/v1",
3+
"EdgeContextId": "",
4+
"EditingSecret": "",
5+
"EnableEditingMode": true,
6+
"EditingPath": "/api/editing/config",
57
"DefaultSiteName": "mvp-site",
6-
"NotFoundPage": "/404",
7-
"ExperienceEdgeToken": "<<EDGE_TOKEN>>"
8+
"NotFoundPage": "/404"
89
},
910
"AllowedHosts": "*",
1011
"https_port": 443,

0 commit comments

Comments
 (0)