Merge branch 'netcore/netcore' into feature/8651-config-options-patten

This commit is contained in:
Andy Butland
2020-08-24 09:45:25 +02:00
88 changed files with 194 additions and 6481 deletions

View File

@@ -416,6 +416,8 @@ namespace Umbraco.Web.BackOffice.Controllers
return Ok();
}
/// <summary>
/// Return the <see cref="UserDetail"/> for the given <see cref="IUser"/>
/// </summary>

View File

@@ -2291,7 +2291,7 @@ namespace Umbraco.Web.Editors
return notifications;
}
public IActionResult PostNotificationOptions(int contentId, [FromQuery] string[] notifyOptions)
public IActionResult PostNotificationOptions(int contentId, [FromQuery(Name="notifyOptions[]")] string[] notifyOptions)
{
if (contentId <= 0) return NotFound();
var content = _contentService.GetById(contentId);

View File

@@ -234,5 +234,12 @@ namespace Umbraco.Web.BackOffice.Controllers
throw HttpResponseException.CreateValidationErrorResponse(ModelState);
}
[UmbracoAuthorize]
[ValidateAngularAntiForgeryToken]
public async Task<Dictionary<string, string>> GetCurrentUserLinkedLogins()
{
var identityUser = await _backOfficeUserManager.FindByIdAsync(_webSecurity.GetUserId().ResultOr(0).ToString());
return identityUser.Logins.ToDictionary(x => x.LoginProvider, x => x.ProviderKey);
}
}
}