Added IExtension.AdditionalSupportedTypeUris property.

This allows easier versioning of extensions.

17 files changed, 168 insertions, 36 deletions

diff --git a/src/DotNetOpenId.Test/Extensions/ClaimsResponseTests.cs b/src/DotNetOpenId.Test/Extensions/ClaimsResponseTests.cs
index 4774612..8210a90 100644
--- a/src/DotNetOpenId.Test/Extensions/ClaimsResponseTests.cs
+++ b/src/DotNetOpenId.Test/Extensions/ClaimsResponseTests.cs
@@ -20,7 +20,7 @@ namespace DotNetOpenId.Test.Extensions {
 	[TestFixture]

 	public class ClaimsResponseTests {

 		ClaimsResponse getFilledData() {

-			return new ClaimsResponse() {

+			return new ClaimsResponse(Constants.sreg_ns) {

 				BirthDate = new DateTime(2005, 2, 3),

 				Culture = new System.Globalization.CultureInfo("en-US"),

 				Email = "a@b.com",

@@ -34,7 +34,7 @@ namespace DotNetOpenId.Test.Extensions {
 

 		[Test]

 		public void EmptyMailAddress() {

-			ClaimsResponse response = new ClaimsResponse();

+			ClaimsResponse response = new ClaimsResponse(Constants.sreg_ns);

 			response.Email = "";

 			Assert.IsNull(response.MailAddress);

 		}

diff --git a/src/DotNetOpenId.Test/Extensions/PolicyRequestTests.cs b/src/DotNetOpenId.Test/Extensions/PolicyRequestTests.cs
index 5a46327..508dace 100644
--- a/src/DotNetOpenId.Test/Extensions/PolicyRequestTests.cs
+++ b/src/DotNetOpenId.Test/Extensions/PolicyRequestTests.cs
@@ -82,13 +82,13 @@ namespace DotNetOpenId.Test.Extensions {
 		[Test]

 		public void DeserializeNull() {

 			PolicyRequest req = new PolicyRequest();

-			Assert.IsFalse(((IExtensionRequest)req).Deserialize(null, null));

+			Assert.IsFalse(((IExtensionRequest)req).Deserialize(null, null, Constants.TypeUri));

 		}

 

 		[Test]

 		public void DeserializeEmpty() {

 			PolicyRequest req = new PolicyRequest();

-			Assert.IsFalse(((IExtensionRequest)req).Deserialize(new Dictionary<string, string>(), null));

+			Assert.IsFalse(((IExtensionRequest)req).Deserialize(new Dictionary<string, string>(), null, Constants.TypeUri));

 		}

 

 		[Test]

@@ -99,7 +99,7 @@ namespace DotNetOpenId.Test.Extensions {
 			// Most basic test

 			PolicyRequest req = new PolicyRequest(), req2 = new PolicyRequest();

 			var fields = ((IExtensionRequest)req).Serialize(null);

-			Assert.IsTrue(((IExtensionRequest)req2).Deserialize(fields, null));

+			Assert.IsTrue(((IExtensionRequest)req2).Deserialize(fields, null, Constants.TypeUri));

 			Assert.AreEqual(req, req2);

 

 			// Test with all fields set

@@ -107,14 +107,14 @@ namespace DotNetOpenId.Test.Extensions {
 			req.PreferredPolicies.Add(AuthenticationPolicies.MultiFactor);

 			req.MaximumAuthenticationAge = TimeSpan.FromHours(1);

 			fields = ((IExtensionRequest)req).Serialize(null);

-			Assert.IsTrue(((IExtensionRequest)req2).Deserialize(fields, null));

+			Assert.IsTrue(((IExtensionRequest)req2).Deserialize(fields, null, Constants.TypeUri));

 			Assert.AreEqual(req, req2);

 

 			// Test with an extra policy

 			req2 = new PolicyRequest();

 			req.PreferredPolicies.Add(AuthenticationPolicies.PhishingResistant);

 			fields = ((IExtensionRequest)req).Serialize(null);

-			Assert.IsTrue(((IExtensionRequest)req2).Deserialize(fields, null));

+			Assert.IsTrue(((IExtensionRequest)req2).Deserialize(fields, null, Constants.TypeUri));

 			Assert.AreEqual(req, req2);

 

 			// Test with a policy added twice.  We should see it intelligently leave one of

@@ -122,7 +122,7 @@ namespace DotNetOpenId.Test.Extensions {
 			req2 = new PolicyRequest();

 			req.PreferredPolicies.Add(AuthenticationPolicies.PhishingResistant);

 			fields = ((IExtensionRequest)req).Serialize(null);

-			Assert.IsTrue(((IExtensionRequest)req2).Deserialize(fields, null));

+			Assert.IsTrue(((IExtensionRequest)req2).Deserialize(fields, null, Constants.TypeUri));

 			Assert.AreNotEqual(req, req2);

 			// Now go ahead and add the doubled one so we can do our equality test.

 			req2.PreferredPolicies.Add(AuthenticationPolicies.PhishingResistant);

diff --git a/src/DotNetOpenId.Test/Extensions/PolicyResponseTests.cs b/src/DotNetOpenId.Test/Extensions/PolicyResponseTests.cs
index 6aefaaa..572672a 100644
--- a/src/DotNetOpenId.Test/Extensions/PolicyResponseTests.cs
+++ b/src/DotNetOpenId.Test/Extensions/PolicyResponseTests.cs
@@ -134,13 +134,13 @@ namespace DotNetOpenId.Test.Extensions {
 		[Test]

 		public void DeserializeNull() {

 			PolicyResponse resp = new PolicyResponse();

-			Assert.IsFalse(((IExtensionResponse)resp).Deserialize(null, null));

+			Assert.IsFalse(((IExtensionResponse)resp).Deserialize(null, null, Constants.TypeUri));

 		}

 

 		[Test]

 		public void DeserializeEmpty() {

 			PolicyResponse resp = new PolicyResponse();

-			Assert.IsFalse(((IExtensionResponse)resp).Deserialize(new Dictionary<string,string>(), null));

+			Assert.IsFalse(((IExtensionResponse)resp).Deserialize(new Dictionary<string, string>(), null, Constants.TypeUri));

 		}

 

 		[Test]

@@ -151,7 +151,7 @@ namespace DotNetOpenId.Test.Extensions {
 			// Most basic test

 			PolicyResponse resp = new PolicyResponse(), resp2 = new PolicyResponse();

 			var fields = ((IExtensionResponse)resp).Serialize(null);

-			Assert.IsTrue(((IExtensionResponse)resp2).Deserialize(fields, null));

+			Assert.IsTrue(((IExtensionResponse)resp2).Deserialize(fields, null, Constants.TypeUri));

 			Assert.AreEqual(resp, resp2);

 

 			// Test with all fields set

@@ -160,14 +160,14 @@ namespace DotNetOpenId.Test.Extensions {
 			resp.AuthenticationTimeUtc = someUtcTime;

 			resp.NistAssuranceLevel = NistAssuranceLevel.Level2;

 			fields = ((IExtensionResponse)resp).Serialize(null);

-			Assert.IsTrue(((IExtensionResponse)resp2).Deserialize(fields, null));

+			Assert.IsTrue(((IExtensionResponse)resp2).Deserialize(fields, null, Constants.TypeUri));

 			Assert.AreEqual(resp, resp2);

 

 			// Test with an extra policy

 			resp2 = new PolicyResponse();

 			resp.ActualPolicies.Add(AuthenticationPolicies.PhishingResistant);

 			fields = ((IExtensionResponse)resp).Serialize(null);

-			Assert.IsTrue(((IExtensionResponse)resp2).Deserialize(fields, null));

+			Assert.IsTrue(((IExtensionResponse)resp2).Deserialize(fields, null, Constants.TypeUri));

 			Assert.AreEqual(resp, resp2);

 

 			// Test with a policy added twice.  We should see it intelligently leave one of

@@ -175,7 +175,7 @@ namespace DotNetOpenId.Test.Extensions {
 			resp2 = new PolicyResponse();

 			resp.ActualPolicies.Add(AuthenticationPolicies.PhishingResistant);

 			fields = ((IExtensionResponse)resp).Serialize(null);

-			Assert.IsTrue(((IExtensionResponse)resp2).Deserialize(fields, null));

+			Assert.IsTrue(((IExtensionResponse)resp2).Deserialize(fields, null, Constants.TypeUri));

 			Assert.AreNotEqual(resp, resp2);

 			// Now go ahead and add the doubled one so we can do our equality test.

 			resp2.ActualPolicies.Add(AuthenticationPolicies.PhishingResistant);

diff --git a/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs b/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs
index 93738f5..2e7a07e 100644
--- a/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs
+++ b/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs
@@ -23,7 +23,7 @@ public partial class ProviderEndpoint : System.Web.UI.Page {
 

 	void respondToExtensions(DotNetOpenId.Provider.IRequest request, TestSupport.Scenarios scenario) {

 		var sregRequest = request.GetExtension<ClaimsRequest>();

-		var sregResponse = new ClaimsResponse();

+		var sregResponse = sregRequest != null ? sregRequest.CreateResponse() : null;

 		var aeFetchRequest = request.GetExtension<FetchRequest>();

 		var aeFetchResponse = new FetchResponse();

 		var aeStoreRequest = request.GetExtension<StoreRequest>();

diff --git a/src/DotNetOpenId/ExtensionArgumentsManager.cs b/src/DotNetOpenId/ExtensionArgumentsManager.cs
index 9bcdb73..23f18a7 100644
--- a/src/DotNetOpenId/ExtensionArgumentsManager.cs
+++ b/src/DotNetOpenId/ExtensionArgumentsManager.cs
@@ -113,6 +113,10 @@ namespace DotNetOpenId {
 			}

 		}

 

+		/// <summary>

+		/// Gets the fields carried by a given OpenId extension.

+		/// </summary>

+		/// <returns>The fields included in the given extension, or null if the extension is not present.</returns>

 		public IDictionary<string, string> GetExtensionArguments(string extensionTypeUri) {

 			if (!isReadMode) throw new InvalidOperationException();

 			if (string.IsNullOrEmpty(extensionTypeUri)) throw new ArgumentNullException("extensionTypeUri");

diff --git a/src/DotNetOpenId/Extensions/AttributeExchange/FetchRequest.cs b/src/DotNetOpenId/Extensions/AttributeExchange/FetchRequest.cs
index b429643..10996e0 100644
--- a/src/DotNetOpenId/Extensions/AttributeExchange/FetchRequest.cs
+++ b/src/DotNetOpenId/Extensions/AttributeExchange/FetchRequest.cs
@@ -53,6 +53,9 @@ namespace DotNetOpenId.Extensions.AttributeExchange {
 

 		#region IExtensionRequest Members

 		string IExtension.TypeUri { get { return Constants.TypeUri; } }

+		IEnumerable<string> IExtension.AdditionalSupportedTypeUris {

+			get { return new string[0]; }

+		}

 

 		IDictionary<string, string> IExtensionRequest.Serialize(RelyingParty.IAuthenticationRequest authenticationRequest) {

 			var fields = new Dictionary<string, string> {

@@ -84,7 +87,7 @@ namespace DotNetOpenId.Extensions.AttributeExchange {
 			return fields;

 		}

 

-		bool IExtensionRequest.Deserialize(IDictionary<string, string> fields, DotNetOpenId.Provider.IRequest request) {

+		bool IExtensionRequest.Deserialize(IDictionary<string, string> fields, DotNetOpenId.Provider.IRequest request, string typeUri) {

 			if (fields == null) return false;

 			string mode;

 			fields.TryGetValue("mode", out mode);

@@ -112,11 +115,11 @@ namespace DotNetOpenId.Extensions.AttributeExchange {
 			}

 			AliasManager aliasManager = new AliasManager();

 			foreach (var alias in allAliases) {

-				string typeUri;

-				if (fields.TryGetValue("type." + alias, out typeUri)) {

-					aliasManager.SetAlias(alias, typeUri);

+				string attributeTypeUri;

+				if (fields.TryGetValue("type." + alias, out attributeTypeUri)) {

+					aliasManager.SetAlias(alias, attributeTypeUri);

 					AttributeRequest att = new AttributeRequest {

-						TypeUri = typeUri,

+						TypeUri = attributeTypeUri,

 						IsRequired = requiredAliases.Contains(alias),

 					};

 					string countString;

diff --git a/src/DotNetOpenId/Extensions/AttributeExchange/FetchResponse.cs b/src/DotNetOpenId/Extensions/AttributeExchange/FetchResponse.cs
index e31a8f1..d321a30 100644
--- a/src/DotNetOpenId/Extensions/AttributeExchange/FetchResponse.cs
+++ b/src/DotNetOpenId/Extensions/AttributeExchange/FetchResponse.cs
@@ -55,6 +55,9 @@ namespace DotNetOpenId.Extensions.AttributeExchange {
 

 		#region IExtensionResponse Members

 		string IExtension.TypeUri { get { return Constants.TypeUri; } }

+		IEnumerable<string> IExtension.AdditionalSupportedTypeUris {

+			get { return new string[0]; }

+		}

 

 		IDictionary<string, string> IExtensionResponse.Serialize(Provider.IRequest authenticationRequest) {

 			var fields = new Dictionary<string, string> {

@@ -87,7 +90,7 @@ namespace DotNetOpenId.Extensions.AttributeExchange {
 			}

 		}

 

-		bool IExtensionResponse.Deserialize(IDictionary<string, string> fields, IAuthenticationResponse response) {

+		bool IExtensionResponse.Deserialize(IDictionary<string, string> fields, IAuthenticationResponse response, string typeUri) {

 			if (fields == null) return false;

 			string mode;

 			fields.TryGetValue("mode", out mode);

diff --git a/src/DotNetOpenId/Extensions/AttributeExchange/StoreRequest.cs b/src/DotNetOpenId/Extensions/AttributeExchange/StoreRequest.cs
index a7e2199..5f6e071 100644
--- a/src/DotNetOpenId/Extensions/AttributeExchange/StoreRequest.cs
+++ b/src/DotNetOpenId/Extensions/AttributeExchange/StoreRequest.cs
@@ -46,6 +46,9 @@ namespace DotNetOpenId.Extensions.AttributeExchange {
 

 		#region IExtensionRequest Members

 		string IExtension.TypeUri { get { return Constants.TypeUri; } }

+		IEnumerable<string> IExtension.AdditionalSupportedTypeUris {

+			get { return new string[0]; }

+		}

 

 		IDictionary<string, string> IExtensionRequest.Serialize(RelyingParty.IAuthenticationRequest authenticationRequest) {

 			var fields = new Dictionary<string, string> {

@@ -57,7 +60,7 @@ namespace DotNetOpenId.Extensions.AttributeExchange {
 			return fields;

 		}

 

-		bool IExtensionRequest.Deserialize(IDictionary<string, string> fields, DotNetOpenId.Provider.IRequest request) {

+		bool IExtensionRequest.Deserialize(IDictionary<string, string> fields, DotNetOpenId.Provider.IRequest request, string typeUri) {

 			if (fields == null) return false;

 			string mode;

 			fields.TryGetValue("mode", out mode);

diff --git a/src/DotNetOpenId/Extensions/AttributeExchange/StoreResponse.cs b/src/DotNetOpenId/Extensions/AttributeExchange/StoreResponse.cs
index a4e9cf1..acc0d6b 100644
--- a/src/DotNetOpenId/Extensions/AttributeExchange/StoreResponse.cs
+++ b/src/DotNetOpenId/Extensions/AttributeExchange/StoreResponse.cs
@@ -24,6 +24,9 @@ namespace DotNetOpenId.Extensions.AttributeExchange {
 

 		#region IExtensionResponse Members

 		string IExtension.TypeUri { get { return Constants.TypeUri; } }

+		IEnumerable<string> IExtension.AdditionalSupportedTypeUris {

+			get { return new string[0]; }

+		}

 

 		IDictionary<string, string> IExtensionResponse.Serialize(Provider.IRequest authenticationRequest) {

 			var fields = new Dictionary<string, string> {

@@ -35,7 +38,7 @@ namespace DotNetOpenId.Extensions.AttributeExchange {
 			return fields;

 		}

 

-		bool IExtensionResponse.Deserialize(IDictionary<string, string> fields, IAuthenticationResponse response) {

+		bool IExtensionResponse.Deserialize(IDictionary<string, string> fields, IAuthenticationResponse response, string typeUri) {

 			if (fields == null) return false;

 			string mode;

 			if (!fields.TryGetValue("mode", out mode)) return false;

diff --git a/src/DotNetOpenId/Extensions/IExtension.cs b/src/DotNetOpenId/Extensions/IExtension.cs
index 2450a8a..efdebd4 100644
--- a/src/DotNetOpenId/Extensions/IExtension.cs
+++ b/src/DotNetOpenId/Extensions/IExtension.cs
@@ -11,6 +11,17 @@ namespace DotNetOpenId.Extensions {
 		/// Gets the TypeURI the extension uses in the OpenID protocol and in XRDS advertisements.

 		/// </summary>

 		string TypeUri { get; }

+		/// <summary>

+		/// Additional TypeURIs that are supported by this extension, in preferred order.

+		/// May be empty if none other than <see cref="TypeUri"/> is supported, but

+		/// should not be null.

+		/// </summary>

+		/// <remarks>

+		/// Useful for reading in messages with an older version of an extension.

+		/// The value in the <see cref="TypeUri"/> property is always checked before

+		/// trying this list.

+		/// </remarks>

+		IEnumerable<string> AdditionalSupportedTypeUris { get; }

 	}

 

 	/// <summary>

@@ -26,8 +37,14 @@ namespace DotNetOpenId.Extensions {
 		/// <summary>

 		/// Reads the extension information on an authentication request to the provider.

 		/// </summary>

-		/// <returns>True if the extension found any of its parameters in the request, false otherwise.</returns>

-		bool Deserialize(IDictionary<string, string> fields, Provider.IRequest request);

+		/// <param name="fields">The fields belonging to the extension.</param>

+		/// <param name="request">The incoming OpenID request carrying the extension.</param>

+		/// <param name="typeUri">The actual extension TypeUri that was recognized in the message.</param>

+		/// <returns>

+		/// True if the extension found a valid set of recognized parameters in the request, 

+		/// false otherwise.

+		/// </returns>

+		bool Deserialize(IDictionary<string, string> fields, Provider.IRequest request, string typeUri);

 	}

 

 	/// <summary>

@@ -43,7 +60,13 @@ namespace DotNetOpenId.Extensions {
 		/// <summary>

 		/// Reads a Provider's response for extension values.

 		/// </summary>

-		/// <returns>True if the extension found any of its parameters in the response.</returns>

-		bool Deserialize(IDictionary<string, string> fields, RelyingParty.IAuthenticationResponse response);

+		/// <param name="fields">The fields belonging to the extension.</param>

+		/// <param name="response">The incoming OpenID response carrying the extension.</param>

+		/// <param name="typeUri">The actual extension TypeUri that was recognized in the message.</param>

+		/// <returns>

+		/// True if the extension found a valid set of recognized parameters in the response, 

+		/// false otherwise.

+		/// </returns>

+		bool Deserialize(IDictionary<string, string> fields, RelyingParty.IAuthenticationResponse response, string typeUri);

 	}

 }

diff --git a/src/DotNetOpenId/Extensions/ProviderAuthenticationPolicy/PolicyRequest.cs b/src/DotNetOpenId/Extensions/ProviderAuthenticationPolicy/PolicyRequest.cs
index 6493db1..5fff170 100644
--- a/src/DotNetOpenId/Extensions/ProviderAuthenticationPolicy/PolicyRequest.cs
+++ b/src/DotNetOpenId/Extensions/ProviderAuthenticationPolicy/PolicyRequest.cs
@@ -69,7 +69,7 @@ namespace DotNetOpenId.Extensions.ProviderAuthenticationPolicy {
 			return fields;

 		}

 

-		bool IExtensionRequest.Deserialize(IDictionary<string, string> fields, DotNetOpenId.Provider.IRequest request) {

+		bool IExtensionRequest.Deserialize(IDictionary<string, string> fields, DotNetOpenId.Provider.IRequest request, string typeUri) {

 			if (fields == null) return false;

 			if (!fields.ContainsKey(Constants.RequestParameters.PreferredAuthPolicies)) return false;

 

@@ -95,6 +95,10 @@ namespace DotNetOpenId.Extensions.ProviderAuthenticationPolicy {
 			get { return Constants.TypeUri; }

 		}

 

+		IEnumerable<string> IExtension.AdditionalSupportedTypeUris {

+			get { return new string[0]; }

+		}

+

 		#endregion

 

 		static internal string SerializePolicies(IList<string> policies) {

diff --git a/src/DotNetOpenId/Extensions/ProviderAuthenticationPolicy/PolicyResponse.cs b/src/DotNetOpenId/Extensions/ProviderAuthenticationPolicy/PolicyResponse.cs
index a30c873..a8b093f 100644
--- a/src/DotNetOpenId/Extensions/ProviderAuthenticationPolicy/PolicyResponse.cs
+++ b/src/DotNetOpenId/Extensions/ProviderAuthenticationPolicy/PolicyResponse.cs
@@ -92,7 +92,7 @@ namespace DotNetOpenId.Extensions.ProviderAuthenticationPolicy {
 			return fields;

 		}

 

-		bool IExtensionResponse.Deserialize(IDictionary<string, string> fields, DotNetOpenId.RelyingParty.IAuthenticationResponse response) {

+		bool IExtensionResponse.Deserialize(IDictionary<string, string> fields, DotNetOpenId.RelyingParty.IAuthenticationResponse response, string typeUri) {

 			if (fields == null) return false;

 			if (!fields.ContainsKey(Constants.ResponseParameters.AuthPolicies)) return false;

 

@@ -141,6 +141,10 @@ namespace DotNetOpenId.Extensions.ProviderAuthenticationPolicy {
 			get { return Constants.TypeUri; }

 		}

 

+		IEnumerable<string> IExtension.AdditionalSupportedTypeUris {

+			get { return new string[0]; }

+		}

+

 		#endregion

 	}

 }

diff --git a/src/DotNetOpenId/Extensions/SimpleRegistration/ClaimsRequest.cs b/src/DotNetOpenId/Extensions/SimpleRegistration/ClaimsRequest.cs
index b8a8597..90804bd 100644
--- a/src/DotNetOpenId/Extensions/SimpleRegistration/ClaimsRequest.cs
+++ b/src/DotNetOpenId/Extensions/SimpleRegistration/ClaimsRequest.cs
@@ -128,9 +128,18 @@ namespace DotNetOpenId.Extensions.SimpleRegistration {
 

 		#region IExtensionRequest Members

 		string IExtension.TypeUri { get { return Constants.sreg_ns; } }

+		static readonly string[] additionalTypeUris = new string[] {

+			Constants.sreg_ns10,

+			Constants.sreg_ns11other,

+		};

+		IEnumerable<string> IExtension.AdditionalSupportedTypeUris {

+			get { return additionalTypeUris; }

+		}

 

-		bool IExtensionRequest.Deserialize(IDictionary<string, string> args, IRequest request) {

+		bool IExtensionRequest.Deserialize(IDictionary<string, string> args, IRequest request, string typeUri) {

 			if (args == null) return false;

+			Debug.Assert(!string.IsNullOrEmpty(typeUri));

+			typeUriDeserializedFrom = typeUri;

 

 			string policyUrl;

 			if (args.TryGetValue(Constants.policy_url, out policyUrl)

@@ -168,6 +177,16 @@ namespace DotNetOpenId.Extensions.SimpleRegistration {
 		}

 		#endregion

 

+		string typeUriDeserializedFrom;

+		/// <summary>

+		/// Prepares a Simple Registration response extension that is compatible with the

+		/// version of Simple Registration used in the request message.

+		/// </summary>

+		/// <returns></returns>

+		public ClaimsResponse CreateResponse() {

+			return new ClaimsResponse(typeUriDeserializedFrom);

+		}

+

 		/// <summary>

 		/// Renders the requested information as a string.

 		/// </summary>

diff --git a/src/DotNetOpenId/Extensions/SimpleRegistration/ClaimsResponse.cs b/src/DotNetOpenId/Extensions/SimpleRegistration/ClaimsResponse.cs
index cd9d1ed..0203bce 100644
--- a/src/DotNetOpenId/Extensions/SimpleRegistration/ClaimsResponse.cs
+++ b/src/DotNetOpenId/Extensions/SimpleRegistration/ClaimsResponse.cs
@@ -24,6 +24,20 @@ namespace DotNetOpenId.Extensions.SimpleRegistration
 	[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2218:OverrideGetHashCodeOnOverridingEquals"), Serializable()]

 	public sealed class ClaimsResponse : IExtensionResponse

 	{

+		string typeUriToUse;

+

+		/// <summary>

+		/// Creates an instance of the <see cref="ClaimsResponse"/> class.

+		/// </summary>

+		[Obsolete("Use ClaimsRequest.CreateResponse() instead.")]

+		public ClaimsResponse() : this(Constants.sreg_ns) {

+		}

+

+		internal ClaimsResponse(string typeUriToUse) {

+			if (string.IsNullOrEmpty(typeUriToUse)) throw new ArgumentNullException("typeUriToUse");

+			this.typeUriToUse = typeUriToUse;

+		}

+

 		/// <summary>

 		/// The nickname the user goes by.

 		/// </summary>

@@ -104,7 +118,10 @@ namespace DotNetOpenId.Extensions.SimpleRegistration
 		public string TimeZone { get; set; }

 

 		#region IExtensionResponse Members

-		string IExtension.TypeUri { get { return Constants.sreg_ns; } }

+		string IExtension.TypeUri { get { return typeUriToUse; } }

+		IEnumerable<string> IExtension.AdditionalSupportedTypeUris {

+			get { return new string[0]; }

+		}

 

 		/// <summary>

 		/// Adds the values of this struct to an authentication response being prepared

@@ -148,7 +165,7 @@ namespace DotNetOpenId.Extensions.SimpleRegistration
 			return fields;

 		}

 

-		bool IExtensionResponse.Deserialize(IDictionary<string, string> sreg, IAuthenticationResponse response) {

+		bool IExtensionResponse.Deserialize(IDictionary<string, string> sreg, IAuthenticationResponse response, string typeUri) {

 			if (sreg == null) return false;

 			string nickname, email, fullName, dob, genderString, postalCode, country, language, timeZone;

 			BirthDate = null;

diff --git a/src/DotNetOpenId/Extensions/SimpleRegistration/Constants.cs b/src/DotNetOpenId/Extensions/SimpleRegistration/Constants.cs
index a6456fb..8aa9591 100644
--- a/src/DotNetOpenId/Extensions/SimpleRegistration/Constants.cs
+++ b/src/DotNetOpenId/Extensions/SimpleRegistration/Constants.cs
@@ -8,6 +8,8 @@ namespace DotNetOpenId.Extensions.SimpleRegistration {
 	/// </summary>

 	internal static class Constants {

 		internal const string sreg_ns = "http://openid.net/extensions/sreg/1.1";

+		internal const string sreg_ns10 = "http://openid.net/sreg/1.0";

+		internal const string sreg_ns11other = "http://openid.net/sreg/1.1";

 		internal const string sreg_compatibility_alias = "sreg";

 		internal const string policy_url = "policy_url";

 		internal const string optional = "optional";

diff --git a/src/DotNetOpenId/Provider/Request.cs b/src/DotNetOpenId/Provider/Request.cs
index 9257e99..7813a2b 100644
--- a/src/DotNetOpenId/Provider/Request.cs
+++ b/src/DotNetOpenId/Provider/Request.cs
@@ -123,9 +123,36 @@ namespace DotNetOpenId.Provider
 			OutgoingExtensions.AddExtensionArguments(extension.TypeUri, extension.Serialize(this));

 		}

 

+		/// <summary>

+		/// Attempts to load an extension from an OpenId message.

+		/// </summary>

+		/// <param name="extension">The extension to attempt to load.</param>

+		/// <returns>

+		/// True if the extension was found in the message and successfully loaded.

+		/// False otherwise.

+		/// </returns>

+		bool getExtension(DotNetOpenId.Extensions.IExtensionRequest extension) {

+			var fields = IncomingExtensions.GetExtensionArguments(extension.TypeUri);

+			if (fields != null) {

+				// The extension was found using the preferred TypeUri.

+				return extension.Deserialize(fields, this, extension.TypeUri);

+			} else {

+				// The extension may still be found using secondary TypeUris.

+				if (extension.AdditionalSupportedTypeUris != null) {

+					foreach (string typeUri in extension.AdditionalSupportedTypeUris) {

+						fields = IncomingExtensions.GetExtensionArguments(typeUri);

+						if (fields != null) {

+							// We found one of the older ones.

+							return extension.Deserialize(fields, this, typeUri);

+						}

+					}

+				}

+			}

+			return false;

+		}

 		public T GetExtension<T>() where T : DotNetOpenId.Extensions.IExtensionRequest, new() {

 			T extension = new T();

-			return extension.Deserialize(IncomingExtensions.GetExtensionArguments(extension.TypeUri), this) ? extension : default(T);

+			return getExtension(extension) ? (T)extension : default(T);

 		}

 

 		public DotNetOpenId.Extensions.IExtensionRequest GetExtension(Type extensionType) {

@@ -135,7 +162,7 @@ namespace DotNetOpenId.Provider
 					Strings.TypeMustImplementX, typeof(DotNetOpenId.Extensions.IExtensionRequest).FullName),

 					"extensionType");

 			var extension = (DotNetOpenId.Extensions.IExtensionRequest)Activator.CreateInstance(extensionType);

-			return extension.Deserialize(IncomingExtensions.GetExtensionArguments(extension.TypeUri), this) ? extension : null;

+			return getExtension(extension) ? extension : null;

 		}

 

 		public override string ToString() {

diff --git a/src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs b/src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs
index 127e90c..93cf3a1 100644
--- a/src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs
+++ b/src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs
@@ -86,6 +86,26 @@ namespace DotNetOpenId.RelyingParty {
 			get { return new Uri(Util.GetRequiredArg(signedArguments, Provider.Protocol.openid.return_to)); }

 		}

 

+		bool getExtension(IExtensionResponse extension) {

+			var fields = IncomingExtensions.GetExtensionArguments(extension.TypeUri);

+			if (fields != null) {

+				// The extension was found using the preferred TypeUri.

+				return extension.Deserialize(fields, this, extension.TypeUri);

+			} else {

+				// The extension may still be found using secondary TypeUris.

+				if (extension.AdditionalSupportedTypeUris != null) {

+					foreach (string typeUri in extension.AdditionalSupportedTypeUris) {

+						fields = IncomingExtensions.GetExtensionArguments(typeUri);

+						if (fields != null) {

+							// We found one of the older ones.

+							return extension.Deserialize(fields, this, typeUri);

+						}

+					}

+				}

+			}

+			return false;

+		}

+

 		/// <summary>

 		/// Tries to get an OpenID extension that may be present in the response.

 		/// </summary>

@@ -93,7 +113,7 @@ namespace DotNetOpenId.RelyingParty {
 		/// <returns>The extension, if it is found.  Null otherwise.</returns>

 		public T GetExtension<T>() where T : IExtensionResponse, new() {

 			T extension = new T();

-			return extension.Deserialize(IncomingExtensions.GetExtensionArguments(extension.TypeUri), this) ? extension : default(T);

+			return getExtension(extension) ? extension : default(T);

 		}

 

 		public IExtensionResponse GetExtension(Type extensionType) {

@@ -103,7 +123,7 @@ namespace DotNetOpenId.RelyingParty {
 					Strings.TypeMustImplementX, typeof(IExtensionResponse).FullName),

 					"extensionType");

 			var extension = (IExtensionResponse)Activator.CreateInstance(extensionType);

-			return extension.Deserialize(IncomingExtensions.GetExtensionArguments(extension.TypeUri), this) ? extension : null;

+			return getExtension(extension) ? extension : null;

 		}

 

 		internal static AuthenticationResponse Parse(IDictionary<string, string> query,