Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

1 files changed, 39 insertions, 3 deletions

diff --git a/src/DotNetOpenId/Provider/Request.cs b/src/DotNetOpenId/Provider/Request.cs
index 9257e99..eb3edaf 100644
--- a/src/DotNetOpenId/Provider/Request.cs
+++ b/src/DotNetOpenId/Provider/Request.cs
@@ -84,10 +84,19 @@ namespace DotNetOpenId.Provider
 		}

 

 		/// <summary>

+		/// Gets the version of OpenID being used by the relying party that sent the request.

+		/// </summary>

+		public ProtocolVersion RelyingPartyVersion {

+			get {

+				return Protocol.Lookup(Protocol.Version).ProtocolVersion;

+			}

+		}

+

+		/// <summary>

 		/// Indicates whether this request has all the information necessary to formulate a response.

 		/// </summary>

 		public abstract bool IsResponseReady { get; }

-		internal abstract IEncodable CreateResponse();

+		protected abstract IEncodable CreateResponse();

 		/// <summary>

 		/// Called whenever a property changes that would cause the response to need to be

 		/// regenerated if it had already been generated.

@@ -123,9 +132,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 +171,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() {