Auth cleanup

- Rename Security folder -> Authentication
- Change Authenticate to only take one scheme to match other APIs, the
params overload did not make it any cleaner to consume (since it didn't
produce a combined ClaimsPrincipal anyways)

Author: HaoK

src/Microsoft.AspNet.Http.Core/Authentication/AuthenticateContext.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Security.Claims;
 using Microsoft.AspNet.Http.Authentication;
@@ -10,38 +11,33 @@ namespace Microsoft.AspNet.Http.Core.Authentication
 {
     public class AuthenticateContext : IAuthenticateContext
     {
-        private List<AuthenticationResult> _results;
-        private List<string> _accepted;
+        private AuthenticationResult _result;
+        private bool _accepted;
 
-        public AuthenticateContext([NotNull] IEnumerable<string> authenticationSchemes)
+        public AuthenticateContext([NotNull] string authenticationScheme)
         {
-            AuthenticationSchemes = authenticationSchemes;
-            _results = new List<AuthenticationResult>();
-            _accepted = new List<string>();
+            AuthenticationScheme = authenticationScheme;
         }
 
-        public IEnumerable<string> AuthenticationSchemes { get; private set; }
+        public string AuthenticationScheme { get; private set; }
 
-        public IEnumerable<AuthenticationResult> Results
-        {
-            get { return _results; }
-        }
+        public AuthenticationResult Result { get; set; }
 
-        public IEnumerable<string> Accepted
+        public bool Accepted
         {
             get { return _accepted; }
         }
 
         public void Authenticated(ClaimsPrincipal principal, IDictionary<string, string> properties, IDictionary<string, object> description)
         {
             var descrip = new AuthenticationDescription(description);
-            _accepted.Add(descrip.AuthenticationScheme); // may not match identity.AuthType
-            _results.Add(new AuthenticationResult(principal, new AuthenticationProperties(properties), descrip));
+            _accepted = true;
+            Result = new AuthenticationResult(principal, new AuthenticationProperties(properties), descrip);
         }
 
-        public void NotAuthenticated(string authenticationScheme, IDictionary<string, string> properties, IDictionary<string, object> description)
+        public void NotAuthenticated()
         {
-            _accepted.Add(authenticationScheme);
+            _accepted = true;
         }
     }
 }

src/Microsoft.AspNet.Http.Core/DefaultHttpContext.cs

@@ -212,44 +212,41 @@ public override IEnumerable<AuthenticationDescription> GetAuthenticationSchemes(
             return describeContext.Results;
         }
 
-        public override IEnumerable<AuthenticationResult> Authenticate([NotNull] IEnumerable<string> authenticationSchemes)
+        public override AuthenticationResult Authenticate([NotNull] string authenticationScheme)
         {
             var handler = HttpAuthenticationFeature.Handler;
 
-            var authenticateContext = new AuthenticateContext(authenticationSchemes);
+            var authenticateContext = new AuthenticateContext(authenticationScheme);
             if (handler != null)
             {
                 handler.Authenticate(authenticateContext);
             }
 
-            // Verify all types ack'd
-            IEnumerable<string> leftovers = authenticationSchemes.Except(authenticateContext.Accepted);
-            if (leftovers.Any())
+            if (!authenticateContext.Accepted)
             {
-                throw new InvalidOperationException("The following authentication schemes were not accepted: " + string.Join(", ", leftovers));
+                throw new InvalidOperationException("The following authentication scheme was not accepted: " + authenticationScheme);
             }
 
-            return authenticateContext.Results;
+            return authenticateContext.Result;
         }
 
-        public override async Task<IEnumerable<AuthenticationResult>> AuthenticateAsync([NotNull] IEnumerable<string> authenticationSchemes)
+        public override async Task<AuthenticationResult> AuthenticateAsync([NotNull] string authenticationScheme)
         {
             var handler = HttpAuthenticationFeature.Handler;
 
-            var authenticateContext = new AuthenticateContext(authenticationSchemes);
+            var authenticateContext = new AuthenticateContext(authenticationScheme);
             if (handler != null)
             {
                 await handler.AuthenticateAsync(authenticateContext);
             }
 
             // Verify all types ack'd
-            IEnumerable<string> leftovers = authenticationSchemes.Except(authenticateContext.Accepted);
-            if (leftovers.Any())
+            if (!authenticateContext.Accepted)
             {
-                throw new InvalidOperationException("The following authentication schemes were not accepted: " + string.Join(", ", leftovers));
+                throw new InvalidOperationException("The following authentication scheme was not accepted: " + authenticationScheme);
             }
 
-            return authenticateContext.Results;
+            return authenticateContext.Result;
         }
 
         public override Task<WebSocket> AcceptWebSocketAsync(string subProtocol)

src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticateContext.cs renamed to src/Microsoft.AspNet.Http.Interfaces/Authentication/IAuthenticateContext.cs

@@ -8,10 +8,10 @@ namespace Microsoft.AspNet.Http.Authentication
 {
     public interface IAuthenticateContext
     {
-        IEnumerable<string> AuthenticationSchemes { get; }
+        string AuthenticationScheme { get; }
 
         void Authenticated(ClaimsPrincipal principal, IDictionary<string, string> properties, IDictionary<string, object> description);
 
-        void NotAuthenticated(string authenticationScheme, IDictionary<string, string> properties, IDictionary<string, object> description);
+        void NotAuthenticated();
     }
 }

src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticationHandler.cs renamed to src/Microsoft.AspNet.Http.Interfaces/Authentication/IAuthenticationHandler.cs

@@ -8,6 +8,7 @@ namespace Microsoft.AspNet.Http.Authentication
     public interface IHttpAuthenticationFeature
     {
         ClaimsPrincipal User { get; set; }
+
         IAuthenticationHandler Handler { get; set; }
     }
 }

src/Microsoft.AspNet.Http.Interfaces/Security/IChallengeContext.cs renamed to src/Microsoft.AspNet.Http.Interfaces/Authentication/IChallengeContext.cs

@@ -54,19 +54,9 @@ public virtual void SetFeature<T>(T instance)
 
         public abstract IEnumerable<AuthenticationDescription> GetAuthenticationSchemes();
 
-        public virtual AuthenticationResult Authenticate(string authenticationScheme)
-        {
-            return Authenticate(new[] { authenticationScheme }).SingleOrDefault();
-        }
-
-        public abstract IEnumerable<AuthenticationResult> Authenticate(IEnumerable<string> authenticationSchemes);
-
-        public virtual async Task<AuthenticationResult> AuthenticateAsync(string authenticationScheme)
-        {
-            return (await AuthenticateAsync(new[] { authenticationScheme })).SingleOrDefault();
-        }
+        public abstract AuthenticationResult Authenticate(string authenticationScheme);
 
-        public abstract Task<IEnumerable<AuthenticationResult>> AuthenticateAsync(IEnumerable<string> authenticationSchemes);
+        public abstract Task<AuthenticationResult> AuthenticateAsync(string authenticationScheme);
 
         public virtual Task<WebSocket> AcceptWebSocketAsync()
         {