diff --git a/src/Microsoft.AspNet.HttpFeature/Security/IAuthTypeContext.cs b/src/Microsoft.AspNet.HttpFeature/Security/IAuthTypeContext.cs index 634517ad6b..e91797ceca 100644 --- a/src/Microsoft.AspNet.HttpFeature/Security/IAuthTypeContext.cs +++ b/src/Microsoft.AspNet.HttpFeature/Security/IAuthTypeContext.cs @@ -4,6 +4,6 @@ namespace Microsoft.AspNet.HttpFeature.Security { public interface IAuthTypeContext { - void Ack(IDictionary description); + void Accept(IDictionary description); } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.HttpFeature/Security/IChallengeContext .cs b/src/Microsoft.AspNet.HttpFeature/Security/IChallengeContext.cs similarity index 72% rename from src/Microsoft.AspNet.HttpFeature/Security/IChallengeContext .cs rename to src/Microsoft.AspNet.HttpFeature/Security/IChallengeContext.cs index 9b80cdd5be..2707c6c63d 100644 --- a/src/Microsoft.AspNet.HttpFeature/Security/IChallengeContext .cs +++ b/src/Microsoft.AspNet.HttpFeature/Security/IChallengeContext.cs @@ -7,6 +7,6 @@ namespace Microsoft.AspNet.HttpFeature.Security IList AuthenticationTypes {get;} IDictionary Properties {get;} - void Ack(string authenticationType, IDictionary description); + void Accept(string authenticationType, IDictionary description); } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.HttpFeature/Security/ISignInContext.cs b/src/Microsoft.AspNet.HttpFeature/Security/ISignInContext.cs index a19fdaa86b..cb78f661b2 100644 --- a/src/Microsoft.AspNet.HttpFeature/Security/ISignInContext.cs +++ b/src/Microsoft.AspNet.HttpFeature/Security/ISignInContext.cs @@ -8,6 +8,6 @@ namespace Microsoft.AspNet.HttpFeature.Security IList Identities { get; } IDictionary Properties { get; } - void Ack(string authenticationType, IDictionary description); + void Accept(string authenticationType, IDictionary description); } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.HttpFeature/Security/ISignOutContext .cs b/src/Microsoft.AspNet.HttpFeature/Security/ISignOutContext .cs index 97df86501c..9a1232ff3a 100644 --- a/src/Microsoft.AspNet.HttpFeature/Security/ISignOutContext .cs +++ b/src/Microsoft.AspNet.HttpFeature/Security/ISignOutContext .cs @@ -6,6 +6,6 @@ namespace Microsoft.AspNet.HttpFeature.Security { IList AuthenticationTypes { get; } - void Ack(string authenticationType, IDictionary description); + void Accept(string authenticationType, IDictionary description); } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs index 1edb07771c..0525f0cd6c 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs +++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs @@ -123,10 +123,10 @@ namespace Microsoft.AspNet.PipelineCore handler.Authenticate(authenticateContext); // Verify all types ack'd - IEnumerable leftovers = authenticationTypes.Except(authenticateContext.Acked); + IEnumerable leftovers = authenticationTypes.Except(authenticateContext.Accepted); if (leftovers.Any()) { - throw new InvalidOperationException("The following authentication types did not ack: " + string.Join(", ", leftovers)); + throw new InvalidOperationException("The following authentication types were not accepted: " + string.Join(", ", leftovers)); } return authenticateContext.Results; @@ -148,10 +148,10 @@ namespace Microsoft.AspNet.PipelineCore await handler.AuthenticateAsync(authenticateContext); // Verify all types ack'd - IEnumerable leftovers = authenticationTypes.Except(authenticateContext.Acked); + IEnumerable leftovers = authenticationTypes.Except(authenticateContext.Accepted); if (leftovers.Any()) { - throw new InvalidOperationException("The following authentication types did not ack: " + string.Join(", ", leftovers)); + throw new InvalidOperationException("The following authentication types were not accepted: " + string.Join(", ", leftovers)); } return authenticateContext.Results; diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs index ec77460f58..278f16b591 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs +++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs @@ -136,10 +136,10 @@ namespace Microsoft.AspNet.PipelineCore handler.Challenge(challengeContext); // Verify all types ack'd - IEnumerable leftovers = authenticationTypes.Except(challengeContext.Acked); + IEnumerable leftovers = authenticationTypes.Except(challengeContext.Accepted); if (leftovers.Any()) { - throw new InvalidOperationException("The following authentication types did not ack: " + string.Join(", ", leftovers)); + throw new InvalidOperationException("The following authentication types were not accepted: " + string.Join(", ", leftovers)); } } @@ -159,10 +159,10 @@ namespace Microsoft.AspNet.PipelineCore handler.SignIn(signInContext); // Verify all types ack'd - IEnumerable leftovers = identities.Select(identity => identity.AuthenticationType).Except(signInContext.Acked); + IEnumerable leftovers = identities.Select(identity => identity.AuthenticationType).Except(signInContext.Accepted); if (leftovers.Any()) { - throw new InvalidOperationException("The following authentication types did not ack: " + string.Join(", ", leftovers)); + throw new InvalidOperationException("The following authentication types were not accepted: " + string.Join(", ", leftovers)); } } @@ -182,10 +182,10 @@ namespace Microsoft.AspNet.PipelineCore handler.SignOut(signOutContext); // Verify all types ack'd - IEnumerable leftovers = authenticationTypes.Except(signOutContext.Acked); + IEnumerable leftovers = authenticationTypes.Except(signOutContext.Accepted); if (leftovers.Any()) { - throw new InvalidOperationException("The following authentication types did not ack: " + string.Join(", ", leftovers)); + throw new InvalidOperationException("The following authentication types were not accepted: " + string.Join(", ", leftovers)); } } } diff --git a/src/Microsoft.AspNet.PipelineCore/Security/AuthTypeContext.cs b/src/Microsoft.AspNet.PipelineCore/Security/AuthTypeContext.cs index ccf8d40ed0..f4632607a4 100644 --- a/src/Microsoft.AspNet.PipelineCore/Security/AuthTypeContext.cs +++ b/src/Microsoft.AspNet.PipelineCore/Security/AuthTypeContext.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNet.PipelineCore.Security public IList Results { get; private set; } - public void Ack(IDictionary description) + public void Accept(IDictionary description) { Results.Add(new AuthenticationDescription(description)); } diff --git a/src/Microsoft.AspNet.PipelineCore/Security/AuthenticateContext.cs b/src/Microsoft.AspNet.PipelineCore/Security/AuthenticateContext.cs index 15f9be71b3..9fa561372a 100644 --- a/src/Microsoft.AspNet.PipelineCore/Security/AuthenticateContext.cs +++ b/src/Microsoft.AspNet.PipelineCore/Security/AuthenticateContext.cs @@ -19,25 +19,25 @@ namespace Microsoft.AspNet.PipelineCore.Security } AuthenticationTypes = authenticationTypes; Results = new List(); - Acked = new List(); + Accepted = new List(); } public IList AuthenticationTypes { get; private set; } public IList Results { get; private set; } - public IList Acked { get; private set; } + public IList Accepted { get; private set; } public void Authenticated(ClaimsIdentity identity, IDictionary properties, IDictionary description) { var descrip = new AuthenticationDescription(description); - Acked.Add(descrip.AuthenticationType); + Accepted.Add(descrip.AuthenticationType); // may not match identity.AuthType Results.Add(new AuthenticationResult(identity, new AuthenticationProperties(properties), descrip)); } public void NotAuthenticated(string authenticationType, IDictionary properties, IDictionary description) { - Acked.Add(authenticationType); + Accepted.Add(authenticationType); } } } diff --git a/src/Microsoft.AspNet.PipelineCore/Security/ChallengeContext.cs b/src/Microsoft.AspNet.PipelineCore/Security/ChallengeContext.cs index 991ecb52a0..ed43ee31e2 100644 --- a/src/Microsoft.AspNet.PipelineCore/Security/ChallengeContext.cs +++ b/src/Microsoft.AspNet.PipelineCore/Security/ChallengeContext.cs @@ -17,18 +17,18 @@ namespace Microsoft.AspNet.PipelineCore.Security } AuthenticationTypes = authenticationTypes; Properties = properties ?? new Dictionary(StringComparer.Ordinal); - Acked = new List(); + Accepted = new List(); } public IList AuthenticationTypes { get; private set; } public IDictionary Properties { get; private set; } - public IList Acked { get; private set; } + public IList Accepted { get; private set; } - public void Ack(string authenticationType, IDictionary description) + public void Accept(string authenticationType, IDictionary description) { - Acked.Add(authenticationType); + Accepted.Add(authenticationType); } } } diff --git a/src/Microsoft.AspNet.PipelineCore/Security/SignInContext.cs b/src/Microsoft.AspNet.PipelineCore/Security/SignInContext.cs index d7669d36e4..690388dcc8 100644 --- a/src/Microsoft.AspNet.PipelineCore/Security/SignInContext.cs +++ b/src/Microsoft.AspNet.PipelineCore/Security/SignInContext.cs @@ -15,18 +15,18 @@ namespace Microsoft.AspNet.PipelineCore.Security } Identities = identities; Properties = dictionary ?? new Dictionary(StringComparer.Ordinal); - Acked = new List(); + Accepted = new List(); } public IList Identities { get; private set; } public IDictionary Properties { get; private set; } - public IList Acked { get; private set; } + public IList Accepted { get; private set; } - public void Ack(string authenticationType, IDictionary description) + public void Accept(string authenticationType, IDictionary description) { - Acked.Add(authenticationType); + Accepted.Add(authenticationType); } } } diff --git a/src/Microsoft.AspNet.PipelineCore/Security/SignOutContext.cs b/src/Microsoft.AspNet.PipelineCore/Security/SignOutContext.cs index d81ded334d..2d2814cd02 100644 --- a/src/Microsoft.AspNet.PipelineCore/Security/SignOutContext.cs +++ b/src/Microsoft.AspNet.PipelineCore/Security/SignOutContext.cs @@ -13,16 +13,16 @@ namespace Microsoft.AspNet.PipelineCore.Security throw new ArgumentNullException("authenticationTypes"); } AuthenticationTypes = authenticationTypes; - Acked = new List(); + Accepted = new List(); } public IList AuthenticationTypes { get; private set; } - public IList Acked { get; private set; } + public IList Accepted { get; private set; } - public void Ack(string authenticationType, IDictionary description) + public void Accept(string authenticationType, IDictionary description) { - Acked.Add(authenticationType); + Accepted.Add(authenticationType); } } }