Merge branch 'stylecopUpgrade'

5 files changed, 78 insertions, 66 deletions

diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/DotNetOpenAuth.OpenId.RelyingParty.csproj b/src/DotNetOpenAuth.OpenId.RelyingParty/DotNetOpenAuth.OpenId.RelyingParty.csproj
index 6fa3076..c2dd18b 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/DotNetOpenAuth.OpenId.RelyingParty.csproj
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/DotNetOpenAuth.OpenId.RelyingParty.csproj
@@ -20,6 +20,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="OpenId\Interop\IOpenIdRelyingParty.cs" />
     <Compile Include="OpenId\RelyingParty\Behaviors\AXFetchAsSregTransform.cs" />
     <Compile Include="OpenId\RelyingParty\Behaviors\GsaIcamProfile.cs" />
     <Compile Include="OpenId\ChannelElements\ExtensionsBindingElementRelyingParty.cs" />
@@ -35,7 +36,7 @@
     <Compile Include="OpenId\Interop\OpenIdRelyingPartyShim.cs" />
     <Compile Include="OpenId\Messages\AssociateDiffieHellmanRelyingPartyResponse.cs" Condition=" '$(ExcludeDiffieHellman)' != 'true' " />
     <Compile Include="OpenId\Messages\AssociateRequestRelyingParty.cs" />
-    <Compile Include="OpenId\Messages\AssociateSuccessfulResponseRelyingPartyContract.cs" />
+    <Compile Include="OpenId\Messages\IAssociateSuccessfulResponseRelyingPartyContract.cs" />
     <Compile Include="OpenId\Messages\IAssociateSuccessfulResponseRelyingParty.cs" />
     <Compile Include="OpenId\Messages\AssociateUnencryptedResponseRelyingParty.cs" />
     <Compile Include="OpenId\RelyingParty\CryptoKeyStoreAsRelyingPartyAssociationStore.cs" />
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Interop/IOpenIdRelyingParty.cs b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Interop/IOpenIdRelyingParty.cs
new file mode 100644
index 0000000..398c284
--- /dev/null
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Interop/IOpenIdRelyingParty.cs
@@ -0,0 +1,73 @@
+//-----------------------------------------------------------------------
+// <copyright file="IOpenIdRelyingParty.cs" company="Outercurve Foundation">
+//     Copyright (c) Outercurve Foundation. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.OpenId.Interop {
+	using System.Diagnostics.CodeAnalysis;
+	using System.Runtime.InteropServices;
+	using DotNetOpenAuth.Messaging;
+
+	/// <summary>
+	/// The COM interface describing the DotNetOpenAuth functionality available to
+	/// COM client OpenID relying parties.
+	/// </summary>
+	[Guid("56BD3DB0-EE0D-4191-ADFC-1F3705CD2636")]
+	[InterfaceType(ComInterfaceType.InterfaceIsDual)]
+	public interface IOpenIdRelyingParty {
+		/// <summary>
+		/// Creates an authentication request to verify that a user controls
+		/// some given Identifier.
+		/// </summary>
+		/// <param name="userSuppliedIdentifier">
+		/// The Identifier supplied by the user.  This may be a URL, an XRI or i-name.
+		/// </param>
+		/// <param name="realm">
+		/// The shorest URL that describes this relying party web site's address.
+		/// For example, if your login page is found at https://www.example.com/login.aspx,
+		/// your realm would typically be https://www.example.com/.
+		/// </param>
+		/// <param name="returnToUrl">
+		/// The URL of the login page, or the page prepared to receive authentication 
+		/// responses from the OpenID Provider.
+		/// </param>
+		/// <returns>
+		/// An authentication request object that describes the HTTP response to
+		/// send to the user agent to initiate the authentication.
+		/// </returns>
+		/// <exception cref="ProtocolException">Thrown if no OpenID endpoint could be found.</exception>
+		string CreateRequest(string userSuppliedIdentifier, string realm, string returnToUrl);
+
+		/// <summary>
+		/// Creates an authentication request to verify that a user controls
+		/// some given Identifier.
+		/// </summary>
+		/// <param name="userSuppliedIdentifier">The Identifier supplied by the user.  This may be a URL, an XRI or i-name.</param>
+		/// <param name="realm">The shorest URL that describes this relying party web site's address.
+		/// For example, if your login page is found at https://www.example.com/login.aspx,
+		/// your realm would typically be https://www.example.com/.</param>
+		/// <param name="returnToUrl">The URL of the login page, or the page prepared to receive authentication
+		/// responses from the OpenID Provider.</param>
+		/// <param name="optionalSreg">A comma-delimited list of simple registration fields to request as optional.</param>
+		/// <param name="requiredSreg">A comma-delimited list of simple registration fields to request as required.</param>
+		/// <returns>
+		/// An authentication request object that describes the HTTP response to
+		/// send to the user agent to initiate the authentication.
+		/// </returns>
+		/// <exception cref="ProtocolException">Thrown if no OpenID endpoint could be found.</exception>
+		[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Sreg", Justification = "Accepted acronym")]
+		string CreateRequestWithSimpleRegistration(string userSuppliedIdentifier, string realm, string returnToUrl, string optionalSreg, string requiredSreg);
+
+		/// <summary>
+		/// Gets the result of a user agent's visit to his OpenId provider in an
+		/// authentication attempt.  Null if no response is available.
+		/// </summary>
+		/// <param name="url">The incoming request URL .</param>
+		/// <param name="form">The form data that may have been included in the case of a POST request.</param>
+		/// <returns>The Provider's response to a previous authentication request, or null if no response is present.</returns>
+#pragma warning disable 0618 // we're using the COM type properly
+		AuthenticationResponseShim ProcessAuthentication(string url, string form);
+#pragma warning restore 0618
+	}
+}
\ No newline at end of file
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Interop/OpenIdRelyingPartyShim.cs b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Interop/OpenIdRelyingPartyShim.cs
index 7fcac91..eb37d86 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Interop/OpenIdRelyingPartyShim.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Interop/OpenIdRelyingPartyShim.cs
@@ -17,68 +17,6 @@ namespace DotNetOpenAuth.OpenId.Interop {
 	using DotNetOpenAuth.OpenId.RelyingParty;
 
 	/// <summary>
-	/// The COM interface describing the DotNetOpenAuth functionality available to
-	/// COM client OpenID relying parties.
-	/// </summary>
-	[Guid("56BD3DB0-EE0D-4191-ADFC-1F3705CD2636")]
-	[InterfaceType(ComInterfaceType.InterfaceIsDual)]
-	public interface IOpenIdRelyingParty {
-		/// <summary>
-		/// Creates an authentication request to verify that a user controls
-		/// some given Identifier.
-		/// </summary>
-		/// <param name="userSuppliedIdentifier">
-		/// The Identifier supplied by the user.  This may be a URL, an XRI or i-name.
-		/// </param>
-		/// <param name="realm">
-		/// The shorest URL that describes this relying party web site's address.
-		/// For example, if your login page is found at https://www.example.com/login.aspx,
-		/// your realm would typically be https://www.example.com/.
-		/// </param>
-		/// <param name="returnToUrl">
-		/// The URL of the login page, or the page prepared to receive authentication 
-		/// responses from the OpenID Provider.
-		/// </param>
-		/// <returns>
-		/// An authentication request object that describes the HTTP response to
-		/// send to the user agent to initiate the authentication.
-		/// </returns>
-		/// <exception cref="ProtocolException">Thrown if no OpenID endpoint could be found.</exception>
-		string CreateRequest(string userSuppliedIdentifier, string realm, string returnToUrl);
-
-		/// <summary>
-		/// Creates an authentication request to verify that a user controls
-		/// some given Identifier.
-		/// </summary>
-		/// <param name="userSuppliedIdentifier">The Identifier supplied by the user.  This may be a URL, an XRI or i-name.</param>
-		/// <param name="realm">The shorest URL that describes this relying party web site's address.
-		/// For example, if your login page is found at https://www.example.com/login.aspx,
-		/// your realm would typically be https://www.example.com/.</param>
-		/// <param name="returnToUrl">The URL of the login page, or the page prepared to receive authentication
-		/// responses from the OpenID Provider.</param>
-		/// <param name="optionalSreg">A comma-delimited list of simple registration fields to request as optional.</param>
-		/// <param name="requiredSreg">A comma-delimited list of simple registration fields to request as required.</param>
-		/// <returns>
-		/// An authentication request object that describes the HTTP response to
-		/// send to the user agent to initiate the authentication.
-		/// </returns>
-		/// <exception cref="ProtocolException">Thrown if no OpenID endpoint could be found.</exception>
-		[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Sreg", Justification = "Accepted acronym")]
-		string CreateRequestWithSimpleRegistration(string userSuppliedIdentifier, string realm, string returnToUrl, string optionalSreg, string requiredSreg);
-
-		/// <summary>
-		/// Gets the result of a user agent's visit to his OpenId provider in an
-		/// authentication attempt.  Null if no response is available.
-		/// </summary>
-		/// <param name="url">The incoming request URL .</param>
-		/// <param name="form">The form data that may have been included in the case of a POST request.</param>
-		/// <returns>The Provider's response to a previous authentication request, or null if no response is present.</returns>
-#pragma warning disable 0618 // we're using the COM type properly
-		AuthenticationResponseShim ProcessAuthentication(string url, string form);
-#pragma warning restore 0618
-	}
-
-	/// <summary>
 	/// Implementation of <see cref="IOpenIdRelyingParty"/>, providing a subset of the
 	/// functionality available to .NET clients.
 	/// </summary>
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Messages/AssociateSuccessfulResponseRelyingPartyContract.cs b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Messages/IAssociateSuccessfulResponseRelyingPartyContract.cs
index 9da19d7..e870c33 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Messages/AssociateSuccessfulResponseRelyingPartyContract.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Messages/IAssociateSuccessfulResponseRelyingPartyContract.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="AssociateSuccessfulResponseRelyingPartyContract.cs" company="Outercurve Foundation">
+// <copyright file="IAssociateSuccessfulResponseRelyingPartyContract.cs" company="Outercurve Foundation">
 //     Copyright (c) Outercurve Foundation. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/RelyingParty/IRelyingPartyAssociationStore.cs b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/RelyingParty/IRelyingPartyAssociationStore.cs
index 1cf3e4c..a97449e 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/RelyingParty/IRelyingPartyAssociationStore.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/RelyingParty/IRelyingPartyAssociationStore.cs
@@ -126,7 +126,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </returns>
 		Association IRelyingPartyAssociationStore.GetAssociation(Uri providerEndpoint, string handle) {
 			Requires.NotNull(providerEndpoint, "providerEndpoint");
-			Contract.Requires(!String.IsNullOrEmpty(handle));
+			Contract.Requires(!string.IsNullOrEmpty(handle));
 			throw new NotImplementedException();
 		}
 
@@ -144,7 +144,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </remarks>
 		bool IRelyingPartyAssociationStore.RemoveAssociation(Uri providerEndpoint, string handle) {
 			Requires.NotNull(providerEndpoint, "providerEndpoint");
-			Contract.Requires(!String.IsNullOrEmpty(handle));
+			Contract.Requires(!string.IsNullOrEmpty(handle));
 			throw new NotImplementedException();
 		}