diff options
| -rw-r--r-- | src/DotNetOpenAuth/GlobalSuppressions.cs | 1 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/Messaging/Reflection/MessagePart.cs | 1 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/OAuth/ServiceProvider.cs | 12 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/OpenId/Extensions/UI/UIRequest.cs | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/DotNetOpenAuth/GlobalSuppressions.cs b/src/DotNetOpenAuth/GlobalSuppressions.cs index 37c9341..c4c6d22 100644 --- a/src/DotNetOpenAuth/GlobalSuppressions.cs +++ b/src/DotNetOpenAuth/GlobalSuppressions.cs @@ -41,3 +41,4 @@ [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "DotNetOpenAuth.OpenId.Extensions.ProviderAuthenticationPolicy")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames", Justification = "We sign it when producing drops.")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "DotNetOpenAuth.OpenId.Extensions.OAuth")] +[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "DotNetOpenAuth.OpenId.Extensions.UI")] diff --git a/src/DotNetOpenAuth/Messaging/Reflection/MessagePart.cs b/src/DotNetOpenAuth/Messaging/Reflection/MessagePart.cs index 2f11853..a7bba5b 100644 --- a/src/DotNetOpenAuth/Messaging/Reflection/MessagePart.cs +++ b/src/DotNetOpenAuth/Messaging/Reflection/MessagePart.cs @@ -56,6 +56,7 @@ namespace DotNetOpenAuth.Messaging.Reflection { /// <summary> /// Initializes static members of the <see cref="MessagePart"/> class. /// </summary> + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Justification = "This simplifies the rest of the code.")] [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "By design.")] [SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline", Justification = "Much more efficient initialization when we can call methods.")] static MessagePart() { diff --git a/src/DotNetOpenAuth/OAuth/ServiceProvider.cs b/src/DotNetOpenAuth/OAuth/ServiceProvider.cs index a8a702b..78ee252 100644 --- a/src/DotNetOpenAuth/OAuth/ServiceProvider.cs +++ b/src/DotNetOpenAuth/OAuth/ServiceProvider.cs @@ -201,7 +201,7 @@ namespace DotNetOpenAuth.OAuth { /// Gets the OAuth authorization request included with an OpenID authentication /// request. /// </summary> - /// <param name="openIdAuthenticationRequest">The OpenID authentication request.</param> + /// <param name="openIdRequest">The OpenID authentication request.</param> /// <returns> /// The scope of access the relying party is requesting. /// </returns> @@ -210,14 +210,14 @@ namespace DotNetOpenAuth.OAuth { /// out from the authentication request directly to ensure that the additional /// security measures that are required are taken.</para> /// </remarks> - public AuthorizationRequest ReadAuthorizationRequest(IAuthenticationRequest openIdAuthenticationRequest) { - Contract.Requires(openIdAuthenticationRequest != null); + public AuthorizationRequest ReadAuthorizationRequest(IHostProcessedRequest openIdRequest) { + Contract.Requires(openIdRequest != null); Contract.Requires(this.TokenManager is ICombinedOpenIdProviderTokenManager); - ErrorUtilities.VerifyArgumentNotNull(openIdAuthenticationRequest, "openIdAuthenticationRequest"); + ErrorUtilities.VerifyArgumentNotNull(openIdRequest, "openIdAuthenticationRequest"); var openidTokenManager = this.TokenManager as ICombinedOpenIdProviderTokenManager; ErrorUtilities.VerifyOperation(openidTokenManager != null, OAuthStrings.OpenIdOAuthExtensionRequiresSpecialTokenManagerInterface, typeof(IOpenIdOAuthTokenManager).FullName); - var authzRequest = openIdAuthenticationRequest.GetExtension<AuthorizationRequest>(); + var authzRequest = openIdRequest.GetExtension<AuthorizationRequest>(); if (authzRequest == null) { return null; } @@ -225,7 +225,7 @@ namespace DotNetOpenAuth.OAuth { // OpenID+OAuth spec section 9: // The Combined Provider SHOULD verify that the consumer key passed in the // request is authorized to be used for the realm passed in the request. - string expectedConsumerKey = openidTokenManager.GetConsumerKey(openIdAuthenticationRequest.Realm); + string expectedConsumerKey = openidTokenManager.GetConsumerKey(openIdRequest.Realm); ErrorUtilities.VerifyProtocol( string.Equals(expectedConsumerKey, authzRequest.Consumer, StringComparison.Ordinal), OAuthStrings.OpenIdOAuthRealmConsumerKeyDoNotMatch); diff --git a/src/DotNetOpenAuth/OpenId/Extensions/UI/UIRequest.cs b/src/DotNetOpenAuth/OpenId/Extensions/UI/UIRequest.cs index 71afd66..476b4ad 100644 --- a/src/DotNetOpenAuth/OpenId/Extensions/UI/UIRequest.cs +++ b/src/DotNetOpenAuth/OpenId/Extensions/UI/UIRequest.cs @@ -7,6 +7,7 @@ namespace DotNetOpenAuth.OpenId.Extensions.UI { using System; using System.Collections.Generic; + using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Linq; using DotNetOpenAuth.Messaging; @@ -70,6 +71,7 @@ namespace DotNetOpenAuth.OpenId.Extensions.UI { /// Gets the style of UI that the RP is hosting the OP's authentication page in. /// </summary> /// <value>Some value from the <see cref="UIModes"/> class. Defaults to <see cref="UIModes.Popup"/>.</value> + [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Design is to allow this later to be changable when more than one value exists.")] [MessagePart("mode", AllowEmpty = false, IsRequired = true)] public string Mode { get { return UIModes.Popup; } } |