Tests passing

javiercn · javiercn · commit 5ce24a6bddea · 2019-06-19T10:33:43.000-07:00
diff --git a/src/Components/Browser.JS/dist/Release/blazor.server.js b/src/Components/Browser.JS/dist/Release/blazor.server.js
diff --git a/src/Components/Server/src/Authentication/CircuitAuthenticationHandler.cs b/src/Components/Server/src/Authentication/CircuitAuthenticationHandler.cs
@@ -48,7 +48,7 @@ protected override Task<AuthenticateResult> HandleAuthenticateAsync()
             {
                 if (CircuitIdFactory.ValidateCircuitId(circuitId, cookie, out var parsedId))
                 {
-                    var identity = new ClaimsIdentity(AuthenticationType);
+                    var identity = new ClaimsIdentity();
                     identity.AddClaim(new Claim(IdClaimType, parsedId.RequestToken));
                     var principal = new ClaimsPrincipal();
                     principal.AddIdentity(identity);
@@ -88,21 +88,6 @@ protected override Task HandleSignOutAsync(AuthenticationProperties properties)
             throw new InvalidOperationException("Sign out is not supported.");
         }
 
-        private string GetId(string value)
-        {
-            try
-            {
-                CircuitId result = CircuitIdFactory.FromCookieValue(value);
-                return result.RequestToken;
-            }
-            catch
-            {
-                // Cookie didn't have a valid format, treating them as if it didn't exist.
-                // We might want to log here that something went wrong.
-                return null;
-            }
-        }
-
         internal static void AttachCircuitId(HttpContext httpContext, CircuitId circuitId)
         {
             var principal = new ClaimsPrincipal();
diff --git a/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs b/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs
@@ -49,7 +49,8 @@ public static ComponentEndpointConventionBuilder MapBlazorHub(this IEndpointRout
             }
 
             endpoints.MapStartCircuitEndpoint(ComponentHub.DefaultPath + "/start");
-            return new ComponentEndpointConventionBuilder(endpoints.MapHub<ComponentHub>(ComponentHub.DefaultPath, configureOptions));
+            return new ComponentEndpointConventionBuilder(endpoints.MapHub<ComponentHub>(ComponentHub.DefaultPath, configureOptions))
+                .RequireAuthorization(CircuitAuthenticationHandler.AuthenticationType);
         }
 
         /// <summary>
diff --git a/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs b/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs
@@ -53,6 +53,8 @@ public static IServerSideBlazorBuilder AddServerSideBlazor(this IServiceCollecti
                 CircuitAuthenticationHandler.AuthenticationType,
                 _ => { });
 
+            services.AddAuthorization();
+
             services.TryAddEnumerable(ServiceDescriptor.Singleton<IPostConfigureOptions<AuthorizationOptions>, ConfigureCircuitAuthorization>());
             services.TryAddEnumerable(ServiceDescriptor.Singleton<IPostConfigureOptions<CircuitOptions>, ConfigureCircuitAuthenticationPolicy>());
 
diff --git a/src/Components/test/testassets/ComponentsApp.Server/Pages/Index.cshtml b/src/Components/test/testassets/ComponentsApp.Server/Pages/Index.cshtml
@@ -13,7 +13,6 @@
 </head>
 <body>
     <app>@(await Html.RenderComponentAsync<App>(new { Name = "Guest" }))</app>
-    <banner></banner>
     <script src="_framework/blazor.server.js" autostart="false"></script>
     <script>
         Blazor.start({
diff --git a/src/Components/test/testassets/ComponentsApp.Server/Startup.cs b/src/Components/test/testassets/ComponentsApp.Server/Startup.cs
@@ -1,17 +1,11 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Security.Claims;
-using System.Text.Encodings.Web;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Components.Server.Circuits;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace ComponentsApp.Server
 {
@@ -22,14 +16,6 @@ public void ConfigureServices(IServiceCollection services)
             services.AddMvc();
             services.AddSingleton<CircuitHandler, LoggingCircuitHandler>();
             services.AddServerSideBlazor();
-            //services.AddSignalR().AddAzureSignalR(o =>
-            //{
-            //    o.ServerStickyMode = ServerStickyMode.Required;
-            //    o.ConnectionString = "Endpoint=https://antifoguertysignalr.service.signalr.net;AccessKey=vdGlVP/IMKLjlRbDOZX6v8Ce6XJ1o1OEayz+nWuTM3U=;Version=1.0;";
-            //});
-
-            services.AddAuthentication("Test")
-                .AddScheme<TestAuthenticationOptions, TestScheme>("Test", o => { });
 
             services.AddSingleton<WeatherForecastService, DefaultWeatherForecastService>();
         }
@@ -51,29 +37,9 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             {
                 endpoints.MapRazorPages();
                 endpoints.MapControllers();
-                endpoints.MapBlazorHub<App.Banner>(selector: "banner")
-                    .RequireAuthorization("Circuit");
+                endpoints.MapBlazorHub();
                 endpoints.MapFallbackToPage("/Index");
             });
         }
     }
-
-    public class TestScheme : AuthenticationHandler<TestAuthenticationOptions>
-    {
-        public TestScheme(
-            IOptionsMonitor<TestAuthenticationOptions> options, ILoggerFactory logger,
-            UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock)
-        {
-        }
-
-        protected override Task<AuthenticateResult> HandleAuthenticateAsync()
-        {
-            return Task.FromResult(AuthenticateResult.Success(new AuthenticationTicket(
-                new ClaimsPrincipal(new ClaimsIdentity(new Claim[] { new Claim("some", "claim") }, "Test")), "Test")));
-        }
-    }
-
-    public class TestAuthenticationOptions : AuthenticationSchemeOptions
-    {
-    }
 }
diff --git a/src/Components/test/testassets/TestServer/Startup.cs b/src/Components/test/testassets/TestServer/Startup.cs
@@ -67,6 +67,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
                 subdirApp.UseRouting();
 
+                subdirApp.UseAuthorization();
+
                 subdirApp.UseEndpoints(endpoints =>
                 {
                     endpoints.MapBlazorHub(typeof(Index), selector: "root");
@@ -90,6 +92,9 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 subdirApp.UsePathBase("/prerendered");
                 subdirApp.UseStaticFiles();
                 subdirApp.UseRouting();
+
+                subdirApp.UseAuthorization();
+
                 subdirApp.UseEndpoints(endpoints =>
                 {
                     endpoints.MapFallbackToPage("/PrerenderedHost");

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ public static ComponentEndpointConventionBuilder MapBlazorHub(this IEndpointRout`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`endpoints.MapStartCircuitEndpoint(ComponentHub.DefaultPath + "/start");`
`52`		`- return new ComponentEndpointConventionBuilder(endpoints.MapHub<ComponentHub>(ComponentHub.DefaultPath, configureOptions));`
	`52`	`+ return new ComponentEndpointConventionBuilder(endpoints.MapHub<ComponentHub>(ComponentHub.DefaultPath, configureOptions))`
	`53`	`+ .RequireAuthorization(CircuitAuthenticationHandler.AuthenticationType);`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`/// <summary>`