BREAKING CHANGE for SimpleRegistration extension, and other stuff.

* SimpleRegistration changed from struct to class.
* SimpleRegistrationFieldValues.None and SimpleRegistrationRequestFields.None removed.
* Semantic for extension classes that ReadFromRequest or ReadFromResponse and don't find any matching parameters changed from returning an empty struct to returning null.
* Added framework for testing extensions.
* Upgraded TestWeb project to .NET 3.5.
* Built up bare framework for sending/receiving Attribute Exchange extension messages.

2 files changed, 112 insertions, 4 deletions

diff --git a/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs b/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs
index 5743628..10cb735 100644
--- a/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs
+++ b/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs
@@ -9,13 +9,40 @@ using System.Web.UI.HtmlControls;
 using System.Web.UI.WebControls;

 using System.Web.UI.WebControls.WebParts;

 using System.Collections.Specialized;

+using DotNetOpenId.Extensions;

 

 public partial class ProviderEndpoint : System.Web.UI.Page {

 	protected void Page_Load(object sender, EventArgs e) {

 

 	}

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

+		var sregRequest = SimpleRegistrationRequestFields.ReadFromRequest(request);

+		var sregResponse = new SimpleRegistrationFieldValues();

+		var aeFetchRequest = AttributeExchangeFetchRequest.ReadFromRequest(request);

+		var aeFetchResponse = new AttributeExchangeFetchResponse();

+		var aeStoreRequest = AttributeExchangeStoreRequest.ReadFromRequest(request);

+		var aeStoreResponse = new AttributeExchangeStoreResponse();

+		switch (scenario) {

+			case TestSupport.Scenarios.ExtensionFullCooperation:

+				if (sregRequest.FullName != SimpleRegistrationRequest.NoRequest)

+					sregResponse.FullName = "Andrew Arnott";

+				if (sregRequest.Email != SimpleRegistrationRequest.NoRequest)

+					sregResponse.Email = "andrewarnott@gmail.com";

+				break;

+			case TestSupport.Scenarios.ExtensionPartialCooperation:

+				if (sregRequest.FullName == SimpleRegistrationRequest.Require)

+					sregResponse.FullName = "Andrew Arnott";

+				if (sregRequest.Email == SimpleRegistrationRequest.Require)

+					sregResponse.Email = "andrewarnott@gmail.com";

+				break;

+		}

+		sregResponse.AddToResponse(request);

+		if (aeFetchRequest != null) aeFetchResponse.AddToResponse(request);

+		if (aeStoreRequest != null) aeStoreResponse.AddToResponse(request);

+	}

+

 	protected void ProviderEndpoint1_AuthenticationChallenge(object sender, DotNetOpenId.Provider.AuthenticationChallengeEventArgs e) {

-		TestSupport.Scenarios scenario = (TestSupport.Scenarios)Enum.Parse(typeof(TestSupport.Scenarios), 

+		TestSupport.Scenarios scenario = (TestSupport.Scenarios)Enum.Parse(typeof(TestSupport.Scenarios),

 			new Uri(e.Request.LocalIdentifier.ToString()).AbsolutePath.TrimStart('/'));

 		switch (scenario) {

 			case TestSupport.Scenarios.AutoApproval:

@@ -28,6 +55,11 @@ public partial class ProviderEndpoint : System.Web.UI.Page {
 			case TestSupport.Scenarios.AlwaysDeny:

 				e.Request.IsAuthenticated = false;

 				break;

+			case TestSupport.Scenarios.ExtensionFullCooperation:

+			case TestSupport.Scenarios.ExtensionPartialCooperation:

+				respondToExtensions(e.Request, scenario);

+				e.Request.IsAuthenticated = true;

+				break;

 			default:

 				throw new InvalidOperationException("Unrecognized scenario");

 		}

diff --git a/src/DotNetOpenId.TestWeb/web.config b/src/DotNetOpenId.TestWeb/web.config
index 47684a1..c6d7cdd 100644
--- a/src/DotNetOpenId.TestWeb/web.config
+++ b/src/DotNetOpenId.TestWeb/web.config
@@ -1,8 +1,84 @@
 <?xml version="1.0"?>

 <configuration>

+	<configSections>

+		<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">

+			<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">

+				<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>

+				<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">

+					<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>

+					<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>

+					<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>

+					<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>

+				</sectionGroup>

+			</sectionGroup>

+		</sectionGroup>

+	</configSections>

 	<system.web>

-		<compilation debug="true"/>

-		<authentication mode="Windows" />

-		<customErrors mode="Off" />

+		<compilation debug="true">

+			<assemblies>

+				<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>

+				<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+				<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>

+				<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>

+			</assemblies>

+		</compilation>

+		<authentication mode="Windows"/>

+		<customErrors mode="Off"/>

+		<pages>

+			<controls>

+				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+				<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+			</controls>

+		</pages>

+		<httpHandlers>

+			<remove verb="*" path="*.asmx"/>

+			<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+			<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+			<add verb="GET,HEAD" path="ScriptResource.axd" validate="false" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+		</httpHandlers>

+		<httpModules>

+			<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+		</httpModules>

 	</system.web>

+	<system.codedom>

+		<compilers>

+			<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">

+				<providerOption name="CompilerVersion" value="v3.5"/>

+				<providerOption name="WarnAsError" value="false"/>

+			</compiler>

+			<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">

+				<providerOption name="CompilerVersion" value="v3.5"/>

+				<providerOption name="OptionInfer" value="true"/>

+				<providerOption name="WarnAsError" value="false"/>

+			</compiler>

+		</compilers>

+	</system.codedom>

+	<system.webServer>

+		<validation validateIntegratedModeConfiguration="false"/>

+		<modules>

+			<remove name="ScriptModule"/>

+			<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+		</modules>

+		<handlers>

+			<remove name="WebServiceHandlerFactory-Integrated"/>

+			<remove name="ScriptHandlerFactory"/>

+			<remove name="ScriptHandlerFactoryAppServices"/>

+			<remove name="ScriptResource"/>

+			<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+			<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+			<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+		</handlers>

+	</system.webServer>

+	<runtime>

+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

+			<dependentAssembly>

+				<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>

+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>

+			</dependentAssembly>

+			<dependentAssembly>

+				<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>

+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>

+			</dependentAssembly>

+		</assemblyBinding>

+	</runtime>

 </configuration>