diff --git a/Dxa.CM.Extensions/DXA.CM.Extensions.DXAResolver.Models/DXA.CM.Extensions.DXAResolver.Models.csproj b/Dxa.CM.Extensions/DXA.CM.Extensions.DXAResolver.Models/DXA.CM.Extensions.DXAResolver.Models.csproj
index 7bbfcd5..516b2c4 100644
--- a/Dxa.CM.Extensions/DXA.CM.Extensions.DXAResolver.Models/DXA.CM.Extensions.DXAResolver.Models.csproj
+++ b/Dxa.CM.Extensions/DXA.CM.Extensions.DXAResolver.Models/DXA.CM.Extensions.DXAResolver.Models.csproj
@@ -58,15 +58,19 @@
False
- ..\..\_references\cm-8.1\Tridion.Common.dll
+ ..\..\_references\cm-9.1\Tridion.Common.dll
False
- ..\..\_references\cm-8.1\Tridion.ContentManager.CoreService.Client.dll
+ ..\..\_references\cm-9.1\Tridion.ContentManager.CoreService.Client.dll
False
- ..\..\_references\cm-8.1\Tridion.Logging.dll
+ ..\..\_references\cm-9.1\Tridion.Logging.dll
+
+
+ False
+ ..\..\_references\cm-9.1\Tridion.Security.dll
diff --git a/Dxa.CM.Extensions/DXA.CM.Extensions.DXAResolver.Models/Services/Implementation/Constants.cs b/Dxa.CM.Extensions/DXA.CM.Extensions.DXAResolver.Models/Services/Implementation/Constants.cs
index 2e67962..e53420b 100644
--- a/Dxa.CM.Extensions/DXA.CM.Extensions.DXAResolver.Models/Services/Implementation/Constants.cs
+++ b/Dxa.CM.Extensions/DXA.CM.Extensions.DXAResolver.Models/Services/Implementation/Constants.cs
@@ -5,7 +5,7 @@ public static class Constants
public const string DXA_RESOLVER_CONFIGURATION_PREFIX = "dcr";
public const string DXA_RESOLVER_CONFIGURATION_NAME = "dxa:CustomResolver";
public const string DXA_RESOLVER_CONFIGURATION_NAMESPACE = "http://www.sdltridion.com/2017/DXACustomResolver";
- public const string CLIENT_ENDPOINT_NAME_81 = "netSamlTcp_201501";
+ public const string CLIENT_ENDPOINT_NAME_81 = "netSamlTcp_201701";
}
}
\ No newline at end of file
diff --git a/Dxa.CM.Extensions/DXA.CM.Extensions.DXAResolver.Models/Services/Implementation/CoreServiceManager.cs b/Dxa.CM.Extensions/DXA.CM.Extensions.DXAResolver.Models/Services/Implementation/CoreServiceManager.cs
index 659f3a3..f358961 100644
--- a/Dxa.CM.Extensions/DXA.CM.Extensions.DXAResolver.Models/Services/Implementation/CoreServiceManager.cs
+++ b/Dxa.CM.Extensions/DXA.CM.Extensions.DXAResolver.Models/Services/Implementation/CoreServiceManager.cs
@@ -80,8 +80,16 @@ private static void SetClaimsCredential(ClaimsClientCredentials clientCredential
if (IsSamlSupported())
{
// Our own LDAP or SSO authentication has been used. Use the ClaimSet it provided as client credentials.
- var user = (ClaimsPrincipal)HttpContext.Current.User;
- clientCredentials.Claims = user.Claims;
+ var user = HttpContext.Current.User as ClaimsPrincipal;
+ if (user == null)
+ {
+ var tridionUser = HttpContext.Current.User as Tridion.Security.ClaimsPrincipal;
+ clientCredentials.Claims = tridionUser.Claims;
+ }
+ else
+ {
+ clientCredentials.Claims = user.Claims;
+ }
}
else
{
@@ -98,7 +106,9 @@ private static bool IsSamlSupported()
using (Tracer.GetTracer().StartTrace())
{
var user = HttpContext.Current.User as ClaimsPrincipal;
- return user != null;
+ var trdidionUser = HttpContext.Current.User as Tridion.Security.ClaimsPrincipal;
+
+ return user != null || trdidionUser!= null;
}
}
}
diff --git a/README.md b/README.md
index 13bb6a0..eff8084 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@ SDL Digital Experience Accelerator CM-side framework
Build status
------------
- Develop: ![Build Status](https://github.com/sdl/dxa-content-management/workflows/Build/badge.svg?branch=develop)
-- 2.2: ![Build Status](https://github.com/sdl/dxa-content-management/workflows/Build/badge.svg?branch=release/2.2)
- 1.8: ![Build Status](https://github.com/sdl/dxa-content-management/workflows/Build/badge.svg?branch=release/1.8)
Prerequisites
@@ -82,22 +81,13 @@ To publish to NuGet.org you must have the correct API key registered.
Repositories
------------
-The following repositories with DXA source code are available:
-
- - https://github.com/sdl/dxa-content-management - CM-side framework (.NET Template Building Blocks)
- - https://github.com/sdl/dxa-html-design - Whitelabel HTML Design
- - https://github.com/sdl/dxa-model-service - DXA Model Service (Java)
- - https://github.com/sdl/dxa-modules - Modules (.NET and Java)
- - https://github.com/sdl/dxa-web-application-dotnet - ASP.NET MVC web application (incl. framework)
- - https://github.com/sdl/dxa-web-application-java - Java Spring MVC web application (incl. framework)
-
+You can find all the DXA related repositories [here](https://github.com/sdl/?q=dxa&type=source&language=)
Branches and Contributions
--------------------------
We are using the following branching strategy:
- - `master` - Represents the latest stable version. This may be a pre-release version (tagged as `DXA x.y Sprint z`). Updated each development Sprint (approx. bi-weekly).
- - `develop` - Represents the latest development version. Updated very frequently (typically nightly).
+ - `develop` - Represents the latest development version.
- `release/x.y` - Represents the x.y Release. If hotfixes are applicable, they will be applied to the appropriate release branch, so that the release branch actually represent the initial release plus hotfixes.
All releases (including pre-releases and hotfix releases) are tagged.
diff --git a/_references/cm-9.1/Tridion.Common.dll b/_references/cm-9.1/Tridion.Common.dll
new file mode 100644
index 0000000..0455d6c
Binary files /dev/null and b/_references/cm-9.1/Tridion.Common.dll differ
diff --git a/_references/cm-9.1/Tridion.ContentManager.CoreService.Client.dll b/_references/cm-9.1/Tridion.ContentManager.CoreService.Client.dll
new file mode 100644
index 0000000..a32c3ed
Binary files /dev/null and b/_references/cm-9.1/Tridion.ContentManager.CoreService.Client.dll differ
diff --git a/_references/cm-9.1/Tridion.Logging.dll b/_references/cm-9.1/Tridion.Logging.dll
new file mode 100644
index 0000000..59ccc19
Binary files /dev/null and b/_references/cm-9.1/Tridion.Logging.dll differ
diff --git a/_references/cm-9.1/Tridion.Security.dll b/_references/cm-9.1/Tridion.Security.dll
new file mode 100644
index 0000000..92d738d
Binary files /dev/null and b/_references/cm-9.1/Tridion.Security.dll differ
diff --git a/_travis.yml b/_travis.yml
deleted file mode 100644
index 327ea11..0000000
--- a/_travis.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-language: csharp
-solution: DxaContentManagement.sln
diff --git a/cms/content/sites9/all-publications/Binaries/2-70-2048.tbbasm b/cms/content/sites9/all-publications/Binaries/2-70-2048.tbbasm
index e1da875..d39cdcc 100644
Binary files a/cms/content/sites9/all-publications/Binaries/2-70-2048.tbbasm and b/cms/content/sites9/all-publications/Binaries/2-70-2048.tbbasm differ
diff --git a/cms/content/sites9/all-publications/Binaries/2-80-2048.tbbasm b/cms/content/sites9/all-publications/Binaries/2-80-2048.tbbasm
index d39e851..c5119ba 100644
Binary files a/cms/content/sites9/all-publications/Binaries/2-80-2048.tbbasm and b/cms/content/sites9/all-publications/Binaries/2-80-2048.tbbasm differ
diff --git a/cms/content/sites9/framework-only/Binaries/2-70-2048.tbbasm b/cms/content/sites9/framework-only/Binaries/2-70-2048.tbbasm
index e1da875..d39cdcc 100644
Binary files a/cms/content/sites9/framework-only/Binaries/2-70-2048.tbbasm and b/cms/content/sites9/framework-only/Binaries/2-70-2048.tbbasm differ
diff --git a/cms/content/sites9/framework-only/Binaries/2-80-2048.tbbasm b/cms/content/sites9/framework-only/Binaries/2-80-2048.tbbasm
index d39e851..c5119ba 100644
Binary files a/cms/content/sites9/framework-only/Binaries/2-80-2048.tbbasm and b/cms/content/sites9/framework-only/Binaries/2-80-2048.tbbasm differ
diff --git a/cms/content/sites9/master-only/Binaries/2-70-2048.tbbasm b/cms/content/sites9/master-only/Binaries/2-70-2048.tbbasm
index e1da875..d39cdcc 100644
Binary files a/cms/content/sites9/master-only/Binaries/2-70-2048.tbbasm and b/cms/content/sites9/master-only/Binaries/2-70-2048.tbbasm differ
diff --git a/cms/content/sites9/master-only/Binaries/2-80-2048.tbbasm b/cms/content/sites9/master-only/Binaries/2-80-2048.tbbasm
index d39e851..c5119ba 100644
Binary files a/cms/content/sites9/master-only/Binaries/2-80-2048.tbbasm and b/cms/content/sites9/master-only/Binaries/2-80-2048.tbbasm differ