Merge remote-tracking branch 'origin/v4.1' into v4.1

5 files changed, 24 insertions, 1 deletions

diff --git a/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj b/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj
index 9f810bb..8c7fd08 100644
--- a/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj
+++ b/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj
@@ -63,6 +63,10 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Net.Http, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\net-v4.0\System.Net.Http.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
diff --git a/samples/OpenIdProviderMvc/Controllers/OpenIdController.cs b/samples/OpenIdProviderMvc/Controllers/OpenIdController.cs
index bd6de1b..6abbe17 100644
--- a/samples/OpenIdProviderMvc/Controllers/OpenIdController.cs
+++ b/samples/OpenIdProviderMvc/Controllers/OpenIdController.cs
@@ -267,7 +267,12 @@ namespace OpenIdProviderMvc.Controllers {
 			}
 
 			Uri userLocalIdentifier = Models.User.GetClaimedIdentifierForUser(User.Identity.Name);
-			return authReq.LocalIdentifier == userLocalIdentifier ||
+
+			// Assuming the URLs on the web server are not case sensitive (on Windows servers they almost never are),
+			// and usernames aren't either, compare the identifiers without case sensitivity.
+			// No reason to do this for the PPID identifiers though, since they *can* be case sensitive and are highly
+			// unlikely to be typed in by the user anyway.
+			return string.Equals(authReq.LocalIdentifier.ToString(), userLocalIdentifier.ToString(), StringComparison.OrdinalIgnoreCase) ||
 				authReq.LocalIdentifier == PpidGeneration.PpidIdentifierProvider.GetIdentifier(userLocalIdentifier, authReq.Realm);
 		}
 	}
diff --git a/samples/OpenIdProviderMvc/OpenIdProviderMvc.csproj b/samples/OpenIdProviderMvc/OpenIdProviderMvc.csproj
index d6e71f0..e5c2986 100644
--- a/samples/OpenIdProviderMvc/OpenIdProviderMvc.csproj
+++ b/samples/OpenIdProviderMvc/OpenIdProviderMvc.csproj
@@ -83,6 +83,7 @@
     <Compile Include="Controllers\UserController.cs" />
     <Compile Include="Default.aspx.cs">
       <DependentUpon>Default.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
diff --git a/samples/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj b/samples/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj
index 7e3c564..49b6ccc 100644
--- a/samples/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj
+++ b/samples/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj
@@ -76,6 +76,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Views\Shared\Site.Master.cs">
       <DependentUpon>Site.Master</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Views\Shared\Site.Master.designer.cs">
       <DependentUpon>Site.Master</DependentUpon>
diff --git a/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj
index e8fc030..4f1e0ec 100644
--- a/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj
+++ b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj
@@ -104,6 +104,7 @@
     </Compile>
     <Compile Include="ajaxlogin.aspx.cs">
       <DependentUpon>ajaxlogin.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ajaxlogin.aspx.designer.cs">
       <DependentUpon>ajaxlogin.aspx</DependentUpon>
@@ -111,6 +112,7 @@
     <Compile Include="Code\CustomStore.cs" />
     <Compile Include="Code\CustomStoreDataSet.cs">
       <DependentUpon>CustomStoreDataSet.xsd</DependentUpon>
+      <SubType>Component</SubType>
     </Compile>
     <Compile Include="Code\CustomStoreDataSet.Designer.cs">
       <DependentUpon>CustomStoreDataSet.cs</DependentUpon>
@@ -124,18 +126,21 @@
     <Compile Include="Code\TracePageAppender.cs" />
     <Compile Include="DetectGoogleSession.aspx.cs">
       <DependentUpon>DetectGoogleSession.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="DetectGoogleSession.aspx.designer.cs">
       <DependentUpon>DetectGoogleSession.aspx</DependentUpon>
     </Compile>
     <Compile Include="loginGoogleApps.aspx.cs">
       <DependentUpon>loginGoogleApps.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="loginGoogleApps.aspx.designer.cs">
       <DependentUpon>loginGoogleApps.aspx</DependentUpon>
     </Compile>
     <Compile Include="loginPlusOAuthSampleOP.aspx.cs">
       <DependentUpon>loginPlusOAuthSampleOP.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="loginPlusOAuthSampleOP.aspx.designer.cs">
       <DependentUpon>loginPlusOAuthSampleOP.aspx</DependentUpon>
@@ -145,36 +150,42 @@
     </Compile>
     <Compile Include="login.aspx.cs">
       <DependentUpon>login.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="login.aspx.designer.cs">
       <DependentUpon>login.aspx</DependentUpon>
     </Compile>
     <Compile Include="loginPlusOAuth.aspx.cs">
       <DependentUpon>loginPlusOAuth.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="loginPlusOAuth.aspx.designer.cs">
       <DependentUpon>loginPlusOAuth.aspx</DependentUpon>
     </Compile>
     <Compile Include="loginProgrammatic.aspx.cs">
       <DependentUpon>loginProgrammatic.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="loginProgrammatic.aspx.designer.cs">
       <DependentUpon>loginProgrammatic.aspx</DependentUpon>
     </Compile>
     <Compile Include="MembersOnly\DisplayGoogleContacts.aspx.cs">
       <DependentUpon>DisplayGoogleContacts.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="MembersOnly\DisplayGoogleContacts.aspx.designer.cs">
       <DependentUpon>DisplayGoogleContacts.aspx</DependentUpon>
     </Compile>
     <Compile Include="MembersOnly\ProfileFieldsDisplay.ascx.cs">
       <DependentUpon>ProfileFieldsDisplay.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="MembersOnly\ProfileFieldsDisplay.ascx.designer.cs">
       <DependentUpon>ProfileFieldsDisplay.ascx</DependentUpon>
     </Compile>
     <Compile Include="NoIdentityOpenId.aspx.cs">
       <DependentUpon>NoIdentityOpenId.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="NoIdentityOpenId.aspx.designer.cs">
       <DependentUpon>NoIdentityOpenId.aspx</DependentUpon>
@@ -182,6 +193,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TracePage.aspx.cs">
       <DependentUpon>TracePage.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="TracePage.aspx.designer.cs">
       <DependentUpon>TracePage.aspx</DependentUpon>