Merge pull request #5 from andresmoschini/migrate-to-core-v1

Migrate to ASP.NET Core v1

Author: andresmoschini

MakingSense.AspNet.Authentication.SimpleToken.sln renamed to MakingSense.AspNetCore.Authentication.SimpleToken.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1A4906E1-3779-42B3-BE5D-2079B4D0C0C9}"
 EndProject
@@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MakingSense.AspNet.Authentication.SimpleToken", "src\MakingSense.AspNet.Authentication.SimpleToken\MakingSense.AspNet.Authentication.SimpleToken.xproj", "{209CD8C9-0545-4A2E-826D-5B83044261AF}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MakingSense.AspNetCore.Authentication.SimpleToken", "src\MakingSense.AspNetCore.Authentication.SimpleToken\MakingSense.AspNetCore.Authentication.SimpleToken.xproj", "{209CD8C9-0545-4A2E-826D-5B83044261AF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

appveyor.yml

@@ -1,34 +1,28 @@
-nuget:
-  account_feed: true
-
-version: 0.1.0-rc1-final-{build}
-
-# init:
-#  - git config --global core.autocrlf true
+os: Visual Studio 2015
 
-#install:
-# - cmd: nuget sources add -Name api.nuget.org -Source https://api.nuget.org/v3/index.json
-# - cmd: nuget sources add -Name aspnetrelease -Source https://www.myget.org/F/aspnetrelease/api/v2
+version: 1.0.2-alpha-{build}
 
-#environment:
-#  DNX_BUILD_VERSION: rc1-final
-#  DNX_ASSEMBLY_FILE_VERSION: 2.0.0
+nuget:
+  account_feed: true
+  project_feed: true
 
 before_build:
- - ps: dnvm install 1.0.0-rc1-final
- - ps: dnvm upgrade
- - ps: dnvm update-self
- - ps: dnvm list
- - ps: dnvm use 1.0.0-rc1-final
- - ps: dnu restore
- - cmd: set DNX_BUILD_VERSION=%APPVEYOR_BUILD_NUMBER%
+ - cmd: set DOTNET_ASSEMBLY_FILE_VERSION=%APPVEYOR_BUILD_NUMBER%
+ - cmd: set DOTNET_BUILD_VERSION=%APPVEYOR_BUILD_NUMBER%
+ - ps: dotnet restore
 
 artifacts:
  - path: '**\*.nupkg'
 
+build_script:
+ - cmd: dotnet build src/MakingSense.AspNetCore.Authentication.SimpleToken
+
+after_build:
+ - cmd: dotnet pack src/MakingSense.AspNetCore.Authentication.SimpleToken
+
 notifications:
-  - provider: Slack
-    auth_token:
-      secure: fOssPHTsqm6seWcnywN2TJE9gLtRdd1iXLRWWWWAhx4atR0u0ECGb/9Ij/gI/zafJI+FQvevEemi9epjeRhV/g==
-    channel: rest-api
-    template: "<{{buildUrl}}|Build {{projectName}} {{buildVersion}} {{status}}> Commit <{{commitUrl}}|{{commitId}}> by {{commitAuthor}} on {{commitDate}}: _{{commitMessage}}_"
+ - provider: Slack
+   auth_token:
+     secure: fOssPHTsqm6seWcnywN2TJE9gLtRdd1iXLRWWWWAhx4atR0u0ECGb/9Ij/gI/zafJI+FQvevEemi9epjeRhV/g==
+   channel: rest-api
+   template: "<{{buildUrl}}|Build {{projectName}} {{buildVersion}} {{status}}> Commit <{{commitUrl}}|{{commitId}}> by {{commitAuthor}} on {{commitDate}}: _{{commitMessage}}_"

global.json

@@ -1,6 +1,8 @@
 {
   "projects": [ "src", "test" ],
   "sdk": {
-    "version": "1.0.0-rc1-update1"
+    "version": "1.0.0-preview2-003131",
+    "runtime": "clr",
+    "architecture": "x86"
   }
 }

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

@@ -4,16 +4,16 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>209cd8c9-0545-4a2e-826d-5b83044261af</ProjectGuid>
-    <RootNamespace>MakingSense.AspNet.Authentication.SimpleToken</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <RootNamespace>MakingSense.AspNetCore.Authentication.SimpleToken</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj\</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
 
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

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

@@ -0,0 +1,19 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:15135/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

src/MakingSense.AspNet.Authentication.SimpleToken/MakingSense.AspNet.Authentication.SimpleToken.xproj renamed to src/MakingSense.AspNetCore.Authentication.SimpleToken/MakingSense.AspNetCore.Authentication.SimpleToken.xproj

@@ -0,0 +1,47 @@
+using System;
+using MakingSense.AspNetCore.Authentication.SimpleToken;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Framework.Internal;
+using Microsoft.IdentityModel.Tokens;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Builder
+{
+	public static class SimpleTokenAppBuilderExtensions
+	{
+		public static IApplicationBuilder UseSimpleTokenAuthentication(this IApplicationBuilder app)
+		{
+			if (app == null)
+			{
+				throw new ArgumentNullException(nameof(app));
+			}
+
+			return UseSimpleTokenAuthentication(app, new SimpleTokenAuthenticationOptions());
+		}
+
+		public static IApplicationBuilder UseSimpleTokenAuthentication(this IApplicationBuilder app, SimpleTokenAuthenticationOptions options)
+		{
+			if (app == null)
+			{
+				throw new ArgumentNullException(nameof(app));
+			}
+
+			if (options == null)
+			{
+				throw new ArgumentNullException(nameof(options));
+			}
+
+			if (string.IsNullOrEmpty(options.AuthenticationScheme))
+			{
+				options.AuthenticationScheme = "Bearer";
+			}
+
+			if (options.SecurityTokenValidatorsFactory == null)
+			{
+				options.SecurityTokenValidatorsFactory = () => app.ApplicationServices.GetServices<ISecurityTokenValidator>();
+			}
+
+			return app.UseMiddleware<SimpleTokenAuthenticationMiddleware>(Options.Create(options));
+		}
+	}
+}

src/MakingSense.AspNetCore.Authentication.SimpleToken/Properties/launchSettings.json

@@ -1,14 +1,15 @@
 using System;
-using System.IdentityModel.Tokens;
 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 MakingSense.AspNetCore.Authentication.Abstractions;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Authentication;
+using Microsoft.IdentityModel.Tokens;
 using Microsoft.Net.Http.Headers;
 
-namespace MakingSense.AspNet.Authentication.SimpleToken
+namespace MakingSense.AspNetCore.Authentication.SimpleToken
 {
 	public class SimpleTokenAuthenticationHandler : AuthenticationHandler<SimpleTokenAuthenticationOptions>
 	{
@@ -20,8 +21,11 @@ public class SimpleTokenAuthenticationHandler : AuthenticationHandler<SimpleToke
 		/// It does not search in Form-Encoded Body Parameter (http://tools.ietf.org/html/rfc6750#section-2.2).
 		/// </remarks>
 		/// <returns>
-		/// Returns Token if found, null otherwise
+		/// Returns Token if found, null otherwise.
 		/// </returns>
+		/// <exception>
+		/// Throws AuthenticationException when Authentication header is found, but id does not contains valid data format.
+		/// </exception>
 		public static string ExtractToken(HttpRequest request)
 		{
 			var authorizationHeader = (string)request.Headers[HeaderNames.Authorization];
@@ -54,7 +58,6 @@ public static string ExtractToken(HttpRequest request)
 				throw new AuthenticationException("Authorization header exists but does not contains valid information.");
 			}
 
-			// Search in URI Query Parameter (http://tools.ietf.org/html/rfc6750#section-2.3)
 			var tokenFromQuery = (string)request.Query["access_token"] ?? request.Query["api_key"];
 			if (tokenFromQuery != null)
 			{
@@ -72,16 +75,12 @@ public static string ExtractToken(HttpRequest request)
 		/// <returns></returns>
 		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);
+			var token = ExtractToken(Request);
 
 			// If no token found, no further work possible
 			if (string.IsNullOrEmpty(token))
 			{
-				// Not so nice, but AuthenticateResult.Fail has the same behavior
-				return null;
+				return AuthenticateResult.Skip();
 			}
 
 			var validationParameters = Options.TokenValidationParameters.Clone();
@@ -98,6 +97,9 @@ 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;
+
 			// 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.");
 		}