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

Fixes: U4-7536 Sign-out in back office will call all ASP.Net identity middleware sign out methods

Browse Source 
publicises a few things too.
This commit is contained in:
Shannon
2015-12-15 10:34:11 +01:00
parent 220446afec
commit 8598ab565c
6 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Constants-Conventions.cs
View File

@@ -206,7 +206,7 @@ namespace Umbraco.Core
/// </summary>
internal const string StandardPropertiesGroupName = "Membership";
internal static Dictionary<string, PropertyType> GetStandardPropertyTypeStubs()
public static Dictionary<string, PropertyType> GetStandardPropertyTypeStubs()
{
return new Dictionary<string, PropertyType>
{

4
src/Umbraco.Core/Security/AuthenticationExtensions.cs
View File

@@ -357,7 +357,9 @@ namespace Umbraco.Core.Security
{
//TODO: Do we need to do more here?? need to make sure that the forms cookie is gone, but is that
// taken care of in our custom middleware somehow?
ctx.Authentication.SignOut();
ctx.Authentication.SignOut(
Core.Constants.Security.BackOfficeAuthenticationType,
Core.Constants.Security.BackOfficeExternalAuthenticationType);
return null;
}
}

6
src/Umbraco.Web/Editors/AuthenticationController.cs
View File

@@ -97,7 +97,7 @@ namespace Umbraco.Web.Editors
if (result.Succeeded)
{
var user = await UserManager.FindByIdAsync(User.Identity.GetUserId<int>());
await SignInManager.SignInAsync(user, isPersistent: false, rememberBrowser: false);
await SignInManager.SignInAsync(user, isPersistent: true, rememberBrowser: false);
return Request.CreateResponse(HttpStatusCode.OK);
}
else
@@ -240,7 +240,9 @@ namespace Umbraco.Web.Editors
[ValidateAngularAntiForgeryToken]
public HttpResponseMessage PostLogout()
{
Request.TryGetOwinContext().Result.Authentication.SignOut();
Request.TryGetOwinContext().Result.Authentication.SignOut(
Core.Constants.Security.BackOfficeAuthenticationType,
Core.Constants.Security.BackOfficeExternalAuthenticationType);
Logger.Info<AuthenticationController>("User {0} from IP address {1} has logged out",
() => User.Identity == null ? "UNKNOWN" : User.Identity.Name,

7
src/Umbraco.Web/IUmbracoContextAccessor.cs
View File

@@ -2,11 +2,8 @@ namespace Umbraco.Web
{
/// <summary>
/// Used to retrieve the Umbraco context
/// </summary>
/// <remarks>
/// TODO: We could expose this to make working with UmbracoContext easier if we were to use it throughout the codebase
/// </remarks>
internal interface IUmbracoContextAccessor
/// </summary>
public interface IUmbracoContextAccessor
{
UmbracoContext Value { get; }
}

6
src/Umbraco.Web/Security/WebSecurity.cs
View File

@@ -131,7 +131,7 @@ namespace Umbraco.Web.Security
var userData = Mapper.Map<UserData>(user);
_httpContext.SetPrincipalForRequest(userData);
SignInManager.SignInAsync(user, isPersistent: false, rememberBrowser: false).Wait();
SignInManager.SignInAsync(user, isPersistent: true, rememberBrowser: false).Wait();
return TimeSpan.FromMinutes(GlobalSettings.TimeOutInMinutes).TotalSeconds;
}
@@ -162,7 +162,9 @@ namespace Umbraco.Web.Security
public virtual void ClearCurrentLogin()
{
_httpContext.UmbracoLogout();
_httpContext.GetOwinContext().Authentication.SignOut();
_httpContext.GetOwinContext().Authentication.SignOut(
Core.Constants.Security.BackOfficeAuthenticationType,
Core.Constants.Security.BackOfficeExternalAuthenticationType);
}
/// <summary>

4
src/Umbraco.Web/WebApi/Filters/UmbracoBackOfficeLogoutAttribute.cs
View File

@@ -19,7 +19,9 @@ namespace Umbraco.Web.WebApi.Filters
//this calls the underlying owin sign out logic - which should call the
// auth providers middleware callbacks if using custom auth middleware
context.Request.TryGetOwinContext().Result.Authentication.SignOut();
context.Request.TryGetOwinContext().Result.Authentication.SignOut(
Core.Constants.Security.BackOfficeAuthenticationType,
Core.Constants.Security.BackOfficeExternalAuthenticationType);
}
}
}