1
0
mirror of https://github.com/bitwarden/server.git synced 2025-05-16 17:15:40 -05:00
This commit is contained in:
Kyle Spearrin 2017-05-06 09:12:45 -04:00
parent 430f8439c5
commit c4293afe57
2 changed files with 3 additions and 3 deletions

View File

@ -15,7 +15,7 @@ namespace Bit.Api.Utilities
{ {
public override void OnException(ExceptionContext context) public override void OnException(ExceptionContext context)
{ {
var errorModel = new ErrorResponseModel("An error has occured."); var errorModel = new ErrorResponseModel("An error has occurred.");
var exception = context.Exception; var exception = context.Exception;
if(exception == null) if(exception == null)
@ -63,7 +63,7 @@ namespace Bit.Api.Utilities
var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<ExceptionHandlerFilterAttribute>>(); var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<ExceptionHandlerFilterAttribute>>();
logger.LogError(0, exception, exception.Message); logger.LogError(0, exception, exception.Message);
errorModel.Message = "An unhandled server error has occured."; errorModel.Message = "An unhandled server error has occurred.";
context.HttpContext.Response.StatusCode = 500; context.HttpContext.Response.StatusCode = 500;
} }

View File

@ -7,7 +7,7 @@ namespace Bit.Api.Utilities
public static class TokenRetrieval public static class TokenRetrieval
{ {
public static Func<HttpRequest, string> FromAuthorizationHeaderOrQueryString(string headerScheme = "Bearer", public static Func<HttpRequest, string> FromAuthorizationHeaderOrQueryString(string headerScheme = "Bearer",
string qsName = "account_token") string qsName = "access_token")
{ {
return (request) => return (request) =>
{ {