mirror of
https://github.com/aspnet/JavaScriptServices.git
synced 2025-12-22 17:47:53 +00:00
Create a new shared package, Microsoft.AspNet.SpaServices, to hold MapSpaFallbackRoute (and other common infrastructure yet to be added)
This commit is contained in:
@@ -26,7 +26,8 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7",
|
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7",
|
||||||
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*"
|
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*",
|
||||||
|
"Microsoft.AspNet.SpaServices": "1.0.0-alpha7"
|
||||||
},
|
},
|
||||||
"resource": [
|
"resource": [
|
||||||
"Content/**/*"
|
"Content/**/*"
|
||||||
|
|||||||
1
Microsoft.AspNet.SpaServices/.gitignore
vendored
Normal file
1
Microsoft.AspNet.SpaServices/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/bin/
|
||||||
32
Microsoft.AspNet.SpaServices/SpaRouteConstraint.cs
Normal file
32
Microsoft.AspNet.SpaServices/SpaRouteConstraint.cs
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Microsoft.AspNet.Http;
|
||||||
|
using Microsoft.AspNet.Routing;
|
||||||
|
|
||||||
|
namespace Microsoft.AspNet.SpaServices
|
||||||
|
{
|
||||||
|
internal class SpaRouteConstraint : IRouteConstraint
|
||||||
|
{
|
||||||
|
private readonly string clientRouteTokenName;
|
||||||
|
|
||||||
|
public SpaRouteConstraint(string clientRouteTokenName) {
|
||||||
|
if (string.IsNullOrEmpty(clientRouteTokenName)) {
|
||||||
|
throw new ArgumentException("Value cannot be null or empty", "clientRouteTokenName");
|
||||||
|
}
|
||||||
|
|
||||||
|
this.clientRouteTokenName = clientRouteTokenName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool Match(HttpContext httpContext, IRouter route, string routeKey, IDictionary<string, object> values, RouteDirection routeDirection)
|
||||||
|
{
|
||||||
|
var clientRouteValue = (values[this.clientRouteTokenName] as string) ?? string.Empty;
|
||||||
|
return !HasDotInLastSegment(clientRouteValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool HasDotInLastSegment(string uri)
|
||||||
|
{
|
||||||
|
var lastSegmentStartPos = uri.LastIndexOf('/');
|
||||||
|
return uri.IndexOf('.', lastSegmentStartPos + 1) >= 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
53
Microsoft.AspNet.SpaServices/SpaRouteExtensions.cs
Normal file
53
Microsoft.AspNet.SpaServices/SpaRouteExtensions.cs
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Microsoft.AspNet.Routing;
|
||||||
|
using Microsoft.AspNet.SpaServices;
|
||||||
|
|
||||||
|
// Putting in this namespace so it's always available whenever MapRoute is
|
||||||
|
namespace Microsoft.AspNet.Builder
|
||||||
|
{
|
||||||
|
public static class SpaRouteExtensions
|
||||||
|
{
|
||||||
|
private const string ClientRouteTokenName = "clientRoute";
|
||||||
|
|
||||||
|
public static void MapSpaFallbackRoute(this IRouteBuilder routeBuilder, string name, object defaults, object constraints = null, object dataTokens = null)
|
||||||
|
{
|
||||||
|
MapSpaFallbackRoute(routeBuilder, name, /* templatePrefix */ (string)null, defaults, constraints, dataTokens);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void MapSpaFallbackRoute(this IRouteBuilder routeBuilder, string name, string templatePrefix, object defaults, object constraints = null, object dataTokens = null)
|
||||||
|
{
|
||||||
|
var template = CreateRouteTemplate(templatePrefix);
|
||||||
|
|
||||||
|
var constraintsDict = ObjectToDictionary(constraints);
|
||||||
|
constraintsDict.Add(ClientRouteTokenName, new SpaRouteConstraint(ClientRouteTokenName));
|
||||||
|
|
||||||
|
routeBuilder.MapRoute(name, template, defaults, constraintsDict, dataTokens);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string CreateRouteTemplate(string templatePrefix)
|
||||||
|
{
|
||||||
|
templatePrefix = templatePrefix ?? string.Empty;
|
||||||
|
|
||||||
|
if (templatePrefix.Contains("?")) {
|
||||||
|
// TODO: Consider supporting this. The {*clientRoute} part should be added immediately before the '?'
|
||||||
|
throw new ArgumentException("SPA fallback route templates don't support querystrings");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (templatePrefix.Contains("#")) {
|
||||||
|
throw new ArgumentException("SPA fallback route templates should not include # characters. The hash part of a URI does not get sent to the server.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (templatePrefix != string.Empty && !templatePrefix.EndsWith("/")) {
|
||||||
|
templatePrefix += "/";
|
||||||
|
}
|
||||||
|
|
||||||
|
return templatePrefix + $"{{*{ ClientRouteTokenName }}}";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static IDictionary<string, object> ObjectToDictionary(object value)
|
||||||
|
{
|
||||||
|
return value as IDictionary<string, object> ?? new RouteValueDictionary(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
22
Microsoft.AspNet.SpaServices/project.json
Normal file
22
Microsoft.AspNet.SpaServices/project.json
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"version": "1.0.0-alpha7",
|
||||||
|
"description": "Microsoft.AspNet.SpaServices",
|
||||||
|
"authors": [
|
||||||
|
"Microsoft"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
""
|
||||||
|
],
|
||||||
|
"projectUrl": "",
|
||||||
|
"licenseUrl": "",
|
||||||
|
"dependencies": {
|
||||||
|
"Microsoft.AspNet.Routing": "1.0.0-rc1-*"
|
||||||
|
},
|
||||||
|
"frameworks": {
|
||||||
|
"dnx451": {},
|
||||||
|
"dnxcore50": {
|
||||||
|
"dependencies": {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,9 +3,7 @@ using System.Collections.Generic;
|
|||||||
using Microsoft.AspNet.Authorization;
|
using Microsoft.AspNet.Authorization;
|
||||||
using Microsoft.AspNet.Builder;
|
using Microsoft.AspNet.Builder;
|
||||||
using Microsoft.AspNet.Hosting;
|
using Microsoft.AspNet.Hosting;
|
||||||
using Microsoft.AspNet.Http;
|
|
||||||
using Microsoft.AspNet.Identity.EntityFramework;
|
using Microsoft.AspNet.Identity.EntityFramework;
|
||||||
using Microsoft.AspNet.Routing;
|
|
||||||
using Microsoft.Data.Entity;
|
using Microsoft.Data.Entity;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
@@ -125,61 +123,4 @@ namespace MusicStore
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
internal static class SpaRouteExtensions {
|
|
||||||
private const string ClientRouteTokenName = "clientRoute";
|
|
||||||
|
|
||||||
public static void MapSpaFallbackRoute(this IRouteBuilder routeBuilder, string name, object defaults, object constraints = null, object dataTokens = null) {
|
|
||||||
MapSpaFallbackRoute(routeBuilder, name, /* templatePrefix */ (string)null, defaults, constraints, dataTokens);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void MapSpaFallbackRoute(this IRouteBuilder routeBuilder, string name, string templatePrefix, object defaults, object constraints = null, object dataTokens = null)
|
|
||||||
{
|
|
||||||
var template = CreateRouteTemplate(templatePrefix);
|
|
||||||
|
|
||||||
var constraintsDict = ObjectToDictionary(constraints);
|
|
||||||
constraintsDict.Add(ClientRouteTokenName, new SpaRouteConstraint());
|
|
||||||
|
|
||||||
routeBuilder.MapRoute(name, template, defaults, constraintsDict, dataTokens);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string CreateRouteTemplate(string templatePrefix)
|
|
||||||
{
|
|
||||||
templatePrefix = templatePrefix ?? string.Empty;
|
|
||||||
|
|
||||||
if (templatePrefix.Contains("?")) {
|
|
||||||
// TODO: Consider supporting this. The {*clientRoute} part should be added immediately before the '?'
|
|
||||||
throw new ArgumentException("SPA fallback route templates don't support querystrings");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (templatePrefix.Contains("#")) {
|
|
||||||
throw new ArgumentException("SPA fallback route templates should not include # characters. The hash part of a URI does not get sent to the server.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (templatePrefix != string.Empty && !templatePrefix.EndsWith("/")) {
|
|
||||||
templatePrefix += "/";
|
|
||||||
}
|
|
||||||
|
|
||||||
return templatePrefix + $"{{*{ ClientRouteTokenName }}}";
|
|
||||||
}
|
|
||||||
|
|
||||||
private static IDictionary<string, object> ObjectToDictionary(object value)
|
|
||||||
{
|
|
||||||
return value as IDictionary<string, object> ?? new RouteValueDictionary(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
private class SpaRouteConstraint : IRouteConstraint
|
|
||||||
{
|
|
||||||
public bool Match(HttpContext httpContext, IRouter route, string routeKey, IDictionary<string, object> values, RouteDirection routeDirection)
|
|
||||||
{
|
|
||||||
var clientRouteValue = (values[ClientRouteTokenName] as string) ?? string.Empty;
|
|
||||||
return !HasDotInLastSegment(clientRouteValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool HasDotInLastSegment(string uri)
|
|
||||||
{
|
|
||||||
var lastSegmentStartPos = uri.LastIndexOf('/');
|
|
||||||
return uri.IndexOf('.', lastSegmentStartPos + 1) >= 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user