Merge pull request #2 from andresmoschini/dplr-10952-upgrade-to-rc1

DPLR-10952 - Upgrade to RC1

Author: andresmoschini

appveyor.yml

@@ -1,7 +1,7 @@
 nuget:
   account_feed: true
 
-version: 0.1.0-beta8-{build}
+version: 0.1.0-rc1-final-{build}
 
 # init:
 #  - git config --global core.autocrlf true
@@ -11,15 +11,15 @@ version: 0.1.0-beta8-{build}
 # - cmd: nuget sources add -Name aspnetrelease -Source https://www.myget.org/F/aspnetrelease/api/v2
 
 #environment:
-#  DNX_BUILD_VERSION: beta8
+#  DNX_BUILD_VERSION: rc1-final
 #  DNX_ASSEMBLY_FILE_VERSION: 2.0.0
 
 before_build:
- - ps: dnvm install 1.0.0-beta8
+ - ps: dnvm install 1.0.0-rc1-final
  - ps: dnvm upgrade
  - ps: dnvm update-self
  - ps: dnvm list
- - ps: dnvm use 1.0.0-beta8
+ - ps: dnvm use 1.0.0-rc1-final
  - ps: dnu restore
  - cmd: set DNX_BUILD_VERSION=%APPVEYOR_BUILD_NUMBER%
 

global.json

@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "test" ],
   "sdk": {
-    "version": "1.0.0-beta8"
+    "version": "1.0.0-rc1-update1"
   }
 }

src/MakingSense.AspNet.Authentication.SimpleToken/SimpleTokenAppBuilderExtensions.cs

@@ -1,19 +1,18 @@
 using System;
+using System.IdentityModel.Tokens;
 using MakingSense.AspNet.Authentication.SimpleToken;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Framework.Internal;
-using Microsoft.Framework.OptionsModel;
-using System.IdentityModel.Tokens;
 
 namespace Microsoft.AspNet.Builder
 {
 	public static class SimpleTokenAppBuilderExtensions
 	{
-		public static IApplicationBuilder UseSimpleTokenAuthentication([NotNull] this IApplicationBuilder app, Action<SimpleTokenAuthenticationOptions> configureOptions = null, string optionsName = "")
+		public static IApplicationBuilder UseSimpleTokenAuthentication([NotNull] this IApplicationBuilder app, Action<SimpleTokenAuthenticationOptions> configureOptions = null, string authenticationScheme = "Bearer")
 		{
 			var options = new SimpleTokenAuthenticationOptions()
 			{
-				AuthenticationScheme = optionsName
+				AuthenticationScheme = authenticationScheme
 			};
 
 			if (configureOptions != null)

src/MakingSense.AspNet.Authentication.SimpleToken/SimpleTokenAuthenticationHandler.cs

@@ -1,11 +1,11 @@
 using System;
-using Microsoft.AspNet.Http.Authentication;
 using System.IdentityModel.Tokens;
-using Microsoft.AspNet.Http;
 using System.Text;
 using System.Threading.Tasks;
 using MakingSense.AspNet.Authentication.Abstractions;
 using Microsoft.AspNet.Authentication;
+using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Authentication;
 using Microsoft.Net.Http.Headers;
 
 namespace MakingSense.AspNet.Authentication.SimpleToken
@@ -50,6 +50,7 @@ public static string ExtractToken(HttpRequest request)
 					}
 				}
 
+				// Not so nice, but AuthenticateResult.Fail does not allow us to show the error
 				throw new AuthenticationException("Authorization header exists but does not contains valid information.");
 			}
 
@@ -63,19 +64,24 @@ public static string ExtractToken(HttpRequest request)
 			return null;
 		}
 
+		static readonly Task DoneTask = Task.FromResult(0);
 
 		/// <summary>
 		/// Searches the 'Authorization' header for a 'Bearer' token. If the 'Bearer' token is found, it is validated using <see cref="TokenValidationParameters"/> set in the options.
 		/// </summary>
 		/// <returns></returns>
-		protected override Task<AuthenticationTicket> HandleAuthenticateAsync()
+		protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
 		{
+			// Ugly patch to make this method should to be async in order to allow result caching by caller
+			await DoneTask;
+
 			string token = ExtractToken(Request);
 
 			// If no token found, no further work possible
 			if (string.IsNullOrEmpty(token))
 			{
-				return Task.FromResult<AuthenticationTicket>(null);
+				// Not so nice, but AuthenticateResult.Fail has the same behavior
+				return null;
 			}
 
 			var validationParameters = Options.TokenValidationParameters.Clone();
@@ -88,10 +94,11 @@ protected override Task<AuthenticationTicket> HandleAuthenticateAsync()
 				{
 					var principal = validator.ValidateToken(token, validationParameters, out validatedToken);
 					var ticket = new AuthenticationTicket(principal, new AuthenticationProperties(), Options.AuthenticationScheme);
-					return Task.FromResult(ticket);
+					return AuthenticateResult.Success(ticket);
 				}
 			}
 
+			// Not so nice, but AuthenticateResult.Fail does not allow us to show the error
 			throw new AuthenticationException("Authorization token has been detected but it cannot be read.");
 		}
 	}

src/MakingSense.AspNet.Authentication.SimpleToken/SimpleTokenAuthenticationMiddleware.cs

@@ -1,10 +1,9 @@
 using System;
+using Microsoft.AspNet.Authentication;
 using Microsoft.AspNet.Builder;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.WebEncoders;
 using Microsoft.Framework.Internal;
-using Microsoft.Framework.Logging;
-using Microsoft.Framework.OptionsModel;
-using Microsoft.Framework.WebEncoders;
-using Microsoft.AspNet.Authentication;
 
 namespace MakingSense.AspNet.Authentication.SimpleToken
 {

src/MakingSense.AspNet.Authentication.SimpleToken/SimpleTokenAuthenticationOptions.cs

@@ -1,8 +1,8 @@
-using Microsoft.AspNet.Authentication;
-using Microsoft.Framework.Internal;
 using System;
 using System.Collections.Generic;
 using System.IdentityModel.Tokens;
+using Microsoft.AspNet.Authentication;
+using Microsoft.Framework.Internal;
 
 namespace MakingSense.AspNet.Authentication.SimpleToken
 {

src/MakingSense.AspNet.Authentication.SimpleToken/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.0-beta8-*",
+  "version": "0.1.0-rc1-final-*",
   "description": "MakingSense.AspNet.Authentication.SimpleToken Class Library",
   "authors": [ "MakingSense" ],
   "tags": [ "ASP.NET 5", "vnext", "authentication", "token", "bearer" ],
@@ -10,21 +10,21 @@
   "projectUrl": "https://github.com/MakingSense/aspnet-authentication-simpletoken",
   "licenseUrl": "http://www.gnu.org/licenses/lgpl.html",
   "dependencies": {
-    "MakingSense.AspNet.Abstractions": "0.1.0-beta8",
-    "Microsoft.AspNet.Authentication": "1.0.0-beta8",
+    "MakingSense.AspNet.Abstractions": "0.1.0-rc1-final",
+    "Microsoft.AspNet.Authentication": "1.0.0-rc1-final",
     "Newtonsoft.Json": "6.0.8",
-    "System.IdentityModel.Tokens": "5.0.0-beta8-210131116"
+    "System.IdentityModel.Tokens": "5.0.0-rc1-211161024"
   },
 
   "frameworks": {
     "dnx451": { },
     "dnxcore50": {
       "dependencies": {
-        "Microsoft.CSharp": "4.0.1-beta-23409",
-        "System.Collections": "4.0.11-beta-23409",
-        "System.Linq": "4.0.1-beta-23409",
-        "System.Runtime": "4.0.21-beta-23409",
-        "System.Threading": "4.0.11-beta-23409"
+        "Microsoft.CSharp": "4.0.1-beta-23516",
+        "System.Collections": "4.0.11-beta-23516",
+        "System.Linq": "4.0.1-beta-23516",
+        "System.Runtime": "4.0.21-beta-23516",
+        "System.Threading": "4.0.11-beta-23516"
       }
     }
   }