yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove LogWarning<T> from LoggerExtensions

Browse Source
This commit is contained in:
Nikolaj
2020-09-16 09:58:07 +02:00
parent dda6fb12a3
commit 488093add3
56 changed files with 105 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
View File

@@ -80,7 +80,7 @@ namespace Umbraco.Web.BackOffice.Controllers
{
var viewPath = Path.Combine(_globalSettings.UmbracoPath , Constants.Web.Mvc.BackOfficeArea, nameof(Default) + ".cshtml")
.Replace("\\", "/"); // convert to forward slashes since it's a virtual path
return await RenderDefaultOrProcessExternalLoginAsync(
() => View(viewPath),
() => View(viewPath));
@@ -99,7 +99,7 @@ namespace Umbraco.Web.BackOffice.Controllers
if (invite == null)
{
_logger.LogWarning<BackOfficeController>("VerifyUser endpoint reached with invalid token: NULL");
_logger.LogWarning("VerifyUser endpoint reached with invalid token: NULL");
return RedirectToAction(nameof(Default));
}
@@ -107,7 +107,7 @@ namespace Umbraco.Web.BackOffice.Controllers
if (parts.Length != 2)
{
_logger.LogWarning<BackOfficeController>("VerifyUser endpoint reached with invalid token: {Invite}", invite);
_logger.LogWarning("VerifyUser endpoint reached with invalid token: {Invite}", invite);
return RedirectToAction(nameof(Default));
}
@@ -116,7 +116,7 @@ namespace Umbraco.Web.BackOffice.Controllers
var decoded = token.FromUrlBase64();
if (decoded.IsNullOrWhiteSpace())
{
_logger.LogWarning<BackOfficeController>("VerifyUser endpoint reached with invalid token: {Invite}", invite);
_logger.LogWarning("VerifyUser endpoint reached with invalid token: {Invite}", invite);
return RedirectToAction(nameof(Default));
}
@@ -125,7 +125,7 @@ namespace Umbraco.Web.BackOffice.Controllers
var identityUser = await _userManager.FindByIdAsync(id);
if (identityUser == null)
{
_logger.LogWarning<BackOfficeController>("VerifyUser endpoint reached with non existing user: {UserId}", id);
_logger.LogWarning("VerifyUser endpoint reached with non existing user: {UserId}", id);
return RedirectToAction(nameof(Default));
}
@@ -133,7 +133,7 @@ namespace Umbraco.Web.BackOffice.Controllers
if (result.Succeeded == false)
{
_logger.LogWarning<BackOfficeController>("Could not verify email, Error: {Errors}, Token: {Invite}", result.Errors.ToErrorMessage(), invite);
_logger.LogWarning("Could not verify email, Error: {Errors}, Token: {Invite}", result.Errors.ToErrorMessage(), invite);
return new RedirectResult(Url.Action(nameof(Default)) + "#/login/false?invite=3");
}