Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-12-23 17:07:42 +01:00
Code Issues Projects Releases Wiki Activity

appid no longer served from api

Browse Source
This commit is contained in:
Kyle Spearrin 2017-06-27 14:05:50 -04:00
parent 8b40863472
commit 6c16a988c3
9 changed files with 2 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Api/Controllers/TwoFactorController.cs
View File

@ -135,33 +135,6 @@ namespace Bit.Api.Controllers
}
}
[HttpGet("~/app-id.json")]
[Produces("application/fido.trusted-apps+json")]
[AllowAnonymous]
public string GetU2fAppId()
{
return JsonConvert.SerializeObject(new
{
trustedFacets = new object[]
{
new
{
version = new
{
major = 1,
minor = 0
},
ids = new string[]
{
_globalSettings.U2f.AppId,
//"ios:bundle-id:com.8bit.bitwarden",
//"android:apk-key-hash:585215fd5153209a7e246f53286035838a0be227"
}
}
}
});
}
[HttpPut("u2f")]
[HttpPost("u2f")]
public async Task<TwoFactorU2fResponseModel> PutU2f([FromBody]TwoFactorU2fRequestModel model)

38
src/Api/Middleware/AdjustHeadersMiddleware.cs
View File

@ -1,38 +0,0 @@
using Bit.Core;
using Microsoft.AspNetCore.Http;
using System.Linq;
using System.Threading.Tasks;
namespace Bit.Api.Middleware
{
public class AdjustHeadersMiddleware
{
private readonly RequestDelegate _next;
public AdjustHeadersMiddleware(RequestDelegate next)
{
_next = next;
}
public async Task Invoke(HttpContext httpContext, CurrentContext currentContext)
{
httpContext.Response.OnStarting((state) =>
{
if(httpContext.Response.Headers.Count > 0 && httpContext.Response.Headers.ContainsKey("Content-Type"))
{
var contentType = httpContext.Response.Headers["Content-Type"].ToString();
if(contentType.StartsWith("application/fido.trusted-apps+json"))
{
httpContext.Response.Headers.Remove("Content-Type");
httpContext.Response.Headers.Append("Content-Type", "application/fido.trusted-apps+json");
}
}
return Task.FromResult(0);
}, null);
await _next.Invoke(httpContext);
}
}
}

2
src/Api/Startup.cs
View File

@ -150,8 +150,6 @@ namespace Bit.Api
})
.AddDebug();
app.UseMiddleware<AdjustHeadersMiddleware>();
// Rate limiting
app.UseMiddleware<CustomIpRateLimitMiddleware>();

1
src/Api/settings.json
View File

@ -2,7 +2,6 @@
"globalSettings": {
"siteName": "bitwarden",
"baseVaultUri": "http://localhost:4001/#",
"baseApiUri": "http://localhost:4000/",
"jwtSigningKey": "THIS IS A SECRET. IT KEEPS YOUR TOKEN SAFE. :)",
"stripeApiKey": "SECRET",
"sqlServer": {

1
src/Billing/settings.json
View File

@ -2,7 +2,6 @@
"globalSettings": {
"siteName": "bitwarden",
"baseVaultUri": "http://localhost:4001/#",
"baseApiUri": "http://localhost:4000/",
"jwtSigningKey": "THIS IS A SECRET. IT KEEPS YOUR TOKEN SAFE. :)",
"stripeApiKey": "SECRET",
"sqlServer": {

1
src/Core/GlobalSettings.cs
View File

@ -4,7 +4,6 @@
{
public virtual string SiteName { get; set; }
public virtual string BaseVaultUri { get; set; }
public virtual string BaseApiUri { get; set; }
public virtual string JwtSigningKey { get; set; }
public virtual string StripeApiKey { get; set; }
public virtual SqlServerSettings SqlServer { get; set; } = new SqlServerSettings();

2
src/Core/Utilities/CoreHelpers.cs
View File

@ -122,8 +122,8 @@ namespace Bit.Core.Utilities
public static string U2fAppIdUrl(GlobalSettings globalSettings)
{
//return $"{globalSettings.BaseApiUri}app-id.json";
return globalSettings.U2f.AppId;
//return "https://localhost:4001/app-id.fidou2f";
}
}
}

2
src/Core/Utilities/ServiceCollectionExtensions.cs
View File

@ -48,7 +48,7 @@ namespace Bit.Core.Utilities
public static void AddDefaultServices(this IServiceCollection services)
{
services.AddSingleton<IMailService, SendGridTemplateMailService>();
services.AddSingleton<IMailService, RazorViewMailService>();
services.AddSingleton<IMailDeliveryService, SendGridMailDeliveryService>();
services.AddSingleton<IPushNotificationService, NotificationHubPushNotificationService>();
services.AddSingleton<IBlockIpService, AzureQueueBlockIpService>();

1
src/Identity/settings.json
View File

@ -2,7 +2,6 @@
"globalSettings": {
"siteName": "bitwarden",
"baseVaultUri": "http://localhost:4001/#",
"baseApiUri": "http://localhost:4000/",
"jwtSigningKey": "THIS IS A SECRET. IT KEEPS YOUR TOKEN SAFE. :)",
"stripeApiKey": "SECRET",
"sqlServer": {