summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2010-05-05 06:51:37 -0700
committerAndrew Arnott <andrewarnott@gmail.com>2010-05-05 06:51:37 -0700
commitcdd2e25ed639d0d7d436d41e669a82c10b5459b9 (patch)
tree798ea3b972bf287e2760fd64d5ccbcf81c8d2803
parentace3e8099589abfb3fcd8ebc084003f1d36f7f92 (diff)
parent7cea6544a287d0d7efd5cb379fff6b7800f9af63 (diff)
downloadDotNetOpenAuth-cdd2e25ed639d0d7d436d41e669a82c10b5459b9.zip
DotNetOpenAuth-cdd2e25ed639d0d7d436d41e669a82c10b5459b9.tar.gz
DotNetOpenAuth-cdd2e25ed639d0d7d436d41e669a82c10b5459b9.tar.bz2
Merge branch 'v3.2' into v3.3
-rw-r--r--src/DotNetOpenAuth/OpenId/Behaviors/AXFetchAsSregTransform.cs7
-rw-r--r--src/DotNetOpenAuth/OpenId/Extensions/ExtensionsInteropHelper.cs5
2 files changed, 4 insertions, 8 deletions
diff --git a/src/DotNetOpenAuth/OpenId/Behaviors/AXFetchAsSregTransform.cs b/src/DotNetOpenAuth/OpenId/Behaviors/AXFetchAsSregTransform.cs
index 9051998..01b74a1 100644
--- a/src/DotNetOpenAuth/OpenId/Behaviors/AXFetchAsSregTransform.cs
+++ b/src/DotNetOpenAuth/OpenId/Behaviors/AXFetchAsSregTransform.cs
@@ -115,12 +115,7 @@ namespace DotNetOpenAuth.OpenId.Behaviors {
bool IProviderBehavior.OnIncomingRequest(IRequest request) {
var extensionRequest = request as Provider.HostProcessedRequest;
if (extensionRequest != null) {
- if (extensionRequest.GetExtension<ClaimsRequest>() == null) {
- ClaimsRequest sreg = extensionRequest.UnifyExtensionsAsSreg();
- if (sreg != null) {
- ((IProtocolMessageWithExtensions)extensionRequest.RequestMessage).Extensions.Add(sreg);
- }
- }
+ extensionRequest.UnifyExtensionsAsSreg();
}
return false;
diff --git a/src/DotNetOpenAuth/OpenId/Extensions/ExtensionsInteropHelper.cs b/src/DotNetOpenAuth/OpenId/Extensions/ExtensionsInteropHelper.cs
index e2b0bf8..2e0d721 100644
--- a/src/DotNetOpenAuth/OpenId/Extensions/ExtensionsInteropHelper.cs
+++ b/src/DotNetOpenAuth/OpenId/Extensions/ExtensionsInteropHelper.cs
@@ -130,7 +130,8 @@ namespace DotNetOpenAuth.OpenId.Extensions {
/// <summary>
/// Looks for Simple Registration and Attribute Exchange (all known formats)
- /// request extensions and returns them as a Simple Registration extension.
+ /// request extensions and returns them as a Simple Registration extension,
+ /// and adds the new extension to the original request message if it was absent.
/// </summary>
/// <param name="request">The authentication request.</param>
/// <returns>
@@ -140,7 +141,7 @@ namespace DotNetOpenAuth.OpenId.Extensions {
internal static ClaimsRequest UnifyExtensionsAsSreg(this Provider.IHostProcessedRequest request) {
Contract.Requires<ArgumentNullException>(request != null);
- var req = (Provider.AuthenticationRequest)request;
+ var req = (Provider.HostProcessedRequest)request;
var sreg = req.GetExtension<ClaimsRequest>();
if (sreg != null) {
return sreg;