1 files changed, 29 insertions, 11 deletions
diff --git a/src/DotNetOpenId/Extensions/AttributeExchangeFetchRequest.cs b/src/DotNetOpenId/Extensions/AttributeExchangeFetchRequest.cs
index ad27769..245f19a 100644
--- a/src/DotNetOpenId/Extensions/AttributeExchangeFetchRequest.cs
+++ b/src/DotNetOpenId/Extensions/AttributeExchangeFetchRequest.cs
@@ -1,27 +1,45 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using DotNetOpenId.RelyingParty;
+using System.Globalization;
 
 namespace DotNetOpenId.Extensions {
 	/// <summary>
 	/// The Attribute Exchange Fetch message, request leg.
 	/// </summary>
-	public struct AttributeExchangeFetchRequest {
-		/// <summary>
-		/// Adds the properties of this Attribute Exchange request to an outgoing
-		/// OpenID authentication request.
-		/// </summary>
-		public void AddToRequest(Provider.IAuthenticationRequest authenticationRequest) {
-			throw new NotImplementedException();
-		}
+	public class AttributeExchangeFetchRequest : IExtensionRequest {
+		readonly string Mode = "fetch_request";
+
 		/// <summary>
 		/// Reads an incoming authentication request (from a relying party)
 		/// for Attribute Exchange properties and returns an instance of this 
 		/// struct with them.
 		/// </summary>
-		public static AttributeExchangeFetchRequest ReadFromRequest(IAuthenticationResponse response) {
-			throw new NotImplementedException();
+		public static AttributeExchangeFetchRequest ReadFromRequest(Provider.IRequest request) {
+			var obj = new AttributeExchangeFetchRequest();
+			return ((IExtensionRequest)obj).ReadFromRequest(request) ? obj : null;
 		}
+
+		#region IExtensionRequest Members
+		string IExtensionRequest.TypeUri { get { return Constants.ae.ns; } }
+
+		public void AddToRequest(RelyingParty.IAuthenticationRequest authenticationRequest) {
+			var fields = new Dictionary<string, string> {
+				{ "mode", Mode },
+			};
+			authenticationRequest.AddExtensionArguments(Constants.ae.ns, fields);
+		}
+
+		bool IExtensionRequest.ReadFromRequest(DotNetOpenId.Provider.IRequest request) {
+			var fields = request.GetExtensionArguments(Constants.ae.ns);
+			if (fields == null) return false;
+			string mode;
+			fields.TryGetValue("mode", out mode);
+			if (mode != Mode) return false;
+
+			return true;
+		}
+
+		#endregion
 	}
 }