From 92429ce1469985cce8099fea4395c14c0d07f785 Mon Sep 17 00:00:00 2001
From: Joe DeCock <josephdecock@gmail.com>
Date: Wed, 18 Dec 2024 13:03:33 -0600
Subject: [PATCH 1/3] Add support for .NET 9
---
.vscode/launch.json | 21 ++++++
.vscode/tasks.json | 12 +++
Directory.Build.targets | 74 +++++++++++--------
samples/Api.DPoP/Api.DPoP.csproj | 7 --
samples/Api.Isolated/Api.Isolated.csproj | 7 --
samples/Api/Api.csproj | 7 --
samples/JS.Yarp/JS.Yarp.csproj | 6 +-
samples/JS8/JS8.csproj | 2 +-
.../Duende.Bff.EntityFramework.csproj | 2 +-
src/Duende.Bff.Yarp/Duende.Bff.Yarp.csproj | 3 +-
src/Duende.Bff/Duende.Bff.csproj | 2 +-
.../Duende.Bff.EntityFramework.Tests.csproj | 2 +-
test/Duende.Bff.Tests/Duende.Bff.Tests.csproj | 2 +-
.../TestFramework/MockClock.cs | 15 ----
14 files changed, 85 insertions(+), 77 deletions(-)
delete mode 100644 test/Duende.Bff.Tests/TestFramework/MockClock.cs
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 513c5999..bed274a1 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -93,6 +93,27 @@
"order": 40
}
},
+ {
+ "name": "JS.Yarp",
+ "type": "coreclr",
+ "request": "launch",
+ "preLaunchTask": "build-jsyarp",
+ "program": "${workspaceFolder}/samples/JS.Yarp/bin/Debug/net9.0/JS.Yarp.dll",
+ "args": [],
+ "cwd": "${workspaceFolder}/samples/JS.Yarp",
+ "env": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ },
+ "serverReadyAction": {
+ "action": "openExternally",
+ "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+ },
+ "console": "externalTerminal",
+ "presentation": {
+ "hidden": false,
+ "order": 10
+ }
+ },
{
"name": "JS8",
"type": "coreclr",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 5f49968d..9ad7f7e0 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -85,6 +85,18 @@
],
"problemMatcher": "$msCompile"
},
+ {
+ "label": "build-jsyarp",
+ "type": "process",
+ "command": "dotnet",
+ "args": [
+ "build",
+ "${workspaceFolder}/samples/JS.Yarp/JS.Yarp.csproj",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
{
"label": "build-js8dpop",
"type": "process",
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 6e4b28cf..4438f085 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,50 +1,62 @@
<Project>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0'">
- <FrameworkVersionRuntime>8.0.0</FrameworkVersionRuntime>
- <FrameworkVersionTesting>8.0.11</FrameworkVersionTesting>
- <WilsonVersion>8.0.1</WilsonVersion>
+ <AspNetCoreVersion>8.0.1</AspNetCoreVersion>
+ <!-- Need EF to be at least 8.0.10 so that 'Microsoft.Extensions.Caching.Memory' is at least 8.0.1, which addresses a known high severity vulnerability -->
+ <EFCoreVersion>8.0.10</EFCoreVersion>
+ <IdentityServerVersion>7.1.0-rc.1</IdentityServerVersion>
+ <MicrosoftExtensionsVersion>8.0.1</MicrosoftExtensionsVersion>
+ <YarpVersion>2.1.0</YarpVersion>
+ </PropertyGroup>
+
+ <PropertyGroup Condition=" '$(TargetFramework)' == 'net9.0'">
+ <AspNetCoreVersion>9.0.0</AspNetCoreVersion>
+ <EFCoreVersion>9.0.0</EFCoreVersion>
+ <IdentityServerVersion>7.1.0-rc.1</IdentityServerVersion>
+ <MicrosoftExtensionsVersion>9.0.0</MicrosoftExtensionsVersion>
<YarpVersion>2.1.0</YarpVersion>
- <IdentityServerVersion>7.1.0-preview.1</IdentityServerVersion>
</PropertyGroup>
<ItemGroup>
- <!-- build -->
+ <!-- Build -->
<PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
- <!-- runtime -->
+ <!-- Duende -->
+ <PackageReference Update="Duende.AccessTokenManagement.OpenIdConnect" Version="3.1.1" />
<PackageReference Update="Duende.IdentityModel" Version="7.0.0" />
- <PackageReference Update="Duende.AccessTokenManagement.OpenIdConnect" Version="3.1.0-preview.1" />
- <!-- Need this version because so 'Microsoft.Extensions.Caching.Memory' is at least 8.0.1 that addresses known high severity vulnerability -->
- <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
- <PackageReference Update="Microsoft.Extensions.Http" Version="$(FrameworkVersionRuntime)" />
- <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly" Version="$(FrameworkVersionRuntime)" />
- <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(FrameworkVersionRuntime)" />
- <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(FrameworkVersionRuntime)" />
- <PackageReference Update="Microsoft.AspNetCore.Components.Authorization" Version="$(FrameworkVersionRuntime)" />
- <PackageReference Update="Yarp.ReverseProxy" Version="$(YarpVersion)" />
+ <PackageReference Update="Duende.IdentityServer" Version="$(IdentityServerVersion)" />
- <!-- samples -->
+ <!-- ASP.NET Core -->
+ <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNetCoreVersion)" />
+ <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(AspNetCoreVersion)" />
+ <PackageReference Update="Microsoft.AspNet Core.Components.WebAssembly" Version="$(AspNetCoreVersion)" />
+ <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(AspNetCoreVersion)" />
+ <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(AspNetCoreVersion)" />
+ <PackageReference Update="Microsoft.AspNetCore.Components.Authorization" Version="$(AspNetCoreVersion)" />
+
+ <!-- Entity Framework Core -->
+ <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
+ <PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
+
+ <!-- Microsoft Extensions -->
+ <PackageReference Update="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsVersion)" />
+
+ <!-- Other -->
+ <PackageReference Update="Yarp.ReverseProxy" Version="$(YarpVersion)" />
<PackageReference Update="Serilog.AspNetCore" Version="8.0.3" />
- <PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="$(WilsonVersion)" />
- <PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="$(WilsonVersion)" />
-
- <!-- testing -->
- <PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="$(FrameworkVersionTesting)" />
- <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(FrameworkVersionTesting)" />
- <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(FrameworkVersionTesting)" />
- <PackageReference Update="Microsoft.Extensions.TimeProvider.Testing" Version="$(FrameworkVersionTesting)" />
-
- <PackageReference Update="Duende.IdentityServer" Version="$(IdentityServerVersion)" />
-
- <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.12.0" />
- <PackageReference Update="xunit" Version="2.9.2" />
- <PackageReference Update="xunit.runner.visualstudio" Version="2.8.2">
+
+
+ <!-- Testing -->
+ <PackageReference Update="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Update="FluentAssertions" Version="6.7.0" />
- <PackageReference Update="coverlet.collector" Version="6.0.0">
+ <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(AspNetCoreVersion)" />
+ <PackageReference Update="Microsoft.Extensions.TimeProvider.Testing" Version="8.8.0" />
+ <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+ <PackageReference Update="xunit" Version="2.9.2" />
+ <PackageReference Update="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
diff --git a/samples/Api.DPoP/Api.DPoP.csproj b/samples/Api.DPoP/Api.DPoP.csproj
index c0ecfb4c..320cd356 100644
--- a/samples/Api.DPoP/Api.DPoP.csproj
+++ b/samples/Api.DPoP/Api.DPoP.csproj
@@ -9,11 +9,4 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Serilog.AspNetCore" />
</ItemGroup>
-
- <ItemGroup>
- <!-- These are included because the JwtBearer handler has a transitive
- dependency on lower versions that have vulnerabilities -->
- <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
- <PackageReference Include="System.IdentityModel.Tokens.Jwt" />
- </ItemGroup>
</Project>
diff --git a/samples/Api.Isolated/Api.Isolated.csproj b/samples/Api.Isolated/Api.Isolated.csproj
index c0ecfb4c..320cd356 100644
--- a/samples/Api.Isolated/Api.Isolated.csproj
+++ b/samples/Api.Isolated/Api.Isolated.csproj
@@ -9,11 +9,4 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Serilog.AspNetCore" />
</ItemGroup>
-
- <ItemGroup>
- <!-- These are included because the JwtBearer handler has a transitive
- dependency on lower versions that have vulnerabilities -->
- <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
- <PackageReference Include="System.IdentityModel.Tokens.Jwt" />
- </ItemGroup>
</Project>
diff --git a/samples/Api/Api.csproj b/samples/Api/Api.csproj
index c0ecfb4c..320cd356 100644
--- a/samples/Api/Api.csproj
+++ b/samples/Api/Api.csproj
@@ -9,11 +9,4 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Serilog.AspNetCore" />
</ItemGroup>
-
- <ItemGroup>
- <!-- These are included because the JwtBearer handler has a transitive
- dependency on lower versions that have vulnerabilities -->
- <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
- <PackageReference Include="System.IdentityModel.Tokens.Jwt" />
- </ItemGroup>
</Project>
diff --git a/samples/JS.Yarp/JS.Yarp.csproj b/samples/JS.Yarp/JS.Yarp.csproj
index 7dbe7ab2..d6867d24 100644
--- a/samples/JS.Yarp/JS.Yarp.csproj
+++ b/samples/JS.Yarp/JS.Yarp.csproj
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFramework>net9.0</TargetFramework>
<RootNamespace>YARP</RootNamespace>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.4" />
- <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+ <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
+ <PackageReference Include="Serilog.AspNetCore" />
</ItemGroup>
<ItemGroup>
diff --git a/samples/JS8/JS8.csproj b/samples/JS8/JS8.csproj
index 105c2dd9..e2b9267b 100644
--- a/samples/JS8/JS8.csproj
+++ b/samples/JS8/JS8.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFrameworks>net8.0</TargetFrameworks>
<RootNamespace>Host8</RootNamespace>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/src/Duende.Bff.EntityFramework/Duende.Bff.EntityFramework.csproj b/src/Duende.Bff.EntityFramework/Duende.Bff.EntityFramework.csproj
index 4d4ed251..2759c66c 100644
--- a/src/Duende.Bff.EntityFramework/Duende.Bff.EntityFramework.csproj
+++ b/src/Duende.Bff.EntityFramework/Duende.Bff.EntityFramework.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net8.0</TargetFrameworks>
+ <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<LangVersion>latest</LangVersion>
diff --git a/src/Duende.Bff.Yarp/Duende.Bff.Yarp.csproj b/src/Duende.Bff.Yarp/Duende.Bff.Yarp.csproj
index b0285d6a..e3f1a12f 100644
--- a/src/Duende.Bff.Yarp/Duende.Bff.Yarp.csproj
+++ b/src/Duende.Bff.Yarp/Duende.Bff.Yarp.csproj
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
- <TargetFrameworks>net8.0</TargetFrameworks>
+ <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
diff --git a/src/Duende.Bff/Duende.Bff.csproj b/src/Duende.Bff/Duende.Bff.csproj
index d7ae70e4..02e45ffa 100644
--- a/src/Duende.Bff/Duende.Bff.csproj
+++ b/src/Duende.Bff/Duende.Bff.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net8.0</TargetFrameworks>
+ <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
diff --git a/test/Duende.Bff.EntityFramework.Tests/Duende.Bff.EntityFramework.Tests.csproj b/test/Duende.Bff.EntityFramework.Tests/Duende.Bff.EntityFramework.Tests.csproj
index e4d29cc7..c2fe1303 100644
--- a/test/Duende.Bff.EntityFramework.Tests/Duende.Bff.EntityFramework.Tests.csproj
+++ b/test/Duende.Bff.EntityFramework.Tests/Duende.Bff.EntityFramework.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net8.0</TargetFrameworks>
+ <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
diff --git a/test/Duende.Bff.Tests/Duende.Bff.Tests.csproj b/test/Duende.Bff.Tests/Duende.Bff.Tests.csproj
index e6ad1916..696bddee 100644
--- a/test/Duende.Bff.Tests/Duende.Bff.Tests.csproj
+++ b/test/Duende.Bff.Tests/Duende.Bff.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net8.0</TargetFrameworks>
+ <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
diff --git a/test/Duende.Bff.Tests/TestFramework/MockClock.cs b/test/Duende.Bff.Tests/TestFramework/MockClock.cs
deleted file mode 100644
index f679cee1..00000000
--- a/test/Duende.Bff.Tests/TestFramework/MockClock.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-using Microsoft.AspNetCore.Authentication;
-using System;
-
-#if !NET8_0
-namespace Duende.Bff.Tests.TestFramework
-{
- public class MockClock : ISystemClock
- {
- public DateTimeOffset UtcNow { get; set; }
- }
-}
-#endif
\ No newline at end of file
From 6a21563367771312ab061592106a045754e54122 Mon Sep 17 00:00:00 2001
From: Joe DeCock <josephdecock@gmail.com>
Date: Wed, 18 Dec 2024 20:13:36 -0600
Subject: [PATCH 2/3] Use Duende.AspNetCore.Authentication.JwtBearer for DPoP
Sample
---
samples/Api.DPoP/Api.DPoP.csproj | 2 +-
.../DPoP/ConfigureJwtBearerOptions.cs | 35 --
samples/Api.DPoP/DPoP/DPoPExtensions.cs | 81 ---
samples/Api.DPoP/DPoP/DPoPJwtBearerEvents.cs | 153 ------
samples/Api.DPoP/DPoP/DPoPMode.cs | 13 -
samples/Api.DPoP/DPoP/DPoPOptions.cs | 15 -
.../DPoP/DPoPProofValidatonContext.cs | 32 --
.../Api.DPoP/DPoP/DPoPProofValidatonResult.cs | 68 ---
samples/Api.DPoP/DPoP/DPoPProofValidator.cs | 482 ------------------
.../DPoP/DPoPServiceCollectionExtensions.cs | 30 --
samples/Api.DPoP/DPoP/DefaultReplayCache.cs | 41 --
samples/Api.DPoP/DPoP/IReplayCache.cs | 25 -
samples/Api.DPoP/Startup.cs | 1 +
13 files changed, 2 insertions(+), 976 deletions(-)
delete mode 100644 samples/Api.DPoP/DPoP/ConfigureJwtBearerOptions.cs
delete mode 100644 samples/Api.DPoP/DPoP/DPoPExtensions.cs
delete mode 100644 samples/Api.DPoP/DPoP/DPoPJwtBearerEvents.cs
delete mode 100644 samples/Api.DPoP/DPoP/DPoPMode.cs
delete mode 100644 samples/Api.DPoP/DPoP/DPoPOptions.cs
delete mode 100644 samples/Api.DPoP/DPoP/DPoPProofValidatonContext.cs
delete mode 100644 samples/Api.DPoP/DPoP/DPoPProofValidatonResult.cs
delete mode 100644 samples/Api.DPoP/DPoP/DPoPProofValidator.cs
delete mode 100644 samples/Api.DPoP/DPoP/DPoPServiceCollectionExtensions.cs
delete mode 100644 samples/Api.DPoP/DPoP/DefaultReplayCache.cs
delete mode 100644 samples/Api.DPoP/DPoP/IReplayCache.cs
diff --git a/samples/Api.DPoP/Api.DPoP.csproj b/samples/Api.DPoP/Api.DPoP.csproj
index 320cd356..bbc506a5 100644
--- a/samples/Api.DPoP/Api.DPoP.csproj
+++ b/samples/Api.DPoP/Api.DPoP.csproj
@@ -6,7 +6,7 @@
<ItemGroup>
<PackageReference Include="Duende.IdentityModel" />
- <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+ <PackageReference Include="Duende.AspNetCore.Authentication.JwtBearer" Version="0.1.3" />
<PackageReference Include="Serilog.AspNetCore" />
</ItemGroup>
</Project>
diff --git a/samples/Api.DPoP/DPoP/ConfigureJwtBearerOptions.cs b/samples/Api.DPoP/DPoP/ConfigureJwtBearerOptions.cs
deleted file mode 100644
index 2ed9664f..00000000
--- a/samples/Api.DPoP/DPoP/ConfigureJwtBearerOptions.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.Extensions.Options;
-using System;
-
-namespace Api.DPoP;
-
-public class ConfigureJwtBearerOptions : IPostConfigureOptions<JwtBearerOptions>
-{
- private readonly string _configScheme;
-
- public ConfigureJwtBearerOptions(string configScheme)
- {
- _configScheme = configScheme;
- }
-
- public void PostConfigure(string name, JwtBearerOptions options)
- {
- if (_configScheme == name)
- {
- if (options.EventsType != null && !typeof(DPoPJwtBearerEvents).IsAssignableFrom(options.EventsType))
- {
- throw new Exception("EventsType on JwtBearerOptions must derive from DPoPJwtBearerEvents to work with the DPoP support.");
- }
- if (options.Events != null && !typeof(DPoPJwtBearerEvents).IsAssignableFrom(options.Events.GetType()))
- {
- throw new Exception("Events on JwtBearerOptions must derive from DPoPJwtBearerEvents to work with the DPoP support.");
- }
-
- if (options.Events == null && options.EventsType == null)
- {
- options.EventsType = typeof(DPoPJwtBearerEvents);
- }
- }
- }
-}
diff --git a/samples/Api.DPoP/DPoP/DPoPExtensions.cs b/samples/Api.DPoP/DPoP/DPoPExtensions.cs
deleted file mode 100644
index ec7eaed1..00000000
--- a/samples/Api.DPoP/DPoP/DPoPExtensions.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using Duende.IdentityModel;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Http;
-using Microsoft.IdentityModel.Tokens;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-
-namespace Api.DPoP;
-
-/// <summary>
-/// Extensions methods for DPoP
-/// </summary>
-static class DPoPExtensions
-{
- const string DPoPPrefix = OidcConstants.AuthenticationSchemes.AuthorizationHeaderDPoP + " ";
-
- public static bool IsDPoPAuthorizationScheme(this HttpRequest request)
- {
- var authz = request.Headers.Authorization.FirstOrDefault();
- return authz?.StartsWith(DPoPPrefix, System.StringComparison.Ordinal) == true;
- }
-
- public static bool TryGetDPoPAccessToken(this HttpRequest request, out string token)
- {
- token = null;
-
- var authz = request.Headers.Authorization.FirstOrDefault();
- if (authz?.StartsWith(DPoPPrefix, System.StringComparison.Ordinal) == true)
- {
- token = authz[DPoPPrefix.Length..].Trim();
- return true;
- }
- return false;
- }
-
- public static string GetAuthorizationScheme(this HttpRequest request)
- {
- return request.Headers.Authorization.FirstOrDefault()?.Split(' ', System.StringSplitOptions.RemoveEmptyEntries)[0];
- }
-
- public static string GetDPoPProofToken(this HttpRequest request)
- {
- return request.Headers[OidcConstants.HttpHeaders.DPoP].FirstOrDefault();
- }
-
- public static string GetDPoPNonce(this AuthenticationProperties props)
- {
- if (props.Items.ContainsKey("DPoP-Nonce"))
- {
- return props.Items["DPoP-Nonce"] as string;
- }
- return null;
- }
- public static void SetDPoPNonce(this AuthenticationProperties props, string nonce)
- {
- props.Items["DPoP-Nonce"] = nonce;
- }
-
- /// <summary>
- /// Create the value of a thumbprint-based cnf claim
- /// </summary>
- public static string CreateThumbprintCnf(this JsonWebKey jwk)
- {
- var jkt = jwk.CreateThumbprint();
- var values = new Dictionary<string, string>
- {
- { JwtClaimTypes.ConfirmationMethods.JwkThumbprint, jkt }
- };
- return JsonSerializer.Serialize(values);
- }
-
- /// <summary>
- /// Create the value of a thumbprint
- /// </summary>
- public static string CreateThumbprint(this JsonWebKey jwk)
- {
- var jkt = Base64Url.Encode(jwk.ComputeJwkThumbprint());
- return jkt;
- }
-}
diff --git a/samples/Api.DPoP/DPoP/DPoPJwtBearerEvents.cs b/samples/Api.DPoP/DPoP/DPoPJwtBearerEvents.cs
deleted file mode 100644
index 8a8b1c0e..00000000
--- a/samples/Api.DPoP/DPoP/DPoPJwtBearerEvents.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-using Duende.IdentityModel;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Options;
-using Microsoft.Net.Http.Headers;
-using System.Text;
-using System.Threading.Tasks;
-using static Duende.IdentityModel.OidcConstants;
-
-namespace Api.DPoP;
-
-public class DPoPJwtBearerEvents : JwtBearerEvents
-{
- private readonly IOptionsMonitor<DPoPOptions> _optionsMonitor;
- private readonly DPoPProofValidator _validator;
-
- public DPoPJwtBearerEvents(IOptionsMonitor<DPoPOptions> optionsMonitor, DPoPProofValidator validator)
- {
- _optionsMonitor = optionsMonitor;
- _validator = validator;
- }
-
- public override Task MessageReceived(MessageReceivedContext context)
- {
- var dpopOptions = _optionsMonitor.Get(context.Scheme.Name);
-
- if (context.HttpContext.Request.TryGetDPoPAccessToken(out var token))
- {
- context.Token = token;
- }
- else if (dpopOptions.Mode == DPoPMode.DPoPOnly)
- {
- // this rejects the attempt for this handler,
- // since we don't want to attempt Bearer given the Mode
- context.NoResult();
- }
-
- return Task.CompletedTask;
- }
-
- public override async Task TokenValidated(TokenValidatedContext context)
- {
- var dpopOptions = _optionsMonitor.Get(context.Scheme.Name);
-
- if (context.HttpContext.Request.TryGetDPoPAccessToken(out var at))
- {
- var proofToken = context.HttpContext.Request.GetDPoPProofToken();
- var result = await _validator.ValidateAsync(new DPoPProofValidatonContext
- {
- Scheme = context.Scheme.Name,
- ProofToken = proofToken,
- AccessToken = at,
- Method = context.HttpContext.Request.Method,
- Url = context.HttpContext.Request.Scheme + "://" + context.HttpContext.Request.Host + context.HttpContext.Request.PathBase + context.HttpContext.Request.Path
- });
-
- if (result.IsError)
- {
- // fails the result
- context.Fail(result.ErrorDescription ?? result.Error);
-
- // we need to stash these values away so they are available later when the Challenge method is called later
- context.HttpContext.Items["DPoP-Error"] = result.Error;
- if (!string.IsNullOrWhiteSpace(result.ErrorDescription))
- {
- context.HttpContext.Items["DPoP-ErrorDescription"] = result.ErrorDescription;
- }
- if (!string.IsNullOrWhiteSpace(result.ServerIssuedNonce))
- {
- context.HttpContext.Items["DPoP-Nonce"] = result.ServerIssuedNonce;
- }
- }
- }
- else if (dpopOptions.Mode == DPoPMode.DPoPAndBearer)
- {
- // if the scheme used was not DPoP, then it was Bearer
- // and if a access token was presented with a cnf, then the
- // client should have sent it as DPoP, so we fail the request
- if (context.Principal.HasClaim(x => x.Type == JwtClaimTypes.Confirmation))
- {
- context.HttpContext.Items["Bearer-ErrorDescription"] = "Must use DPoP when using an access token with a 'cnf' claim";
- context.Fail("Must use DPoP when using an access token with a 'cnf' claim");
- }
- }
- }
-
- public override Task Challenge(JwtBearerChallengeContext context)
- {
- var dpopOptions = _optionsMonitor.Get(context.Scheme.Name);
-
- if (dpopOptions.Mode == DPoPMode.DPoPOnly)
- {
- // if we are using DPoP only, then we don't need/want the default
- // JwtBearerHandler to add its WWW-Authenticate response header
- // so we have to set the status code ourselves
- context.Response.StatusCode = 401;
- context.HandleResponse();
- }
- else if (context.HttpContext.Items.ContainsKey("Bearer-ErrorDescription"))
- {
- var description = context.HttpContext.Items["Bearer-ErrorDescription"] as string;
- context.ErrorDescription = description;
- }
-
- if (context.HttpContext.Request.IsDPoPAuthorizationScheme())
- {
- // if we are challening due to dpop, then don't allow bearer www-auth to emit an error
- context.Error = null;
- }
-
- // now we always want to add our WWW-Authenticate for DPoP
- // For example:
- // WWW-Authenticate: DPoP error="invalid_dpop_proof", error_description="Invalid 'iat' value."
- var sb = new StringBuilder();
- sb.Append(OidcConstants.AuthenticationSchemes.AuthorizationHeaderDPoP);
-
- if (context.HttpContext.Items.ContainsKey("DPoP-Error"))
- {
- var error = context.HttpContext.Items["DPoP-Error"] as string;
- sb.Append(" error=\"");
- sb.Append(error);
- sb.Append('\"');
-
- if (context.HttpContext.Items.ContainsKey("DPoP-ErrorDescription"))
- {
- var description = context.HttpContext.Items["DPoP-ErrorDescription"] as string;
-
- sb.Append(", error_description=\"");
- sb.Append(description);
- sb.Append('\"');
- }
- }
-
- context.Response.Headers.Append(HeaderNames.WWWAuthenticate, sb.ToString());
-
-
- if (context.HttpContext.Items.ContainsKey("DPoP-Nonce"))
- {
- var nonce = context.HttpContext.Items["DPoP-Nonce"] as string;
- context.Response.Headers[HttpHeaders.DPoPNonce] = nonce;
- }
- else
- {
- var nonce = context.Properties.GetDPoPNonce();
- if (nonce != null)
- {
- context.Response.Headers[HttpHeaders.DPoPNonce] = nonce;
- }
- }
-
- return Task.CompletedTask;
- }
-}
diff --git a/samples/Api.DPoP/DPoP/DPoPMode.cs b/samples/Api.DPoP/DPoP/DPoPMode.cs
deleted file mode 100644
index ea2bf17f..00000000
--- a/samples/Api.DPoP/DPoP/DPoPMode.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Api.DPoP;
-
-public enum DPoPMode
-{
- /// <summary>
- /// Only DPoP tokens will be accepted
- /// </summary>
- DPoPOnly,
- /// <summary>
- /// Both DPoP and Bearer tokens will be accepted
- /// </summary>
- DPoPAndBearer
-}
diff --git a/samples/Api.DPoP/DPoP/DPoPOptions.cs b/samples/Api.DPoP/DPoP/DPoPOptions.cs
deleted file mode 100644
index 00f154be..00000000
--- a/samples/Api.DPoP/DPoP/DPoPOptions.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace Api.DPoP;
-
-public class DPoPOptions
-{
- public DPoPMode Mode { get; set; } = DPoPMode.DPoPOnly;
-
- public TimeSpan ProofTokenValidityDuration { get; set; } = TimeSpan.FromSeconds(1);
- public TimeSpan ClientClockSkew { get; set; } = TimeSpan.FromMinutes(0);
- public TimeSpan ServerClockSkew { get; set; } = TimeSpan.FromMinutes(5);
-
- public bool ValidateIat { get; set; } = true;
- public bool ValidateNonce { get; set; } = false;
-}
diff --git a/samples/Api.DPoP/DPoP/DPoPProofValidatonContext.cs b/samples/Api.DPoP/DPoP/DPoPProofValidatonContext.cs
deleted file mode 100644
index 447f2b63..00000000
--- a/samples/Api.DPoP/DPoP/DPoPProofValidatonContext.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Collections.Generic;
-using System.Security.Claims;
-
-namespace Api.DPoP;
-
-public class DPoPProofValidatonContext
-{
- /// <summary>
- /// The ASP.NET Core authentication scheme triggering the validation
- /// </summary>
- public string Scheme { get; set; }
-
- /// <summary>
- /// The HTTP URL to validate
- /// </summary>
- public string Url { get; set; }
-
- /// <summary>
- /// The HTTP method to validate
- /// </summary>
- public string Method { get; set; }
-
- /// <summary>
- /// The DPoP proof token to validate
- /// </summary>
- public string ProofToken { get; set; }
-
- /// <summary>
- /// The access token
- /// </summary>
- public string AccessToken { get; set; }
-}
diff --git a/samples/Api.DPoP/DPoP/DPoPProofValidatonResult.cs b/samples/Api.DPoP/DPoP/DPoPProofValidatonResult.cs
deleted file mode 100644
index d8b9f57c..00000000
--- a/samples/Api.DPoP/DPoP/DPoPProofValidatonResult.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System.Collections.Generic;
-
-namespace Api.DPoP;
-
-public class DPoPProofValidatonResult
-{
- public static DPoPProofValidatonResult Success = new DPoPProofValidatonResult { IsError = false };
-
- /// <summary>
- /// Indicates if the result was successful or not
- /// </summary>
- public bool IsError { get; set; }
-
- /// <summary>
- /// The error code for the validation result
- /// </summary>
- public string Error { get; set; }
-
- /// <summary>
- /// The error description code for the validation result
- /// </summary>
- public string ErrorDescription { get; set; }
-
- /// <summary>
- /// The serialized JWK from the validated DPoP proof token.
- /// </summary>
- public string JsonWebKey { get; set; }
-
- /// <summary>
- /// The JWK thumbprint from the validated DPoP proof token.
- /// </summary>
- public string JsonWebKeyThumbprint { get; set; }
-
- /// <summary>
- /// The cnf value for the DPoP proof token
- /// </summary>
- public string Confirmation { get; set; }
-
- /// <summary>
- /// The payload value of the DPoP proof token.
- /// </summary>
- public IDictionary<string, object> Payload { get; internal set; }
-
- /// <summary>
- /// The jti value read from the payload.
- /// </summary>
- public string TokenId { get; set; }
-
- /// <summary>
- /// The ath value read from the payload.
- /// </summary>
- public string AccessTokenHash { get; set; }
-
- /// <summary>
- /// The nonce value read from the payload.
- /// </summary>
- public string Nonce { get; set; }
-
- /// <summary>
- /// The iat value read from the payload.
- /// </summary>
- public long? IssuedAt { get; set; }
-
- /// <summary>
- /// The nonce value issued by the server.
- /// </summary>
- public string ServerIssuedNonce { get; set; }
-}
diff --git a/samples/Api.DPoP/DPoP/DPoPProofValidator.cs b/samples/Api.DPoP/DPoP/DPoPProofValidator.cs
deleted file mode 100644
index eec53a55..00000000
--- a/samples/Api.DPoP/DPoP/DPoPProofValidator.cs
+++ /dev/null
@@ -1,482 +0,0 @@
-using Duende.IdentityModel;
-using Microsoft.AspNetCore.DataProtection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Microsoft.IdentityModel.JsonWebTokens;
-using Microsoft.IdentityModel.Tokens;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-
-namespace Api.DPoP;
-
-public class DPoPProofValidator
-{
- const string ReplayCachePurpose = "DPoPJwtBearerEvents-DPoPReplay-jti-";
- const string DataProtectorPurpose = "DPoPJwtBearerEvents-DPoPProofValidation-nonce";
-
- public readonly static IEnumerable<string> SupportedDPoPSigningAlgorithms = new[]
- {
- SecurityAlgorithms.RsaSha256,
- SecurityAlgorithms.RsaSha384,
- SecurityAlgorithms.RsaSha512,
-
- SecurityAlgorithms.RsaSsaPssSha256,
- SecurityAlgorithms.RsaSsaPssSha384,
- SecurityAlgorithms.RsaSsaPssSha512,
-
- SecurityAlgorithms.EcdsaSha256,
- SecurityAlgorithms.EcdsaSha384,
- SecurityAlgorithms.EcdsaSha512
- };
-
- protected readonly IOptionsMonitor<DPoPOptions> OptionsMonitor;
- protected readonly IDataProtector DataProtector;
- protected readonly IReplayCache ReplayCache;
- protected readonly ILogger<DPoPJwtBearerEvents> Logger;
-
- public DPoPProofValidator(IOptionsMonitor<DPoPOptions> optionsMonitor, IDataProtectionProvider dataProtectionProvider, IReplayCache replayCache, ILogger<DPoPJwtBearerEvents> logger)
- {
- OptionsMonitor = optionsMonitor;
- DataProtector = dataProtectionProvider.CreateProtector(DataProtectorPurpose);
- ReplayCache = replayCache;
- Logger = logger;
- }
-
- /// <inheritdoc/>
- public async Task<DPoPProofValidatonResult> ValidateAsync(DPoPProofValidatonContext context)
- {
- var result = new DPoPProofValidatonResult() { IsError = false };
-
- try
- {
- if (String.IsNullOrEmpty(context?.ProofToken))
- {
- result.IsError = true;
- result.ErrorDescription = "Missing DPoP proof value.";
- return result;
- }
-
- await ValidateHeaderAsync(context, result);
- if (result.IsError)
- {
- Logger.LogDebug("Failed to validate DPoP header");
- return result;
- }
-
- await ValidateSignatureAsync(context, result);
- if (result.IsError)
- {
- Logger.LogDebug("Failed to validate DPoP signature");
- return result;
- }
-
- await ValidatePayloadAsync(context, result);
- if (result.IsError)
- {
- Logger.LogDebug("Failed to validate DPoP payload");
- return result;
- }
-
- Logger.LogDebug("Successfully validated DPoP proof token");
- result.IsError = false;
- }
- finally
- {
- if (result.IsError)
- {
- result.Error = OidcConstants.TokenErrors.InvalidDPoPProof;
- }
- }
-
- return result;
- }
-
- /// <summary>
- /// Validates the header.
- /// </summary>
- protected virtual Task ValidateHeaderAsync(DPoPProofValidatonContext context, DPoPProofValidatonResult result)
- {
- JsonWebToken token;
-
- try
- {
- var handler = new JsonWebTokenHandler();
- token = handler.ReadJsonWebToken(context.ProofToken);
- }
- catch (Exception ex)
- {
- Logger.LogDebug("Error parsing DPoP token: {error}", ex.Message);
- result.IsError = true;
- result.ErrorDescription = "Malformed DPoP token.";
- return Task.CompletedTask;
- }
-
- if (!token.TryGetHeaderValue<string>("typ", out var typ) || typ != JwtClaimTypes.JwtTypes.DPoPProofToken)
- {
- result.IsError = true;
- result.ErrorDescription = "Invalid 'typ' value.";
- return Task.CompletedTask;
- }
-
- if (!token.TryGetHeaderValue<string>("alg", out var alg) || !SupportedDPoPSigningAlgorithms.Contains(alg))
- {
- result.IsError = true;
- result.ErrorDescription = "Invalid 'alg' value.";
- return Task.CompletedTask;
- }
-
- if (!token.TryGetHeaderValue<JsonElement>(JwtClaimTypes.JsonWebKey, out var jwkValues))
- {
- result.IsError = true;
- result.ErrorDescription = "Invalid 'jwk' value.";
- return Task.CompletedTask;
- }
-
- var jwkJson = JsonSerializer.Serialize(jwkValues);
-
- JsonWebKey jwk;
- try
- {
- jwk = new JsonWebKey(jwkJson);
- }
- catch (Exception ex)
- {
- Logger.LogDebug("Error parsing DPoP jwk value: {error}", ex.Message);
- result.IsError = true;
- result.ErrorDescription = "Invalid 'jwk' value.";
- return Task.CompletedTask;
- }
-
- if (jwk.HasPrivateKey)
- {
- result.IsError = true;
- result.ErrorDescription = "'jwk' value contains a private key.";
- return Task.CompletedTask;
- }
-
- result.JsonWebKey = jwkJson;
- result.JsonWebKeyThumbprint = jwk.CreateThumbprint();
- result.Confirmation = jwk.CreateThumbprintCnf();
-
- return Task.CompletedTask;
- }
-
- /// <summary>
- /// Validates the signature.
- /// </summary>
- protected virtual async Task ValidateSignatureAsync(DPoPProofValidatonContext context, DPoPProofValidatonResult result)
- {
- TokenValidationResult tokenValidationResult;
-
- try
- {
- var key = new JsonWebKey(result.JsonWebKey);
- var tvp = new TokenValidationParameters
- {
- ValidateAudience = false,
- ValidateIssuer = false,
- ValidateLifetime = false,
- IssuerSigningKey = key,
- };
-
- var handler = new JsonWebTokenHandler();
- tokenValidationResult = await handler.ValidateTokenAsync(context.ProofToken, tvp);
- }
- catch (Exception ex)
- {
- Logger.LogDebug("Error parsing DPoP token: {error}", ex.Message);
- result.IsError = true;
- result.ErrorDescription = "Invalid signature on DPoP token.";
- return;
- }
-
- if (tokenValidationResult.Exception != null)
- {
- Logger.LogDebug("Error parsing DPoP token: {error}", tokenValidationResult.Exception.Message);
- result.IsError = true;
- result.ErrorDescription = "Invalid signature on DPoP token.";
- return;
- }
-
- result.Payload = tokenValidationResult.Claims;
- }
-
- /// <summary>
- /// Validates the payload.
- /// </summary>
- protected virtual async Task ValidatePayloadAsync(DPoPProofValidatonContext context, DPoPProofValidatonResult result)
- {
- if (result.Payload.TryGetValue(JwtClaimTypes.DPoPAccessTokenHash, out var ath))
- {
- result.AccessTokenHash = ath as string;
- }
-
- if (String.IsNullOrEmpty(result.AccessTokenHash))
- {
- result.IsError = true;
- result.ErrorDescription = "Invalid 'ath' value.";
- return;
- }
-
- using (var sha = SHA256.Create())
- {
- var bytes = Encoding.UTF8.GetBytes(context.AccessToken);
- var hash = sha.ComputeHash(bytes);
-
- var accessTokenHash = Base64Url.Encode(hash);
- if (accessTokenHash != result.AccessTokenHash)
- {
- result.IsError = true;
- result.ErrorDescription = "Invalid 'ath' value.";
- return;
- }
- }
-
- if (result.Payload.TryGetValue(JwtClaimTypes.JwtId, out var jti))
- {
- result.TokenId = jti as string;
- }
-
- if (String.IsNullOrEmpty(result.TokenId))
- {
- result.IsError = true;
- result.ErrorDescription = "Invalid 'jti' value.";
- return;
- }
-
- if (!result.Payload.TryGetValue(JwtClaimTypes.DPoPHttpMethod, out var htm) || !context.Method.Equals(htm))
- {
- result.IsError = true;
- result.ErrorDescription = "Invalid 'htm' value.";
- return;
- }
-
- if (!result.Payload.TryGetValue(JwtClaimTypes.DPoPHttpUrl, out var htu) || !context.Url.Equals(htu))
- {
- result.IsError = true;
- result.ErrorDescription = "Invalid 'htu' value.";
- return;
- }
-
- if (result.Payload.TryGetValue(JwtClaimTypes.IssuedAt, out var iat))
- {
- if (iat is int)
- {
- result.IssuedAt = (int) iat;
- }
- if (iat is long)
- {
- result.IssuedAt = (long) iat;
- }
- }
-
- if (!result.IssuedAt.HasValue)
- {
- result.IsError = true;
- result.ErrorDescription = "Missing 'iat' value.";
- return;
- }
-
- if (result.Payload.TryGetValue(JwtClaimTypes.Nonce, out var nonce))
- {
- result.Nonce = nonce as string;
- }
-
- await ValidateFreshnessAsync(context, result);
- if (result.IsError)
- {
- Logger.LogDebug("Failed to validate DPoP token freshness");
- return;
- }
-
- // we do replay at the end so we only add to the reply cache if everything else is ok
- await ValidateReplayAsync(context, result);
- if (result.IsError)
- {
- Logger.LogDebug("Detected replay of DPoP token");
- return;
- }
- }
-
- /// <summary>
- /// Validates is the token has been replayed.
- /// </summary>
- protected virtual async Task ValidateReplayAsync(DPoPProofValidatonContext context, DPoPProofValidatonResult result)
- {
- var dpopOptions = OptionsMonitor.Get(context.Scheme);
-
- if (await ReplayCache.ExistsAsync(ReplayCachePurpose, result.TokenId))
- {
- result.IsError = true;
- result.ErrorDescription = "Detected DPoP proof token replay.";
- return;
- }
-
- // get largest skew based on how client's freshness is validated
- var validateIat = dpopOptions.ValidateIat;
- var validateNonce = dpopOptions.ValidateNonce;
- var skew = TimeSpan.Zero;
- if (validateIat && dpopOptions.ClientClockSkew > skew)
- {
- skew = dpopOptions.ClientClockSkew;
- }
- if (validateNonce && dpopOptions.ServerClockSkew > skew)
- {
- skew = dpopOptions.ServerClockSkew;
- }
-
- // we do x2 here because clock might be might be before or after, so we're making cache duration
- // longer than the likelyhood of proof token expiration, which is done before replay
- skew *= 2;
- var cacheDuration = dpopOptions.ProofTokenValidityDuration + skew;
- await ReplayCache.AddAsync(ReplayCachePurpose, result.TokenId, DateTimeOffset.UtcNow.Add(cacheDuration));
- }
-
- /// <summary>
- /// Validates the freshness.
- /// </summary>
- protected virtual async Task ValidateFreshnessAsync(DPoPProofValidatonContext context, DPoPProofValidatonResult result)
- {
- var dpopOptions = OptionsMonitor.Get(context.Scheme);
-
- var validateIat = dpopOptions.ValidateIat;
- if (validateIat)
- {
- await ValidateIatAsync(context, result);
- if (result.IsError)
- {
- return;
- }
- }
-
- var validateNonce = dpopOptions.ValidateNonce;
- if (validateNonce)
- {
- await ValidateNonceAsync(context, result);
- if (result.IsError)
- {
- return;
- }
- }
- }
-
- /// <summary>
- /// Validates the freshness of the iat value.
- /// </summary>
- protected virtual Task ValidateIatAsync(DPoPProofValidatonContext context, DPoPProofValidatonResult result)
- {
- var dpopOptions = OptionsMonitor.Get(context.Scheme);
-
- if (IsExpired(context, result, dpopOptions.ClientClockSkew, result.IssuedAt.Value))
- {
- result.IsError = true;
- result.ErrorDescription = "Invalid 'iat' value.";
- return Task.CompletedTask;
- }
-
- return Task.CompletedTask;
- }
-
- /// <summary>
- /// Validates the freshness of the nonce value.
- /// </summary>
- protected virtual async Task ValidateNonceAsync(DPoPProofValidatonContext context, DPoPProofValidatonResult result)
- {
- if (String.IsNullOrWhiteSpace(result.Nonce))
- {
- result.IsError = true;
- result.Error = OidcConstants.TokenErrors.UseDPoPNonce;
- result.ErrorDescription = "Missing 'nonce' value.";
- result.ServerIssuedNonce = CreateNonce(context, result);
- return;
- }
-
- var time = await GetUnixTimeFromNonceAsync(context, result);
- if (time <= 0)
- {
- Logger.LogDebug("Invalid time value read from the 'nonce' value");
-
- result.IsError = true;
- result.ErrorDescription = "Invalid 'nonce' value.";
- result.ServerIssuedNonce = CreateNonce(context, result);
- return;
- }
-
- var dpopOptions = OptionsMonitor.Get(context.Scheme);
-
- if (IsExpired(context, result, dpopOptions.ServerClockSkew, time))
- {
- Logger.LogDebug("DPoP 'nonce' expiration failed. It's possible that the server farm clocks might not be closely synchronized, so consider setting the ServerClockSkew on the DPoPOptions on the IdentityServerOptions.");
-
- result.IsError = true;
- result.ErrorDescription = "Invalid 'nonce' value.";
- result.ServerIssuedNonce = CreateNonce(context, result);
- return;
- }
- }
-
- /// <summary>
- /// Creates a nonce value to return to the client.
- /// </summary>
- /// <returns></returns>
- protected virtual string CreateNonce(DPoPProofValidatonContext context, DPoPProofValidatonResult result)
- {
- var now = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
- return DataProtector.Protect(now.ToString());
- }
-
- /// <summary>
- /// Reads the time the nonce was created.
- /// </summary>
- /// <returns></returns>
- protected virtual ValueTask<long> GetUnixTimeFromNonceAsync(DPoPProofValidatonContext context, DPoPProofValidatonResult result)
- {
- try
- {
- var value = DataProtector.Unprotect(result.Nonce);
- if (Int64.TryParse(value, out long iat))
- {
- return ValueTask.FromResult(iat);
- }
- }
- catch (Exception ex)
- {
- Logger.LogDebug("Error parsing DPoP 'nonce' value: {error}", ex.ToString());
- }
-
- return ValueTask.FromResult<long>(0);
- }
-
- /// <summary>
- /// Validates the expiration of the DPoP proof.
- /// Returns true if the time is beyond the allowed limits, false otherwise.
- /// </summary>
- protected virtual bool IsExpired(DPoPProofValidatonContext context, DPoPProofValidatonResult result, TimeSpan clockSkew, long issuedAtTime)
- {
- var now = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
- var start = now + (int) clockSkew.TotalSeconds;
- if (start < issuedAtTime)
- {
- var diff = issuedAtTime - now;
- Logger.LogDebug("Expiration check failed. Creation time was too far in the future. The time being checked was {iat}, and clock is now {now}. The time difference is {diff}", issuedAtTime, now, diff);
- return true;
- }
-
- var dpopOptions = OptionsMonitor.Get(context.Scheme);
- var expiration = issuedAtTime + (int) dpopOptions.ProofTokenValidityDuration.TotalSeconds;
- var end = now - (int) clockSkew.TotalSeconds;
- if (expiration < end)
- {
- var diff = now - expiration;
- Logger.LogDebug("Expiration check failed. Expiration has already happened. The expiration was at {exp}, and clock is now {now}. The time difference is {diff}", expiration, now, diff);
- return true;
- }
-
- return false;
- }
-}
diff --git a/samples/Api.DPoP/DPoP/DPoPServiceCollectionExtensions.cs b/samples/Api.DPoP/DPoP/DPoPServiceCollectionExtensions.cs
deleted file mode 100644
index 2e2a3980..00000000
--- a/samples/Api.DPoP/DPoP/DPoPServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using System;
-
-namespace Api.DPoP;
-
-static class DPoPServiceCollectionExtensions
-{
- public static IServiceCollection ConfigureDPoPTokensForScheme(this IServiceCollection services, string scheme)
- {
- services.AddOptions<DPoPOptions>();
-
- services.AddTransient<DPoPJwtBearerEvents>();
- services.AddTransient<DPoPProofValidator>();
- services.AddDistributedMemoryCache();
- services.AddTransient<IReplayCache, DefaultReplayCache>();
-
- services.AddSingleton<IPostConfigureOptions<JwtBearerOptions>>(new ConfigureJwtBearerOptions(scheme));
-
-
- return services;
- }
-
- public static IServiceCollection ConfigureDPoPTokensForScheme(this IServiceCollection services, string scheme, Action<DPoPOptions> configure)
- {
- services.Configure(scheme, configure);
- return services.ConfigureDPoPTokensForScheme(scheme);
- }
-}
diff --git a/samples/Api.DPoP/DPoP/DefaultReplayCache.cs b/samples/Api.DPoP/DPoP/DefaultReplayCache.cs
deleted file mode 100644
index a8b0169b..00000000
--- a/samples/Api.DPoP/DPoP/DefaultReplayCache.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Microsoft.Extensions.Caching.Distributed;
-using System;
-using System.Threading.Tasks;
-
-namespace Api.DPoP;
-
-/// <summary>
-/// Default implementation of the replay cache using IDistributedCache
-/// </summary>
-public class DefaultReplayCache : IReplayCache
-{
- private const string Prefix = nameof(DefaultReplayCache) + "-";
-
- private readonly IDistributedCache _cache;
-
- /// <summary>
- /// ctor
- /// </summary>
- /// <param name="cache"></param>
- public DefaultReplayCache(IDistributedCache cache)
- {
- _cache = cache;
- }
-
- /// <inheritdoc />
- public async Task AddAsync(string purpose, string handle, DateTimeOffset expiration)
- {
- var options = new DistributedCacheEntryOptions
- {
- AbsoluteExpiration = expiration
- };
-
- await _cache.SetAsync(Prefix + purpose + handle, new byte[] { }, options);
- }
-
- /// <inheritdoc />
- public async Task<bool> ExistsAsync(string purpose, string handle)
- {
- return (await _cache.GetAsync(Prefix + purpose + handle, default)) != null;
- }
-}
\ No newline at end of file
diff --git a/samples/Api.DPoP/DPoP/IReplayCache.cs b/samples/Api.DPoP/DPoP/IReplayCache.cs
deleted file mode 100644
index 21521ab1..00000000
--- a/samples/Api.DPoP/DPoP/IReplayCache.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Api.DPoP;
-
-public interface IReplayCache
-{
- /// <summary>
- /// Adds a handle to the cache
- /// </summary>
- /// <param name="purpose"></param>
- /// <param name="handle"></param>
- /// <param name="expiration"></param>
- /// <returns></returns>
- Task AddAsync(string purpose, string handle, DateTimeOffset expiration);
-
-
- /// <summary>
- /// Checks if a cached handle exists
- /// </summary>
- /// <param name="purpose"></param>
- /// <param name="handle"></param>
- /// <returns></returns>
- Task<bool> ExistsAsync(string purpose, string handle);
-}
diff --git a/samples/Api.DPoP/Startup.cs b/samples/Api.DPoP/Startup.cs
index e258a6fa..c5d1a471 100644
--- a/samples/Api.DPoP/Startup.cs
+++ b/samples/Api.DPoP/Startup.cs
@@ -1,6 +1,7 @@
// Copyright (c) Duende Software. All rights reserved.
// See LICENSE in the project root for license information.
+using Duende.AspNetCore.Authentication.JwtBearer.DPoP;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.HttpOverrides;
From 5b83d4e4e80bfa154da10bb8f5ec04f76673f8d4 Mon Sep 17 00:00:00 2001
From: Joe DeCock <josephdecock@gmail.com>
Date: Wed, 18 Dec 2024 21:57:46 -0600
Subject: [PATCH 3/3] Update dependencies and samples for .NET 9
- Increment EFCoreVersion to 8.0.11: 8.0.10 of the Sql Server provider has a transitive security flaw, so it seems wise to bump this
- Remove JS.Yarp sample (the main Bff sample makes API calls with and without YARP)
- Rename samples to not include .net version and "JS" everywhere
- Multitarget .net 8 and 9 in samples
- Separate each sample host to run on a different port
---
.github/workflows/ci.yml | 3 +-
.vscode/launch.json | 93 +++++++---
.vscode/tasks.json | 38 ++--
Directory.Build.targets | 13 +-
Duende.Bff.sln | 21 +--
global.json | 2 +-
migrations/UserSessionDb/Program.cs | 2 +
migrations/UserSessionDb/UserSessionDb.csproj | 6 +-
migrations/UserSessionDb/appsettings.json | 2 +-
.../Bff.DPoP.csproj} | 4 +-
.../LocalApiController.cs | 2 +-
samples/{JS8.DPoP => Bff.DPoP}/Program.cs | 4 +-
.../Properties/launchSettings.json | 2 +-
samples/{JS8.DPoP => Bff.DPoP}/Startup.cs | 4 +-
.../wwwroot/StyleSheet.css | 0
samples/{JS8.DPoP => Bff.DPoP}/wwwroot/app.js | 0
.../{JS8.DPoP => Bff.DPoP}/wwwroot/index.html | 2 +-
.../wwwroot/libs/bootstrap.min.css | 0
.../wwwroot/libs/bootstrap.min.js | 0
.../{JS.Yarp => Bff.DPoP}/wwwroot/todo.html | 0
samples/{JS.Yarp => Bff.DPoP}/wwwroot/todo.js | 0
.../JS8.EF.csproj => Bff.EF/Bff.EF.csproj} | 15 +-
.../{JS8.EF => Bff.EF}/LocalApiController.cs | 2 +-
samples/{JS8.EF => Bff.EF}/Program.cs | 2 +-
.../Properties/launchSettings.json | 4 +-
samples/{JS8.EF => Bff.EF}/Startup.cs | 4 +-
samples/{JS8.EF => Bff.EF}/appsettings.json | 0
.../wwwroot/StyleSheet.css | 0
samples/{JS8.EF => Bff.EF}/wwwroot/app.js | 0
samples/{JS8.EF => Bff.EF}/wwwroot/index.html | 2 +-
.../wwwroot/libs/bootstrap.min.css | 0
.../{JS8.DPoP => Bff.EF}/wwwroot/todo.html | 0
samples/{JS8.DPoP => Bff.EF}/wwwroot/todo.js | 0
samples/{JS8/JS8.csproj => Bff/Bff.csproj} | 4 +-
.../ImpersonationAccessTokenRetriever.cs | 2 +-
samples/{JS8 => Bff}/LocalApiController.cs | 0
samples/{JS8 => Bff}/Program.cs | 2 +
.../Properties/launchSettings.json | 2 +-
samples/{JS8 => Bff}/Startup.cs | 2 +-
samples/{JS8 => Bff}/wwwroot/StyleSheet.css | 0
samples/{JS8 => Bff}/wwwroot/app.js | 0
samples/{JS8 => Bff}/wwwroot/index.html | 2 +-
.../wwwroot/libs/bootstrap.min.css | 0
.../wwwroot/libs/bootstrap.min.js | 0
samples/{JS8.EF => Bff}/wwwroot/todo.html | 0
samples/{JS8.EF => Bff}/wwwroot/todo.js | 0
.../Blazor.Wasm/Blazor.Wasm.Bff/Program.cs | 2 +-
samples/IdentityServer/Config.cs | 58 ++++--
samples/JS.Yarp/JS.Yarp.csproj | 17 --
samples/JS.Yarp/LocalApiController.cs | 23 ---
samples/JS.Yarp/Program.cs | 55 ------
.../JS.Yarp/Properties/launchSettings.json | 13 --
samples/JS.Yarp/Startup.cs | 166 ------------------
samples/JS.Yarp/wwwroot/app.js | 148 ----------------
samples/JS.Yarp/wwwroot/index.html | 63 -------
samples/JS8.EF/wwwroot/StyleSheet.css | 3 -
samples/JS8.EF/wwwroot/libs/bootstrap.min.css | 5 -
samples/JS8/wwwroot/todo.html | 48 -----
samples/JS8/wwwroot/todo.js | 94 ----------
59 files changed, 195 insertions(+), 741 deletions(-)
rename samples/{JS8.DPoP/JS8.DPoP.csproj => Bff.DPoP/Bff.DPoP.csproj} (81%)
rename samples/{JS8.DPoP => Bff.DPoP}/LocalApiController.cs (98%)
rename samples/{JS8.DPoP => Bff.DPoP}/Program.cs (96%)
rename samples/{JS8.EF => Bff.DPoP}/Properties/launchSettings.json (89%)
rename samples/{JS8.DPoP => Bff.DPoP}/Startup.cs (99%)
rename samples/{JS8.DPoP => Bff.DPoP}/wwwroot/StyleSheet.css (100%)
rename samples/{JS8.DPoP => Bff.DPoP}/wwwroot/app.js (100%)
rename samples/{JS8.DPoP => Bff.DPoP}/wwwroot/index.html (98%)
rename samples/{JS8.DPoP => Bff.DPoP}/wwwroot/libs/bootstrap.min.css (100%)
rename samples/{JS8.DPoP => Bff.DPoP}/wwwroot/libs/bootstrap.min.js (100%)
rename samples/{JS.Yarp => Bff.DPoP}/wwwroot/todo.html (100%)
rename samples/{JS.Yarp => Bff.DPoP}/wwwroot/todo.js (100%)
rename samples/{JS8.EF/JS8.EF.csproj => Bff.EF/Bff.EF.csproj} (66%)
rename samples/{JS8.EF => Bff.EF}/LocalApiController.cs (94%)
rename samples/{JS8.EF => Bff.EF}/Program.cs (98%)
rename samples/{JS8 => Bff.EF}/Properties/launchSettings.json (73%)
rename samples/{JS8.EF => Bff.EF}/Startup.cs (97%)
rename samples/{JS8.EF => Bff.EF}/appsettings.json (100%)
rename samples/{JS.Yarp => Bff.EF}/wwwroot/StyleSheet.css (100%)
rename samples/{JS8.EF => Bff.EF}/wwwroot/app.js (100%)
rename samples/{JS8.EF => Bff.EF}/wwwroot/index.html (97%)
rename samples/{JS.Yarp => Bff.EF}/wwwroot/libs/bootstrap.min.css (100%)
rename samples/{JS8.DPoP => Bff.EF}/wwwroot/todo.html (100%)
rename samples/{JS8.DPoP => Bff.EF}/wwwroot/todo.js (100%)
rename samples/{JS8/JS8.csproj => Bff/Bff.csproj} (78%)
rename samples/{JS8 => Bff}/ImpersonationAccessTokenRetriever.cs (98%)
rename samples/{JS8 => Bff}/LocalApiController.cs (100%)
rename samples/{JS8 => Bff}/Program.cs (98%)
rename samples/{JS8.DPoP => Bff}/Properties/launchSettings.json (94%)
rename samples/{JS8 => Bff}/Startup.cs (99%)
rename samples/{JS8 => Bff}/wwwroot/StyleSheet.css (100%)
rename samples/{JS8 => Bff}/wwwroot/app.js (100%)
rename samples/{JS8 => Bff}/wwwroot/index.html (98%)
rename samples/{JS8 => Bff}/wwwroot/libs/bootstrap.min.css (100%)
rename samples/{JS8 => Bff}/wwwroot/libs/bootstrap.min.js (100%)
rename samples/{JS8.EF => Bff}/wwwroot/todo.html (100%)
rename samples/{JS8.EF => Bff}/wwwroot/todo.js (100%)
delete mode 100644 samples/JS.Yarp/JS.Yarp.csproj
delete mode 100644 samples/JS.Yarp/LocalApiController.cs
delete mode 100644 samples/JS.Yarp/Program.cs
delete mode 100644 samples/JS.Yarp/Properties/launchSettings.json
delete mode 100644 samples/JS.Yarp/Startup.cs
delete mode 100644 samples/JS.Yarp/wwwroot/app.js
delete mode 100644 samples/JS.Yarp/wwwroot/index.html
delete mode 100644 samples/JS8.EF/wwwroot/StyleSheet.css
delete mode 100644 samples/JS8.EF/wwwroot/libs/bootstrap.min.css
delete mode 100644 samples/JS8/wwwroot/todo.html
delete mode 100644 samples/JS8/wwwroot/todo.js
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca7e4de2..ed34b38b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,7 +34,8 @@ jobs:
with:
dotnet-version: |
8.0.x
-
+ 9.0.x
+
- run: dotnet --info
- if: contains(matrix.runs-on, 'macOS') || contains(matrix.runs-on, 'ubuntu')
diff --git a/.vscode/launch.json b/.vscode/launch.json
index bed274a1..1158a190 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -19,6 +19,15 @@
// "order": 10
}
},
+ {
+ "name": "IdentityServer + All APIs",
+ "configurations": ["IdentityServer", "Api", "Api with DPoP", "Api with resource isolation"],
+ "presentation": {
+ "hidden": false,
+ "group": "10-compunds",
+ // "order": 10
+ }
+ },
],
"configurations": [
{
@@ -76,7 +85,7 @@
}
},
{
- "name": "Isolated Api",
+ "name": "Api with resource isolation",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-api.isolated",
@@ -94,13 +103,13 @@
}
},
{
- "name": "JS.Yarp",
+ "name": "Bff (.NET 8)",
"type": "coreclr",
"request": "launch",
- "preLaunchTask": "build-jsyarp",
- "program": "${workspaceFolder}/samples/JS.Yarp/bin/Debug/net9.0/JS.Yarp.dll",
+ "preLaunchTask": "build-bff-8",
+ "program": "${workspaceFolder}/samples/Bff/bin/Debug/net8.0/Bff.dll",
"args": [],
- "cwd": "${workspaceFolder}/samples/JS.Yarp",
+ "cwd": "${workspaceFolder}/samples/Bff",
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
@@ -111,17 +120,17 @@
"console": "externalTerminal",
"presentation": {
"hidden": false,
- "order": 10
+ "order": 100
}
},
{
- "name": "JS8",
+ "name": "Bff (.NET 9)",
"type": "coreclr",
"request": "launch",
- "preLaunchTask": "build-js8",
- "program": "${workspaceFolder}/samples/JS8/bin/Debug/net8.0/JS8.dll",
+ "preLaunchTask": "build-bff-9",
+ "program": "${workspaceFolder}/samples/Bff/bin/Debug/net9.0/Bff.dll",
"args": [],
- "cwd": "${workspaceFolder}/samples/JS8",
+ "cwd": "${workspaceFolder}/samples/Bff",
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
@@ -136,13 +145,13 @@
}
},
{
- "name": "JS8 DPoP",
+ "name": "Bff DPoP (.NET 8)",
"type": "coreclr",
"request": "launch",
- "preLaunchTask": "build-js8dpop",
- "program": "${workspaceFolder}/samples/JS8.DPoP/bin/Debug/net8.0/JS8.DPoP.dll",
+ "preLaunchTask": "build-bffdpop-8",
+ "program": "${workspaceFolder}/samples/Bff.DPoP/bin/Debug/net8.0/Bff.DPoP.dll",
"args": [],
- "cwd": "${workspaceFolder}/samples/JS8.DPoP",
+ "cwd": "${workspaceFolder}/samples/Bff.DPoP",
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
@@ -153,17 +162,17 @@
"console": "externalTerminal",
"presentation": {
"hidden": false,
- "order": 10
+ "order": 101
}
},
{
- "name": "JS8 EF",
+ "name": "Bff DPoP (.NET 9)",
"type": "coreclr",
"request": "launch",
- "preLaunchTask": "build-js8ef",
- "program": "${workspaceFolder}/samples/JS8.EF/bin/Debug/net8.0/JS8.EF.dll",
+ "preLaunchTask": "build-bffdpop-9",
+ "program": "${workspaceFolder}/samples/Bff.DPoP/bin/Debug/net9.0/Bff.DPoP.dll",
"args": [],
- "cwd": "${workspaceFolder}/samples/JS8.EF",
+ "cwd": "${workspaceFolder}/samples/Bff.DPoP",
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
@@ -174,7 +183,49 @@
"console": "externalTerminal",
"presentation": {
"hidden": false,
- "order": 10
+ "order": 11
+ }
+ },
+ {
+ "name": "Bff EF (.NET 8)",
+ "type": "coreclr",
+ "request": "launch",
+ "preLaunchTask": "build-bffef-8",
+ "program": "${workspaceFolder}/samples/Bff.EF/bin/Debug/net8.0/Bff.EF.dll",
+ "args": [],
+ "cwd": "${workspaceFolder}/samples/Bff.EF",
+ "env": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ },
+ "serverReadyAction": {
+ "action": "openExternally",
+ "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+ },
+ "console": "externalTerminal",
+ "presentation": {
+ "hidden": false,
+ "order": 102
+ }
+ },
+ {
+ "name": "Bff EF (.NET 9)",
+ "type": "coreclr",
+ "request": "launch",
+ "preLaunchTask": "build-bffef-9",
+ "program": "${workspaceFolder}/samples/Bff.EF/bin/Debug/net9.0/Bff.EF.dll",
+ "args": [],
+ "cwd": "${workspaceFolder}/samples/Bff.EF",
+ "env": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ },
+ "serverReadyAction": {
+ "action": "openExternally",
+ "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+ },
+ "console": "externalTerminal",
+ "presentation": {
+ "hidden": false,
+ "order": 12
}
},
{
@@ -195,7 +246,7 @@
"console": "externalTerminal",
"presentation": {
"hidden": false,
- "order": 10
+ "order": 50
}
}
]
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 9ad7f7e0..90141df5 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -62,60 +62,78 @@
"problemMatcher": "$msCompile"
},
{
- "label": "build-jsyarp",
+ "label": "build-bff-8",
"type": "process",
"command": "dotnet",
"args": [
"build",
- "${workspaceFolder}/samples/JS.Yarp/JS.Yarp.csproj",
+ "--framework=net8.0",
+ "${workspaceFolder}/samples/Bff/Bff.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
- "label": "build-js8",
+ "label": "build-bff-9",
"type": "process",
"command": "dotnet",
"args": [
"build",
- "${workspaceFolder}/samples/JS8/JS8.csproj",
+ "--framework=net9.0",
+ "${workspaceFolder}/samples/Bff/Bff.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
- "label": "build-jsyarp",
+ "label": "build-bffdpop-8",
"type": "process",
"command": "dotnet",
"args": [
"build",
- "${workspaceFolder}/samples/JS.Yarp/JS.Yarp.csproj",
+ "--framework=net8.0",
+ "${workspaceFolder}/samples/Bff.DPoP/Bff.DPoP.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
- "label": "build-js8dpop",
+ "label": "build-bffdpop-9",
"type": "process",
"command": "dotnet",
"args": [
"build",
- "${workspaceFolder}/samples/JS8.DPoP/JS8.DPoP.csproj",
+ "--framework=net9.0",
+ "${workspaceFolder}/samples/Bff.DPoP/Bff.DPoP.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
- "label": "build-js8ef",
+ "label": "build-bffef-8",
"type": "process",
"command": "dotnet",
"args": [
"build",
- "${workspaceFolder}/samples/JS8.EF/JS8.EF.csproj",
+ "--framework=net8.0",
+ "${workspaceFolder}/samples/Bff.EF/Bff.EF.csproj",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "build-bffef-9",
+ "type": "process",
+ "command": "dotnet",
+ "args": [
+ "build",
+ "--framework=net9.0",
+ "${workspaceFolder}/samples/Bff.EF/Bff.EF.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 4438f085..eff3ef08 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,8 +1,12 @@
<Project>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0'">
<AspNetCoreVersion>8.0.1</AspNetCoreVersion>
- <!-- Need EF to be at least 8.0.10 so that 'Microsoft.Extensions.Caching.Memory' is at least 8.0.1, which addresses a known high severity vulnerability -->
- <EFCoreVersion>8.0.10</EFCoreVersion>
+ <!-- EF must be at least 8.0.10 so that 'Microsoft.Extensions.Caching.Memory'
+ is at least 8.0.1, which addresses a known high severity vulnerability.
+ The SQL Server EF provider that is commonly used has a transitive
+ vulnerability in 8.0.10 that is fixed in 8.0.11, so going to 8.0.11 seems
+ prudent. -->
+ <EFCoreVersion>8.0.11</EFCoreVersion>
<IdentityServerVersion>7.1.0-rc.1</IdentityServerVersion>
<MicrosoftExtensionsVersion>8.0.1</MicrosoftExtensionsVersion>
<YarpVersion>2.1.0</YarpVersion>
@@ -35,8 +39,11 @@
<PackageReference Update="Microsoft.AspNetCore.Components.Authorization" Version="$(AspNetCoreVersion)" />
<!-- Entity Framework Core -->
- <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
+ <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
<PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
+ <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
+ <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EFCoreVersion)" />
+ <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EFCoreVersion)" />
<!-- Microsoft Extensions -->
<PackageReference Update="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsVersion)" />
diff --git a/Duende.Bff.sln b/Duende.Bff.sln
index 68db5315..c5f5e795 100644
--- a/Duende.Bff.sln
+++ b/Duende.Bff.sln
@@ -25,19 +25,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "migrations", "migrations",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UserSessionDb", "migrations\UserSessionDb\UserSessionDb.csproj", "{F01EA18D-DAA2-41A3-B6B4-5F7B185C3525}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JS.Yarp", "samples\JS.Yarp\JS.Yarp.csproj", "{7ACD3916-576B-4C5F-B2A9-4617535E95ED}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duende.Bff.Yarp", "src\Duende.Bff.Yarp\Duende.Bff.Yarp.csproj", "{E2D87CB5-8F05-4629-84FF-4B44CF86EDA4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api.DPoP", "samples\Api.DPoP\Api.DPoP.csproj", "{E1305546-C5C3-4D10-A0AD-F81DF057B2E2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api.Isolated", "samples\Api.Isolated\Api.Isolated.csproj", "{399929C6-47FF-4A45-9BEA-B70FFC1EDE69}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JS8", "samples\JS8\JS8.csproj", "{B37CA136-3F20-4D8A-9677-E3A9C9D893EF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bff", "samples\Bff\Bff.csproj", "{B37CA136-3F20-4D8A-9677-E3A9C9D893EF}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JS8.DPoP", "samples\JS8.DPoP\JS8.DPoP.csproj", "{D8757F0F-254E-495F-961F-0192F8C97E3F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bff.DPoP", "samples\Bff.DPoP\Bff.DPoP.csproj", "{D8757F0F-254E-495F-961F-0192F8C97E3F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JS8.EF", "samples\JS8.EF\JS8.EF.csproj", "{CBB98134-92F5-487D-8CA3-84C19FF46775}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bff.EF", "samples\Bff.EF\Bff.EF.csproj", "{CBB98134-92F5-487D-8CA3-84C19FF46775}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Blazor.Wasm", "Blazor.Wasm", "{7E6EA8BA-EE8B-450E-AE89-C4604C0DD326}"
EndProject
@@ -139,18 +137,6 @@ Global
{F01EA18D-DAA2-41A3-B6B4-5F7B185C3525}.Release|x64.Build.0 = Release|Any CPU
{F01EA18D-DAA2-41A3-B6B4-5F7B185C3525}.Release|x86.ActiveCfg = Release|Any CPU
{F01EA18D-DAA2-41A3-B6B4-5F7B185C3525}.Release|x86.Build.0 = Release|Any CPU
- {7ACD3916-576B-4C5F-B2A9-4617535E95ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7ACD3916-576B-4C5F-B2A9-4617535E95ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7ACD3916-576B-4C5F-B2A9-4617535E95ED}.Debug|x64.ActiveCfg = Debug|Any CPU
- {7ACD3916-576B-4C5F-B2A9-4617535E95ED}.Debug|x64.Build.0 = Debug|Any CPU
- {7ACD3916-576B-4C5F-B2A9-4617535E95ED}.Debug|x86.ActiveCfg = Debug|Any CPU
- {7ACD3916-576B-4C5F-B2A9-4617535E95ED}.Debug|x86.Build.0 = Debug|Any CPU
- {7ACD3916-576B-4C5F-B2A9-4617535E95ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7ACD3916-576B-4C5F-B2A9-4617535E95ED}.Release|Any CPU.Build.0 = Release|Any CPU
- {7ACD3916-576B-4C5F-B2A9-4617535E95ED}.Release|x64.ActiveCfg = Release|Any CPU
- {7ACD3916-576B-4C5F-B2A9-4617535E95ED}.Release|x64.Build.0 = Release|Any CPU
- {7ACD3916-576B-4C5F-B2A9-4617535E95ED}.Release|x86.ActiveCfg = Release|Any CPU
- {7ACD3916-576B-4C5F-B2A9-4617535E95ED}.Release|x86.Build.0 = Release|Any CPU
{E2D87CB5-8F05-4629-84FF-4B44CF86EDA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E2D87CB5-8F05-4629-84FF-4B44CF86EDA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E2D87CB5-8F05-4629-84FF-4B44CF86EDA4}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -259,7 +245,6 @@ Global
{8A1331D1-BAC3-4DD9-B16E-BB04BEE46D0A} = {3C549079-A502-4B40-B051-5278915AE91B}
{93B5A99A-B7D8-4412-A801-BE6572157CFA} = {B2A776DB-385B-4AD4-96A5-61746FD909C3}
{F01EA18D-DAA2-41A3-B6B4-5F7B185C3525} = {439382D9-7230-4AD0-A82F-956020041BDD}
- {7ACD3916-576B-4C5F-B2A9-4617535E95ED} = {E14F66D1-EA3E-40C6-835A-91A4382D4646}
{E2D87CB5-8F05-4629-84FF-4B44CF86EDA4} = {3C549079-A502-4B40-B051-5278915AE91B}
{E1305546-C5C3-4D10-A0AD-F81DF057B2E2} = {E14F66D1-EA3E-40C6-835A-91A4382D4646}
{399929C6-47FF-4A45-9BEA-B70FFC1EDE69} = {E14F66D1-EA3E-40C6-835A-91A4382D4646}
diff --git a/global.json b/global.json
index 72d38cd2..30094e81 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "8.0.100",
+ "version": "9.0.100",
"rollForward": "latestMajor",
"allowPrerelease": false
}
diff --git a/migrations/UserSessionDb/Program.cs b/migrations/UserSessionDb/Program.cs
index 136cb4e0..64bb11cf 100644
--- a/migrations/UserSessionDb/Program.cs
+++ b/migrations/UserSessionDb/Program.cs
@@ -1,3 +1,4 @@
+using System;
using Duende.Bff.EntityFramework;
using Microsoft.AspNetCore.Hosting;
using Microsoft.EntityFrameworkCore;
@@ -15,6 +16,7 @@ public static void Main(string[] args)
{
using (var context = scope.ServiceProvider.GetService<SessionDbContext>())
{
+ Console.WriteLine("MIGRATING"); // TODO
context.Database.Migrate();
}
}
diff --git a/migrations/UserSessionDb/UserSessionDb.csproj b/migrations/UserSessionDb/UserSessionDb.csproj
index f6078340..8d841d75 100644
--- a/migrations/UserSessionDb/UserSessionDb.csproj
+++ b/migrations/UserSessionDb/UserSessionDb.csproj
@@ -5,12 +5,12 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.9">
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Design" >
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
</ItemGroup>
<ItemGroup>
diff --git a/migrations/UserSessionDb/appsettings.json b/migrations/UserSessionDb/appsettings.json
index d770f2d0..f0dbe413 100644
--- a/migrations/UserSessionDb/appsettings.json
+++ b/migrations/UserSessionDb/appsettings.json
@@ -1,6 +1,6 @@
{
"ConnectionStrings": {
//"db": "server=(localdb)\\mssqllocaldb;database=Duende.BFF;trusted_connection=yes;"
- "db": "Data Source=../../samples/JS6.EF/Duende.BFF.db;"
+ "db": "Data Source=../../samples/Bff.EF/Duende.BFF.db;"
}
}
\ No newline at end of file
diff --git a/samples/JS8.DPoP/JS8.DPoP.csproj b/samples/Bff.DPoP/Bff.DPoP.csproj
similarity index 81%
rename from samples/JS8.DPoP/JS8.DPoP.csproj
rename to samples/Bff.DPoP/Bff.DPoP.csproj
index f4e18467..63f61997 100644
--- a/samples/JS8.DPoP/JS8.DPoP.csproj
+++ b/samples/Bff.DPoP/Bff.DPoP.csproj
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
- <RootNamespace>Host8</RootNamespace>
+ <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+ <RootNamespace>Bff.DPoP</RootNamespace>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/samples/JS8.DPoP/LocalApiController.cs b/samples/Bff.DPoP/LocalApiController.cs
similarity index 98%
rename from samples/JS8.DPoP/LocalApiController.cs
rename to samples/Bff.DPoP/LocalApiController.cs
index 89f31c2f..96b49be6 100644
--- a/samples/JS8.DPoP/LocalApiController.cs
+++ b/samples/Bff.DPoP/LocalApiController.cs
@@ -7,7 +7,7 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
-namespace JS8.DPoP;
+namespace Bff.DPoP;
[Route("local")]
public class LocalApiController : ControllerBase
{
diff --git a/samples/JS8.DPoP/Program.cs b/samples/Bff.DPoP/Program.cs
similarity index 96%
rename from samples/JS8.DPoP/Program.cs
rename to samples/Bff.DPoP/Program.cs
index 82bbc993..962b0a2d 100644
--- a/samples/JS8.DPoP/Program.cs
+++ b/samples/Bff.DPoP/Program.cs
@@ -8,12 +8,14 @@
using Serilog.Events;
using Serilog.Sinks.SystemConsole.Themes;
-namespace JS8.DPoP;
+namespace Bff.DPoP;
public class Program
{
public static int Main(string[] args)
{
+ Console.Title = "BFF.DPoP";
+
Log.Logger = new LoggerConfiguration()
.MinimumLevel.Information()
.MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
diff --git a/samples/JS8.EF/Properties/launchSettings.json b/samples/Bff.DPoP/Properties/launchSettings.json
similarity index 89%
rename from samples/JS8.EF/Properties/launchSettings.json
rename to samples/Bff.DPoP/Properties/launchSettings.json
index 02e1106a..9003df65 100644
--- a/samples/JS8.EF/Properties/launchSettings.json
+++ b/samples/Bff.DPoP/Properties/launchSettings.json
@@ -1,6 +1,6 @@
{
"profiles": {
- "Host8.EntityFramework": {
+ "Bff.DPoP": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
diff --git a/samples/JS8.DPoP/Startup.cs b/samples/Bff.DPoP/Startup.cs
similarity index 99%
rename from samples/JS8.DPoP/Startup.cs
rename to samples/Bff.DPoP/Startup.cs
index a94c0209..cf5d7a66 100644
--- a/samples/JS8.DPoP/Startup.cs
+++ b/samples/Bff.DPoP/Startup.cs
@@ -16,7 +16,7 @@
using Yarp.ReverseProxy.Configuration;
-namespace JS8.DPoP;
+namespace Bff.DPoP;
public class Startup
{
@@ -123,7 +123,7 @@ public void ConfigureServices(IServiceCollection services)
options.Authority = "https://localhost:5001";
// confidential client using code flow + PKCE
- options.ClientId = "spa";
+ options.ClientId = "bff.dpop";
options.ClientSecret = "secret";
options.ResponseType = "code";
options.ResponseMode = "query";
diff --git a/samples/JS8.DPoP/wwwroot/StyleSheet.css b/samples/Bff.DPoP/wwwroot/StyleSheet.css
similarity index 100%
rename from samples/JS8.DPoP/wwwroot/StyleSheet.css
rename to samples/Bff.DPoP/wwwroot/StyleSheet.css
diff --git a/samples/JS8.DPoP/wwwroot/app.js b/samples/Bff.DPoP/wwwroot/app.js
similarity index 100%
rename from samples/JS8.DPoP/wwwroot/app.js
rename to samples/Bff.DPoP/wwwroot/app.js
diff --git a/samples/JS8.DPoP/wwwroot/index.html b/samples/Bff.DPoP/wwwroot/index.html
similarity index 98%
rename from samples/JS8.DPoP/wwwroot/index.html
rename to samples/Bff.DPoP/wwwroot/index.html
index 4e9125f2..2bf8e83a 100644
--- a/samples/JS8.DPoP/wwwroot/index.html
+++ b/samples/Bff.DPoP/wwwroot/index.html
@@ -11,7 +11,7 @@
<body>
<div class="container">
<header class="page-header">
- <h1>SPA (.NET 8 host using DPoP)</h1>
+ <h1>BFF using DPoP</h1>
</header>
<div class="row">
diff --git a/samples/JS8.DPoP/wwwroot/libs/bootstrap.min.css b/samples/Bff.DPoP/wwwroot/libs/bootstrap.min.css
similarity index 100%
rename from samples/JS8.DPoP/wwwroot/libs/bootstrap.min.css
rename to samples/Bff.DPoP/wwwroot/libs/bootstrap.min.css
diff --git a/samples/JS8.DPoP/wwwroot/libs/bootstrap.min.js b/samples/Bff.DPoP/wwwroot/libs/bootstrap.min.js
similarity index 100%
rename from samples/JS8.DPoP/wwwroot/libs/bootstrap.min.js
rename to samples/Bff.DPoP/wwwroot/libs/bootstrap.min.js
diff --git a/samples/JS.Yarp/wwwroot/todo.html b/samples/Bff.DPoP/wwwroot/todo.html
similarity index 100%
rename from samples/JS.Yarp/wwwroot/todo.html
rename to samples/Bff.DPoP/wwwroot/todo.html
diff --git a/samples/JS.Yarp/wwwroot/todo.js b/samples/Bff.DPoP/wwwroot/todo.js
similarity index 100%
rename from samples/JS.Yarp/wwwroot/todo.js
rename to samples/Bff.DPoP/wwwroot/todo.js
diff --git a/samples/JS8.EF/JS8.EF.csproj b/samples/Bff.EF/Bff.EF.csproj
similarity index 66%
rename from samples/JS8.EF/JS8.EF.csproj
rename to samples/Bff.EF/Bff.EF.csproj
index f5917ddc..4bd8e152 100644
--- a/samples/JS8.EF/JS8.EF.csproj
+++ b/samples/Bff.EF/Bff.EF.csproj
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
- <PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
- </PropertyGroup>
+ <PropertyGroup>
+ <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+ <RootNamespace>Bff.DPoP</RootNamespace>
+ </PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.4" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
- <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
+ <PackageReference Include="Serilog.AspNetCore" />
</ItemGroup>
<ItemGroup>
diff --git a/samples/JS8.EF/LocalApiController.cs b/samples/Bff.EF/LocalApiController.cs
similarity index 94%
rename from samples/JS8.EF/LocalApiController.cs
rename to samples/Bff.EF/LocalApiController.cs
index d4625c5c..b59af4b1 100644
--- a/samples/JS8.EF/LocalApiController.cs
+++ b/samples/Bff.EF/LocalApiController.cs
@@ -3,7 +3,7 @@
using Microsoft.AspNetCore.Mvc;
-namespace Host8.EntityFramework
+namespace Bff.EntityFramework
{
[Route("local")]
public class LocalApiController : ControllerBase
diff --git a/samples/JS8.EF/Program.cs b/samples/Bff.EF/Program.cs
similarity index 98%
rename from samples/JS8.EF/Program.cs
rename to samples/Bff.EF/Program.cs
index 05e1f625..a979258b 100644
--- a/samples/JS8.EF/Program.cs
+++ b/samples/Bff.EF/Program.cs
@@ -5,7 +5,7 @@
using Serilog.Sinks.SystemConsole.Themes;
using System;
-namespace Host8.EntityFramework
+namespace Bff.EntityFramework
{
public class Program
{
diff --git a/samples/JS8/Properties/launchSettings.json b/samples/Bff.EF/Properties/launchSettings.json
similarity index 73%
rename from samples/JS8/Properties/launchSettings.json
rename to samples/Bff.EF/Properties/launchSettings.json
index 0cceaadb..be23b952 100644
--- a/samples/JS8/Properties/launchSettings.json
+++ b/samples/Bff.EF/Properties/launchSettings.json
@@ -1,10 +1,10 @@
{
"profiles": {
- "Host6": {
+ "Bff.EntityFramework": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
- "applicationUrl": "https://localhost:5002",
+ "applicationUrl": "https://localhost:5004",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
diff --git a/samples/JS8.EF/Startup.cs b/samples/Bff.EF/Startup.cs
similarity index 97%
rename from samples/JS8.EF/Startup.cs
rename to samples/Bff.EF/Startup.cs
index 9d302cff..7781c3c0 100644
--- a/samples/JS8.EF/Startup.cs
+++ b/samples/Bff.EF/Startup.cs
@@ -9,7 +9,7 @@
using Serilog;
using Microsoft.AspNetCore.DataProtection;
-namespace Host8.EntityFramework
+namespace Bff.EntityFramework
{
public class Startup
{
@@ -63,7 +63,7 @@ public void ConfigureServices(IServiceCollection services)
options.Authority = "https://localhost:5001";
// confidential client using code flow + PKCE
- options.ClientId = "backchannel-spa";
+ options.ClientId = "bff.ef";
options.ClientSecret = "secret";
options.ResponseType = "code";
options.ResponseMode = "query";
diff --git a/samples/JS8.EF/appsettings.json b/samples/Bff.EF/appsettings.json
similarity index 100%
rename from samples/JS8.EF/appsettings.json
rename to samples/Bff.EF/appsettings.json
diff --git a/samples/JS.Yarp/wwwroot/StyleSheet.css b/samples/Bff.EF/wwwroot/StyleSheet.css
similarity index 100%
rename from samples/JS.Yarp/wwwroot/StyleSheet.css
rename to samples/Bff.EF/wwwroot/StyleSheet.css
diff --git a/samples/JS8.EF/wwwroot/app.js b/samples/Bff.EF/wwwroot/app.js
similarity index 100%
rename from samples/JS8.EF/wwwroot/app.js
rename to samples/Bff.EF/wwwroot/app.js
diff --git a/samples/JS8.EF/wwwroot/index.html b/samples/Bff.EF/wwwroot/index.html
similarity index 97%
rename from samples/JS8.EF/wwwroot/index.html
rename to samples/Bff.EF/wwwroot/index.html
index b57d2bf7..4f9a0baa 100644
--- a/samples/JS8.EF/wwwroot/index.html
+++ b/samples/Bff.EF/wwwroot/index.html
@@ -9,7 +9,7 @@
<body>
<div class="container">
<header class="page-header">
- <h1>SPA (w/ EntityFramework)</h1>
+ <h1>BFF with EntityFramework</h1>
</header>
<div class="row">
diff --git a/samples/JS.Yarp/wwwroot/libs/bootstrap.min.css b/samples/Bff.EF/wwwroot/libs/bootstrap.min.css
similarity index 100%
rename from samples/JS.Yarp/wwwroot/libs/bootstrap.min.css
rename to samples/Bff.EF/wwwroot/libs/bootstrap.min.css
diff --git a/samples/JS8.DPoP/wwwroot/todo.html b/samples/Bff.EF/wwwroot/todo.html
similarity index 100%
rename from samples/JS8.DPoP/wwwroot/todo.html
rename to samples/Bff.EF/wwwroot/todo.html
diff --git a/samples/JS8.DPoP/wwwroot/todo.js b/samples/Bff.EF/wwwroot/todo.js
similarity index 100%
rename from samples/JS8.DPoP/wwwroot/todo.js
rename to samples/Bff.EF/wwwroot/todo.js
diff --git a/samples/JS8/JS8.csproj b/samples/Bff/Bff.csproj
similarity index 78%
rename from samples/JS8/JS8.csproj
rename to samples/Bff/Bff.csproj
index e2b9267b..05c382c5 100644
--- a/samples/JS8/JS8.csproj
+++ b/samples/Bff/Bff.csproj
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFrameworks>net8.0</TargetFrameworks>
- <RootNamespace>Host8</RootNamespace>
+ <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+ <RootNamespace>Bff</RootNamespace>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/samples/JS8/ImpersonationAccessTokenRetriever.cs b/samples/Bff/ImpersonationAccessTokenRetriever.cs
similarity index 98%
rename from samples/JS8/ImpersonationAccessTokenRetriever.cs
rename to samples/Bff/ImpersonationAccessTokenRetriever.cs
index 407a6f6a..fc3b3f88 100644
--- a/samples/JS8/ImpersonationAccessTokenRetriever.cs
+++ b/samples/Bff/ImpersonationAccessTokenRetriever.cs
@@ -28,7 +28,7 @@ public override async Task<AccessTokenResult> GetAccessToken(AccessTokenRetrieva
Address = "https://localhost:5001/connect/token",
GrantType = OidcConstants.GrantTypes.TokenExchange,
- ClientId = "spa",
+ ClientId = "bff",
ClientSecret = "secret",
SubjectToken = bearerToken.AccessToken,
diff --git a/samples/JS8/LocalApiController.cs b/samples/Bff/LocalApiController.cs
similarity index 100%
rename from samples/JS8/LocalApiController.cs
rename to samples/Bff/LocalApiController.cs
diff --git a/samples/JS8/Program.cs b/samples/Bff/Program.cs
similarity index 98%
rename from samples/JS8/Program.cs
rename to samples/Bff/Program.cs
index 09cdc724..1bd14348 100644
--- a/samples/JS8/Program.cs
+++ b/samples/Bff/Program.cs
@@ -14,6 +14,8 @@ public class Program
{
public static int Main(string[] args)
{
+ Console.Title = "BFF";
+
Log.Logger = new LoggerConfiguration()
.MinimumLevel.Information()
.MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
diff --git a/samples/JS8.DPoP/Properties/launchSettings.json b/samples/Bff/Properties/launchSettings.json
similarity index 94%
rename from samples/JS8.DPoP/Properties/launchSettings.json
rename to samples/Bff/Properties/launchSettings.json
index 0cceaadb..d94badf2 100644
--- a/samples/JS8.DPoP/Properties/launchSettings.json
+++ b/samples/Bff/Properties/launchSettings.json
@@ -1,6 +1,6 @@
{
"profiles": {
- "Host6": {
+ "Bff": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
diff --git a/samples/JS8/Startup.cs b/samples/Bff/Startup.cs
similarity index 99%
rename from samples/JS8/Startup.cs
rename to samples/Bff/Startup.cs
index bd3d9fc2..5a78310b 100644
--- a/samples/JS8/Startup.cs
+++ b/samples/Bff/Startup.cs
@@ -52,7 +52,7 @@ public void ConfigureServices(IServiceCollection services)
options.Authority = "https://localhost:5001";
// confidential client using code flow + PKCE
- options.ClientId = "spa";
+ options.ClientId = "bff";
options.ClientSecret = "secret";
options.ResponseType = "code";
options.ResponseMode = "query";
diff --git a/samples/JS8/wwwroot/StyleSheet.css b/samples/Bff/wwwroot/StyleSheet.css
similarity index 100%
rename from samples/JS8/wwwroot/StyleSheet.css
rename to samples/Bff/wwwroot/StyleSheet.css
diff --git a/samples/JS8/wwwroot/app.js b/samples/Bff/wwwroot/app.js
similarity index 100%
rename from samples/JS8/wwwroot/app.js
rename to samples/Bff/wwwroot/app.js
diff --git a/samples/JS8/wwwroot/index.html b/samples/Bff/wwwroot/index.html
similarity index 98%
rename from samples/JS8/wwwroot/index.html
rename to samples/Bff/wwwroot/index.html
index d69e8b18..335aa23f 100644
--- a/samples/JS8/wwwroot/index.html
+++ b/samples/Bff/wwwroot/index.html
@@ -11,7 +11,7 @@
<body>
<div class="container">
<header class="page-header">
- <h1>SPA (.NET 8 host)</h1>
+ <h1>BFF</h1>
</header>
<div class="row">
diff --git a/samples/JS8/wwwroot/libs/bootstrap.min.css b/samples/Bff/wwwroot/libs/bootstrap.min.css
similarity index 100%
rename from samples/JS8/wwwroot/libs/bootstrap.min.css
rename to samples/Bff/wwwroot/libs/bootstrap.min.css
diff --git a/samples/JS8/wwwroot/libs/bootstrap.min.js b/samples/Bff/wwwroot/libs/bootstrap.min.js
similarity index 100%
rename from samples/JS8/wwwroot/libs/bootstrap.min.js
rename to samples/Bff/wwwroot/libs/bootstrap.min.js
diff --git a/samples/JS8.EF/wwwroot/todo.html b/samples/Bff/wwwroot/todo.html
similarity index 100%
rename from samples/JS8.EF/wwwroot/todo.html
rename to samples/Bff/wwwroot/todo.html
diff --git a/samples/JS8.EF/wwwroot/todo.js b/samples/Bff/wwwroot/todo.js
similarity index 100%
rename from samples/JS8.EF/wwwroot/todo.js
rename to samples/Bff/wwwroot/todo.js
diff --git a/samples/Blazor.Wasm/Blazor.Wasm.Bff/Program.cs b/samples/Blazor.Wasm/Blazor.Wasm.Bff/Program.cs
index 38ffd3eb..c87b49c8 100644
--- a/samples/Blazor.Wasm/Blazor.Wasm.Bff/Program.cs
+++ b/samples/Blazor.Wasm/Blazor.Wasm.Bff/Program.cs
@@ -27,7 +27,7 @@
options.Authority = "https://localhost:5001";
// confidential client using code flow + PKCE
- options.ClientId = "spa";
+ options.ClientId = "bff";
options.ClientSecret = "secret";
options.ResponseType = "code";
options.ResponseMode = "query";
diff --git a/samples/IdentityServer/Config.cs b/samples/IdentityServer/Config.cs
index 17c843be..7cf68b4e 100644
--- a/samples/IdentityServer/Config.cs
+++ b/samples/IdentityServer/Config.cs
@@ -10,35 +10,31 @@ namespace IdentityServerHost
public static class Config
{
public static IEnumerable<IdentityResource> IdentityResources =>
- new IdentityResource[]
- {
+ [
new IdentityResources.OpenId(),
new IdentityResources.Profile(),
- };
+ ];
public static IEnumerable<ApiScope> ApiScopes =>
- new ApiScope[]
- {
- new ApiScope("api", new[] { "name" }),
- new ApiScope("scope-for-isolated-api", new[] { "name" }),
- };
+ [
+ new ApiScope("api", ["name"]),
+ new ApiScope("scope-for-isolated-api", ["name"]),
+ ];
public static IEnumerable<ApiResource> ApiResources =>
- new ApiResource[]
- {
+ [
new ApiResource("urn:isolated-api", "isolated api")
{
RequireResourceIndicator = true,
Scopes = { "scope-for-isolated-api" }
}
- };
+ ];
public static IEnumerable<Client> Clients =>
- new Client[]
- {
+ [
new Client
{
- ClientId = "spa",
+ ClientId = "bff",
ClientSecrets = { new Secret("secret".Sha256()) },
AllowedGrantTypes =
@@ -54,13 +50,15 @@ public static class Config
AllowOfflineAccess = true,
AllowedScopes = { "openid", "profile", "api", "scope-for-isolated-api" },
- },
+ AccessTokenLifetime = 75 // Force refresh
+ },
new Client
{
- ClientId = "backchannel-spa",
+ ClientId = "bff.dpop",
ClientSecrets = { new Secret("secret".Sha256()) },
-
+ RequireDPoP = true,
+
AllowedGrantTypes =
{
GrantType.AuthorizationCode,
@@ -69,12 +67,34 @@ public static class Config
},
RedirectUris = { "https://localhost:5003/signin-oidc" },
- BackChannelLogoutUri = "https://localhost:5003/bff/backchannel",
+ FrontChannelLogoutUri = "https://localhost:5003/signout-oidc",
PostLogoutRedirectUris = { "https://localhost:5003/signout-callback-oidc" },
AllowOfflineAccess = true,
AllowedScopes = { "openid", "profile", "api", "scope-for-isolated-api" },
+
+ AccessTokenLifetime = 75 // Force refresh
},
- };
+ new Client
+ {
+ ClientId = "bff.ef",
+ ClientSecrets = { new Secret("secret".Sha256()) },
+
+ AllowedGrantTypes =
+ {
+ GrantType.AuthorizationCode,
+ GrantType.ClientCredentials,
+ OidcConstants.GrantTypes.TokenExchange
+ },
+ RedirectUris = { "https://localhost:5004/signin-oidc" },
+ BackChannelLogoutUri = "https://localhost:5004/bff/backchannel",
+ PostLogoutRedirectUris = { "https://localhost:5004/signout-callback-oidc" },
+
+ AllowOfflineAccess = true,
+ AllowedScopes = { "openid", "profile", "api", "scope-for-isolated-api" },
+
+ AccessTokenLifetime = 75 // Force refresh
+ }
+ ];
}
}
\ No newline at end of file
diff --git a/samples/JS.Yarp/JS.Yarp.csproj b/samples/JS.Yarp/JS.Yarp.csproj
deleted file mode 100644
index d6867d24..00000000
--- a/samples/JS.Yarp/JS.Yarp.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- <TargetFramework>net9.0</TargetFramework>
- <RootNamespace>YARP</RootNamespace>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
- <PackageReference Include="Serilog.AspNetCore" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\..\src\Duende.Bff.Yarp\Duende.Bff.Yarp.csproj" />
- </ItemGroup>
-
-</Project>
diff --git a/samples/JS.Yarp/LocalApiController.cs b/samples/JS.Yarp/LocalApiController.cs
deleted file mode 100644
index 06976682..00000000
--- a/samples/JS.Yarp/LocalApiController.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-using Microsoft.AspNetCore.Mvc;
-
-namespace YarpHost
-{
- [Route("local")]
- //[BffApi]
- public class LocalApiController : ControllerBase
- {
- public IActionResult Get()
- {
- var data = new
- {
- Message = "Hello from local API",
- User = User.FindFirst("name")?.Value ?? User.FindFirst("sub").Value
- };
-
- return Ok(data);
- }
- }
-}
\ No newline at end of file
diff --git a/samples/JS.Yarp/Program.cs b/samples/JS.Yarp/Program.cs
deleted file mode 100644
index f09082b9..00000000
--- a/samples/JS.Yarp/Program.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
-using Serilog;
-using Serilog.Events;
-using Serilog.Sinks.SystemConsole.Themes;
-
-namespace YarpHost
-{
- public class Program
- {
- public static int Main(string[] args)
- {
- Log.Logger = new LoggerConfiguration()
- .MinimumLevel.Information()
- .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
- .MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information)
- .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
- .MinimumLevel.Override("IdentityModel", LogEventLevel.Debug)
- .MinimumLevel.Override("Duende.Bff", LogEventLevel.Debug)
- .Enrich.FromLogContext()
- .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code)
- .CreateLogger();
-
- try
- {
- Log.Information("Starting host...");
- CreateHostBuilder(args).Build().Run();
- return 0;
- }
- catch (Exception ex)
- {
- Log.Fatal(ex, "Host terminated unexpectedly.");
- return 1;
- }
- finally
- {
- Log.CloseAndFlush();
- }
- }
-
- public static IHostBuilder CreateHostBuilder(string[] args)
- {
- return Host.CreateDefaultBuilder(args)
- .UseSerilog()
- .ConfigureWebHostDefaults(webBuilder =>
- {
- webBuilder.UseStartup<Startup>();
- });
- }
- }
-}
\ No newline at end of file
diff --git a/samples/JS.Yarp/Properties/launchSettings.json b/samples/JS.Yarp/Properties/launchSettings.json
deleted file mode 100644
index 41550a4d..00000000
--- a/samples/JS.Yarp/Properties/launchSettings.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "profiles": {
- "Host5": {
- "commandName": "Project",
- "dotnetRunMessages": true,
- "launchBrowser": true,
- "applicationUrl": "https://localhost:5002",
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- }
- }
-}
\ No newline at end of file
diff --git a/samples/JS.Yarp/Startup.cs b/samples/JS.Yarp/Startup.cs
deleted file mode 100644
index 8ca4bcc1..00000000
--- a/samples/JS.Yarp/Startup.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Duende.Bff;
-using Duende.Bff.Yarp;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using Serilog;
-using Yarp.ReverseProxy.Configuration;
-
-namespace YarpHost
-{
- public class Startup
- {
- public void ConfigureServices(IServiceCollection services)
- {
- var builder = services.AddReverseProxy()
- .AddBffExtensions();
-
- builder.LoadFromMemory(
- new[]
- {
- new RouteConfig()
- {
- RouteId = "api_user",
- ClusterId = "cluster1",
-
- Match = new()
- {
- Path = "/user_api/{**catch-all}"
- }
- }.WithAccessToken(TokenType.User).WithAntiforgeryCheck(),
- new RouteConfig()
- {
- RouteId = "api_client",
- ClusterId = "cluster1",
-
- Match = new()
- {
- Path = "/client_api/{**catch-all}"
- }
- }.WithAccessToken(TokenType.Client).WithAntiforgeryCheck(),
- new RouteConfig()
- {
- RouteId = "api_anon",
- ClusterId = "cluster1",
-
- Match = new()
- {
- Path = "/anon_api/{**catch-all}"
- }
- }.WithAntiforgeryCheck(),
- new RouteConfig()
- {
- RouteId = "api_optional_user",
- ClusterId = "cluster1",
-
- Match = new()
- {
- Path = "/optional_user_api/{**catch-all}"
- }
- }.WithOptionalUserAccessToken().WithAntiforgeryCheck()
- },
- new[]
- {
- new ClusterConfig
- {
- ClusterId = "cluster1",
-
- Destinations = new Dictionary<string, DestinationConfig>(StringComparer.OrdinalIgnoreCase)
- {
- { "destination1", new() { Address = "https://localhost:5010" } },
- }
- }
- });
-
-
- // Add BFF services to DI - also add server-side session management
- services.AddBff()
- .AddServerSideSessions();
-
- // local APIs
- services.AddControllers();
-
- // cookie options
- services.AddAuthentication(options =>
- {
- options.DefaultScheme = "cookie";
- options.DefaultChallengeScheme = "oidc";
- options.DefaultSignOutScheme = "oidc";
- })
- .AddCookie("cookie", options =>
- {
- // set session lifetime
- options.ExpireTimeSpan = TimeSpan.FromHours(8);
-
- // sliding or absolute
- options.SlidingExpiration = false;
-
- // host prefixed cookie name
- options.Cookie.Name = "__Host-spa-yarp";
-
- // strict SameSite handling
- options.Cookie.SameSite = SameSiteMode.Strict;
- })
- .AddOpenIdConnect("oidc", options =>
- {
- options.Authority = "https://localhost:5001";
-
- // confidential client using code flow + PKCE
- options.ClientId = "spa";
- options.ClientSecret = "secret";
- options.ResponseType = "code";
- options.ResponseMode = "query";
-
- options.MapInboundClaims = false;
- options.GetClaimsFromUserInfoEndpoint = true;
- options.SaveTokens = true;
-
- // request scopes + refresh tokens
- options.Scope.Clear();
- options.Scope.Add("openid");
- options.Scope.Add("profile");
- options.Scope.Add("api");
- options.Scope.Add("offline_access");
- });
- }
-
- public void Configure(IApplicationBuilder app)
- {
- app.UseSerilogRequestLogging();
- app.UseDeveloperExceptionPage();
-
- app.UseDefaultFiles();
- app.UseStaticFiles();
-
- app.UseAuthentication();
- app.UseRouting();
-
- // adds antiforgery protection for local APIs
- app.UseBff();
-
- // adds authorization for local and remote API endpoints
- app.UseAuthorization();
-
- app.UseEndpoints(endpoints =>
- {
- // local APIs
- endpoints.MapControllers()
- .RequireAuthorization()
- .AsBffApiEndpoint();
-
- // login, logout, user, backchannel logout...
- endpoints.MapBffManagementEndpoints();
-
- endpoints.MapReverseProxy(proxyApp =>
- {
- proxyApp.UseAntiforgeryCheck();
- });
- });
- }
- }
-}
\ No newline at end of file
diff --git a/samples/JS.Yarp/wwwroot/app.js b/samples/JS.Yarp/wwwroot/app.js
deleted file mode 100644
index e6d16062..00000000
--- a/samples/JS.Yarp/wwwroot/app.js
+++ /dev/null
@@ -1,148 +0,0 @@
-const loginUrl = "/bff/login";
-const userUrl = "/bff/user";
-let logoutUrl = "/bff/logout";
-
-async function onLoad() {
- var req = new Request(userUrl, {
- headers: new Headers({
- 'X-CSRF': '1'
- })
- })
-
- try {
- var resp = await fetch(req);
- if (resp.ok) {
- log("user logged in");
-
- let claims = await resp.json();
- showUser(claims);
-
- let logoutUrlClaim = claims.find(claim => claim.type === 'bff:logout_url');
- if (logoutUrlClaim) {
- logoutUrl = logoutUrlClaim.value;
- }
- } else if (resp.status === 401) {
- log("user not logged in");
- }
- }
- catch (e) {
- log("error checking user status");
- }
-}
-
-onLoad();
-
-function login() {
- window.location = loginUrl;
-}
-
-function logout() {
- window.location = logoutUrl;
-}
-
-async function callUserToken() {
- var req = new Request("/user_api", {
- headers: new Headers({
- 'X-CSRF': '1'
- })
- })
- var resp = await fetch(req);
-
- log("API Result: " + resp.status);
- if (resp.ok) {
- showApi(await resp.json());
- }
-}
-
-async function callOptionalUserToken() {
- var req = new Request("/optional_user_api", {
- headers: new Headers({
- 'X-CSRF': '1'
- })
- })
- var resp = await fetch(req);
-
- log("API Result: " + resp.status);
- if (resp.ok) {
- showApi(await resp.json());
- }
-}
-
-async function callClientToken() {
- var req = new Request("/client_api", {
- headers: new Headers({
- 'X-CSRF': '1'
- })
- })
- var resp = await fetch(req);
-
- log("API Result: " + resp.status);
- if (resp.ok) {
- showApi(await resp.json());
- }
-}
-
-async function callNoToken() {
- var req = new Request("/anon_api", {
- headers: new Headers({
- 'X-CSRF': '1'
- })
- })
- var resp = await fetch(req);
-
- log("API Result: " + resp.status);
- if (resp.ok) {
- showApi(await resp.json());
- }
-}
-
-
-
-document.querySelector(".login").addEventListener("click", login, false);
-document.querySelector(".logout").addEventListener("click", logout, false);
-
-document.querySelector(".call_user").addEventListener("click", callUserToken, false);
-document.querySelector(".call_optional_user").addEventListener("click", callOptionalUserToken, false);
-document.querySelector(".call_client").addEventListener("click", callClientToken, false);
-document.querySelector(".call_anon").addEventListener("click", callNoToken, false);
-
-
-
-function showApi() {
- document.getElementById('api-result').innerText = '';
-
- Array.prototype.forEach.call(arguments, function (msg) {
- if (msg instanceof Error) {
- msg = "Error: " + msg.message;
- } else if (typeof msg !== 'string') {
- msg = JSON.stringify(msg, null, 2);
- }
- document.getElementById('api-result').innerText += msg + '\r\n';
- });
-}
-
-function showUser() {
- document.getElementById('user').innerText = '';
-
- Array.prototype.forEach.call(arguments, function (msg) {
- if (msg instanceof Error) {
- msg = "Error: " + msg.message;
- } else if (typeof msg !== 'string') {
- msg = JSON.stringify(msg, null, 2);
- }
- document.getElementById('user').innerText += msg + '\r\n';
- });
-}
-
-function log() {
- document.getElementById('response').innerText = '';
-
- Array.prototype.forEach.call(arguments, function (msg) {
- if (msg instanceof Error) {
- msg = "Error: " + msg.message;
- } else if (typeof msg !== 'string') {
- msg = JSON.stringify(msg, null, 2);
- }
- document.getElementById('response').innerText += msg + '\r\n';
- });
-}
diff --git a/samples/JS.Yarp/wwwroot/index.html b/samples/JS.Yarp/wwwroot/index.html
deleted file mode 100644
index 9d9b2057..00000000
--- a/samples/JS.Yarp/wwwroot/index.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <meta charset="utf-8" />
- <title></title>
- <link href="libs/bootstrap.min.css" rel="stylesheet" />
- <link href="StyleSheet.css" rel="stylesheet" />
-</head>
-<body>
- <div class="container">
- <header class="page-header">
- <h1>YARP-first client</h1>
- </header>
-
- <div class="row">
- <ul class="list-unstyled list-inline">
- <li><button class="btn btn-default login">Login</button></li>
- <li><button class="btn btn-primary call_user">Call YARP endpoint (user token)</button></li>
- <li><button class="btn btn-primary call_optional_user">Call YARP endpoint (optional user token)</button></li>
- <li><button class="btn btn-primary call_client">Call YARP endpoint (client token)</button></li>
- <li><button class="btn btn-primary call_anon">Call YARP endpoint (no token)</button></li>
- <li><button class="btn btn-info logout">Logout</button></li>
- </ul>
- </div>
-
- <div class="row">
- <ul class="list-unstyled list-inline">
- </ul>
- </div>
-
- <div class="row">
- <div class="panel panel-default">
- <div class="panel-heading">Message</div>
- <div class="panel-body">
- <pre id="response"></pre>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-sm-6">
- <div class="panel panel-default">
- <div class="panel-heading">Current User</div>
- <div class="panel-body">
- <pre id="user"></pre>
- </div>
- </div>
- </div>
-
- <div class="col-sm-6">
- <div class="panel panel-default">
- <div class="panel-heading">API Result</div>
- <div class="panel-body">
- <pre id="api-result"></pre>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <script src="app.js"></script>
-</body>
-</html>
diff --git a/samples/JS8.EF/wwwroot/StyleSheet.css b/samples/JS8.EF/wwwroot/StyleSheet.css
deleted file mode 100644
index 006bef38..00000000
--- a/samples/JS8.EF/wwwroot/StyleSheet.css
+++ /dev/null
@@ -1,3 +0,0 @@
-pre:empty {
- display: none;
-}
diff --git a/samples/JS8.EF/wwwroot/libs/bootstrap.min.css b/samples/JS8.EF/wwwroot/libs/bootstrap.min.css
deleted file mode 100644
index 28f154de..00000000
--- a/samples/JS8.EF/wwwroot/libs/bootstrap.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Bootstrap v3.3.2 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px \9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.form-group-sm .form-control{height:30px;line-height:30px}select[multiple].form-group-sm .form-control,textarea.form-group-sm .form-control{height:auto}.form-group-sm .form-control-static{height:30px;padding:5px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.form-group-lg .form-control{height:46px;line-height:46px}select[multiple].form-group-lg .form-control,textarea.form-group-lg .form-control{height:auto}.form-group-lg .form-control-static{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.active,.btn-default.focus,.btn-default:active,.btn-default:focus,.btn-default:hover,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.active,.btn-primary.focus,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.active,.btn-success.focus,.btn-success:active,.btn-success:focus,.btn-success:hover,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.active,.btn-info.focus,.btn-info:active,.btn-info:focus,.btn-info:hover,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.active,.btn-warning.focus,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.active,.btn-danger.focus,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none;visibility:hidden}.collapse.in{display:block;visibility:visible}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px solid}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none;visibility:hidden}.tab-content>.active{display:block;visibility:visible}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important;visibility:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px 15px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding:48px 0}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:absolute;top:0;right:0;left:0;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-weight:400;line-height:1.4;visibility:visible;filter:alpha(opacity=0);opacity:0}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-weight:400;line-height:1.42857143;text-align:left;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000;perspective:1000}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;margin-top:-10px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
\ No newline at end of file
diff --git a/samples/JS8/wwwroot/todo.html b/samples/JS8/wwwroot/todo.html
deleted file mode 100644
index 22f656fc..00000000
--- a/samples/JS8/wwwroot/todo.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <meta charset="utf-8" />
- <title></title>
- <link href="libs/bootstrap.min.css" rel="stylesheet" />
- <link href="StyleSheet.css" rel="stylesheet" />
-</head>
-<body>
- <div class="container">
- <header class="page-header">
- <h1>TODOs</h1>
- <div>
- <a href="/bff/login?returnUrl=/todo.html">Login</a>
- <a href="/bff/logout?returnUrl=/todo.html">Logout</a>
- </div>
- </header>
-
- <div class="row">
- <h2>Add New</h2>
- <div>
- <label>Todo Date</label>
- <input id="date" type="datetime" value="2021-03-01" />
- <label>Todo Name</label>
- <input id="name" value="Do something" />
- <button id="createNewButton">Create</button>
- </div>
- </div>
-
- <div class="row">
- <table class="table table-condensed">
- <thead>
- <tr>
- <th></th>
- <th>Id</th>
- <th>Date</th>
- <th>Note</th>
- <th>User</th>
- </tr>
- </thead>
- <tbody id="todos"></tbody>
- </table>
- </div>
- </div>
-
- <script src="todo.js"></script>
-</body>
-</html>
diff --git a/samples/JS8/wwwroot/todo.js b/samples/JS8/wwwroot/todo.js
deleted file mode 100644
index 01923480..00000000
--- a/samples/JS8/wwwroot/todo.js
+++ /dev/null
@@ -1,94 +0,0 @@
-const todoUrl = "/api/todos";
-const todos = document.getElementById("todos");
-
-document.getElementById("createNewButton").addEventListener("click", createTodo);
-const name = document.getElementById("name");
-const date = document.getElementById("date");
-
-
-async function createTodo() {
- let request = new Request(todoUrl, {
- method: "POST",
- headers: {
- "content-type": "application/json",
- 'x-csrf': '1'
- },
- body: JSON.stringify({
- name: name.value,
- date: date.value,
- })
- });
-
- let result = await fetch(request);
- if (result.ok) {
- var item = await result.json();
- addRow(item);
- }
-}
-
-async function showTodos() {
- let result = await fetch(new Request(todoUrl, {
- headers: {
- 'x-csrf': '1'
- },
- }));
-
- if (result.ok) {
- let data = await result.json();
- data.forEach(item => addRow(item));
- }
-}
-
-function addRow(item) {
- let row = document.createElement("tr");
- row.dataset.id = item.id;
- todos.appendChild(row);
-
- function addCell(row, text) {
- let cell = document.createElement("td");
- cell.innerText = text;
- row.appendChild(cell);
- }
-
- function addDeleteButton(row, id) {
- let cell = document.createElement("td");
- row.appendChild(cell);
- let btn = document.createElement("button");
- cell.appendChild(btn);
- btn.textContent = "delete";
- btn.addEventListener("click", async () => await deleteTodo(id));
- }
-
- addDeleteButton(row, item.id);
- addCell(row, item.id);
- addCell(row, item.date);
- addCell(row, item.name);
- addCell(row, item.user);
-}
-
-
-async function deleteRow(id) {
- let row = todos.querySelector(`tr[data-id='${id}']`);
- if (row) {
- todos.removeChild(row);
- }
-}
-
-async function deleteTodo(id) {
- let request = new Request(todoUrl + "/" + id, {
- headers: {
- 'x-csrf': '1'
- },
- method: "DELETE"
- });
-
- let result = await fetch(request);
- if (result.ok) {
- deleteRow(id);
- }
-}
-
-
-showTodos();
-
-