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

Removed temporary class naming

Browse Source
This commit is contained in:
Scott Brady
2020-04-04 12:59:29 +01:00
parent 851ae1ba0f
commit 809ead4223
20 changed files with 92 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComponent.cs
+11 -11
View File
@@ -24,17 +24,17 @@ namespace Umbraco.Web.Compose
public void Initialize()
{
//BackOfficeUserManager2.AccountLocked += ;
//BackOfficeUserManager2.AccountUnlocked += ;
BackOfficeUserManager2.ForgotPasswordRequested += OnForgotPasswordRequest;
BackOfficeUserManager2.ForgotPasswordChangedSuccess += OnForgotPasswordChange;
BackOfficeUserManager2.LoginFailed += OnLoginFailed;
//BackOfficeUserManager2.LoginRequiresVerification += ;
BackOfficeUserManager2.LoginSuccess += OnLoginSuccess;
BackOfficeUserManager2.LogoutSuccess += OnLogoutSuccess;
BackOfficeUserManager2.PasswordChanged += OnPasswordChanged;
BackOfficeUserManager2.PasswordReset += OnPasswordReset;
//BackOfficeUserManager2.ResetAccessFailedCount += ;
//BackOfficeUserManager.AccountLocked += ;
//BackOfficeUserManager.AccountUnlocked += ;
BackOfficeUserManager.ForgotPasswordRequested += OnForgotPasswordRequest;
BackOfficeUserManager.ForgotPasswordChangedSuccess += OnForgotPasswordChange;
BackOfficeUserManager.LoginFailed += OnLoginFailed;
//BackOfficeUserManager.LoginRequiresVerification += ;
BackOfficeUserManager.LoginSuccess += OnLoginSuccess;
BackOfficeUserManager.LogoutSuccess += OnLogoutSuccess;
BackOfficeUserManager.PasswordChanged += OnPasswordChanged;
BackOfficeUserManager.PasswordReset += OnPasswordReset;
//BackOfficeUserManager.ResetAccessFailedCount += ;
}
public void Terminate()
src/Umbraco.Web/Editors/AuthenticationController.cs
+6 -6
View File
@@ -40,8 +40,8 @@ namespace Umbraco.Web.Editors
[IsBackOffice]
public class AuthenticationController : UmbracoApiController
{
private BackOfficeUserManager2<BackOfficeIdentityUser> _userManager;
private BackOfficeSignInManager2 _signInManager;
private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
private BackOfficeSignInManager _signInManager;
private readonly IUserPasswordConfiguration _passwordConfiguration;
private readonly IRuntimeState _runtimeState;
private readonly IUmbracoSettingsSection _umbracoSettingsSection;
@@ -69,11 +69,11 @@ namespace Umbraco.Web.Editors
_ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
}
protected BackOfficeUserManager2<BackOfficeIdentityUser> UserManager => _userManager
?? (_userManager = TryGetOwinContext().Result.GetBackOfficeUserManager2());
protected BackOfficeUserManager<BackOfficeIdentityUser> UserManager => _userManager
?? (_userManager = TryGetOwinContext().Result.GetBackOfficeUserManager());
protected BackOfficeSignInManager2 SignInManager => _signInManager
?? (_signInManager = TryGetOwinContext().Result.GetBackOfficeSignInManager2());
protected BackOfficeSignInManager SignInManager => _signInManager
?? (_signInManager = TryGetOwinContext().Result.GetBackOfficeSignInManager());
/// <summary>
/// Returns the configuration for the backoffice user membership provider - used to configure the change password dialog
src/Umbraco.Web/Editors/BackOfficeController.cs
+4 -4
View File
@@ -43,8 +43,8 @@ namespace Umbraco.Web.Editors
private readonly IManifestParser _manifestParser;
private readonly UmbracoFeatures _features;
private readonly IRuntimeState _runtimeState;
private BackOfficeUserManager2<BackOfficeIdentityUser> _userManager;
private BackOfficeSignInManager2 _signInManager;
private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
private BackOfficeSignInManager _signInManager;
private readonly IUmbracoVersion _umbracoVersion;
private readonly IGridConfig _gridConfig;
private readonly IUmbracoSettingsSection _umbracoSettingsSection;
@@ -84,9 +84,9 @@ namespace Umbraco.Web.Editors
_httpContextAccessor = httpContextAccessor;
}
protected BackOfficeSignInManager2 SignInManager => _signInManager ?? (_signInManager = OwinContext.GetBackOfficeSignInManager2());
protected BackOfficeSignInManager SignInManager => _signInManager ?? (_signInManager = OwinContext.GetBackOfficeSignInManager());
protected BackOfficeUserManager2<BackOfficeIdentityUser> UserManager => _userManager ?? (_userManager = OwinContext.GetBackOfficeUserManager2());
protected BackOfficeUserManager<BackOfficeIdentityUser> UserManager => _userManager ?? (_userManager = OwinContext.GetBackOfficeUserManager());
protected IAuthenticationManager AuthenticationManager => OwinContext.Authentication;
src/Umbraco.Web/Editors/CurrentUserController.cs
+1 -1
View File
@@ -211,7 +211,7 @@ namespace Umbraco.Web.Editors
if (passwordChangeResult.Success)
{
var userMgr = this.TryGetOwinContext().Result.GetBackOfficeUserManager2();
var userMgr = this.TryGetOwinContext().Result.GetBackOfficeUserManager();
//even if we weren't resetting this, it is the correct value (null), otherwise if we were resetting then it will contain the new pword
var result = new ModelWithNotifications<string>(passwordChangeResult.Result.ResetPassword);
src/Umbraco.Web/Editors/PasswordChanger.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace Umbraco.Web.Editors
IUser currentUser,
IUser savingUser,
ChangingPasswordModel passwordModel,
BackOfficeUserManager2<BackOfficeIdentityUser> userMgr)
BackOfficeUserManager<BackOfficeIdentityUser> userMgr)
{
if (passwordModel == null) throw new ArgumentNullException(nameof(passwordModel));
if (userMgr == null) throw new ArgumentNullException(nameof(userMgr));
src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
+1 -1
View File
@@ -56,7 +56,7 @@ namespace Umbraco.Web.Install.InstallSteps
throw new InvalidOperationException("Could not find the super user!");
}
var userManager = _httpContextAccessor.GetRequiredHttpContext().GetOwinContext().GetBackOfficeUserManager2();
var userManager = _httpContextAccessor.GetRequiredHttpContext().GetOwinContext().GetBackOfficeUserManager();
var membershipUser = await userManager.FindByIdAsync(Constants.Security.SuperUserId.ToString());
if (membershipUser == null)
{
src/Umbraco.Web/OwinExtensions.cs
+7 -7
View File
@@ -57,10 +57,10 @@ namespace Umbraco.Web
/// </summary>
/// <param name="owinContext"></param>
/// <returns></returns>
public static BackOfficeSignInManager2 GetBackOfficeSignInManager2(this IOwinContext owinContext)
public static BackOfficeSignInManager GetBackOfficeSignInManager(this IOwinContext owinContext)
{
return owinContext.Get<BackOfficeSignInManager2>()
?? throw new NullReferenceException($"Could not resolve an instance of {typeof (BackOfficeSignInManager2)} from the {typeof(IOwinContext)}.");
return owinContext.Get<BackOfficeSignInManager>()
?? throw new NullReferenceException($"Could not resolve an instance of {typeof (BackOfficeSignInManager)} from the {typeof(IOwinContext)}.");
}
/// <summary>
@@ -72,13 +72,13 @@ namespace Umbraco.Web
/// This is required because to extract the user manager we need to user a custom service since owin only deals in generics and
/// developers could register their own user manager types
/// </remarks>
public static BackOfficeUserManager2<BackOfficeIdentityUser> GetBackOfficeUserManager2(this IOwinContext owinContext)
public static BackOfficeUserManager<BackOfficeIdentityUser> GetBackOfficeUserManager(this IOwinContext owinContext)
{
var marker = owinContext.Get<IBackOfficeUserManagerMarker2>(BackOfficeUserManager2.OwinMarkerKey)
?? throw new NullReferenceException($"No {typeof (IBackOfficeUserManagerMarker2)}, i.e. no Umbraco back-office, has been registered with Owin.");
var marker = owinContext.Get<IBackOfficeUserManagerMarker>(BackOfficeUserManager.OwinMarkerKey)
?? throw new NullReferenceException($"No {typeof (IBackOfficeUserManagerMarker)}, i.e. no Umbraco back-office, has been registered with Owin.");
return marker.GetManager(owinContext)
?? throw new NullReferenceException($"Could not resolve an instance of {typeof (BackOfficeUserManager2<BackOfficeIdentityUser>)} from the {typeof (IOwinContext)}.");
?? throw new NullReferenceException($"Could not resolve an instance of {typeof (BackOfficeUserManager<BackOfficeIdentityUser>)} from the {typeof (IOwinContext)}.");
}
/// <summary>
src/Umbraco.Web/Security/AppBuilderExtensions.cs
+14 -14
View File
@@ -42,8 +42,8 @@ namespace Umbraco.Web.Security
if (services == null) throw new ArgumentNullException(nameof(services));
//Configure Umbraco user manager to be created per request
app.CreatePerOwinContext<BackOfficeUserManager2>(
(options, owinContext) => BackOfficeUserManager2.Create(
app.CreatePerOwinContext<BackOfficeUserManager>(
(options, owinContext) => BackOfficeUserManager.Create(
services.UserService,
services.EntityService,
services.ExternalLoginService,
@@ -53,12 +53,12 @@ namespace Umbraco.Web.Security
ipResolver,
new IdentityErrorDescriber(),
app.GetDataProtectionProvider(),
new NullLogger<BackOfficeUserManager2<BackOfficeIdentityUser>>()));
new NullLogger<BackOfficeUserManager<BackOfficeIdentityUser>>()));
app.SetBackOfficeUserManagerType<BackOfficeUserManager2, BackOfficeIdentityUser>();
app.SetBackOfficeUserManagerType<BackOfficeUserManager, BackOfficeIdentityUser>();
//Create a sign in manager per request
app.CreatePerOwinContext<BackOfficeSignInManager2>((options, context) => BackOfficeSignInManager2.Create(context, globalSettings, app.CreateLogger<BackOfficeSignInManager2>()));
app.CreatePerOwinContext<BackOfficeSignInManager>((options, context) => BackOfficeSignInManager.Create(context, globalSettings, app.CreateLogger<BackOfficeSignInManager>()));
}
/// <summary>
@@ -67,7 +67,7 @@ namespace Umbraco.Web.Security
public static void ConfigureUserManagerForUmbracoBackOffice(this IAppBuilder app,
IRuntimeState runtimeState,
IGlobalSettings globalSettings,
BackOfficeUserStore2 customUserStore,
BackOfficeUserStore customUserStore,
// TODO: This could probably be optional?
IPasswordConfiguration passwordConfiguration,
IIpResolver ipResolver)
@@ -76,19 +76,19 @@ namespace Umbraco.Web.Security
if (customUserStore == null) throw new ArgumentNullException(nameof(customUserStore));
//Configure Umbraco user manager to be created per request
app.CreatePerOwinContext<BackOfficeUserManager2>(
(options, owinContext) => BackOfficeUserManager2.Create(
app.CreatePerOwinContext<BackOfficeUserManager>(
(options, owinContext) => BackOfficeUserManager.Create(
passwordConfiguration,
ipResolver,
customUserStore,
new IdentityErrorDescriber(),
app.GetDataProtectionProvider(),
new NullLogger<BackOfficeUserManager2<BackOfficeIdentityUser>>()));
new NullLogger<BackOfficeUserManager<BackOfficeIdentityUser>>()));
app.SetBackOfficeUserManagerType<BackOfficeUserManager2, BackOfficeIdentityUser>();
app.SetBackOfficeUserManagerType<BackOfficeUserManager, BackOfficeIdentityUser>();
//Create a sign in manager per request
app.CreatePerOwinContext<BackOfficeSignInManager2>((options, context) => BackOfficeSignInManager2.Create(context, globalSettings, app.CreateLogger(typeof(BackOfficeSignInManager2).FullName)));
app.CreatePerOwinContext<BackOfficeSignInManager>((options, context) => BackOfficeSignInManager.Create(context, globalSettings, app.CreateLogger(typeof(BackOfficeSignInManager).FullName)));
}
/// <summary>
@@ -152,7 +152,7 @@ namespace Umbraco.Web.Security
// logs in. This is a security feature which is used when you
// change a password or add an external login to your account.
/*OnValidateIdentity = SecurityStampValidator
.OnValidateIdentity<BackOfficeUserManager2, BackOfficeIdentityUser, int>(
.OnValidateIdentity<BackOfficeUserManager, BackOfficeIdentityUser, int>(
TimeSpan.FromMinutes(30),
(manager, user) => manager.GenerateUserIdentityAsync(user),
identity => identity.GetUserId<int>()),*/
@@ -226,7 +226,7 @@ namespace Umbraco.Web.Security
/// differently in the owin context
/// </remarks>
private static void SetBackOfficeUserManagerType<TManager, TUser>(this IAppBuilder app)
where TManager : BackOfficeUserManager2<TUser>
where TManager : BackOfficeUserManager<TUser>
where TUser : BackOfficeIdentityUser
{
if (_markerSet) throw new InvalidOperationException("The back office user manager marker has already been set, only one back office user manager can be configured");
@@ -236,7 +236,7 @@ namespace Umbraco.Web.Security
// a generic strongly typed instance
app.Use((context, func) =>
{
context.Set(BackOfficeUserManager2.OwinMarkerKey, new BackOfficeUserManagerMarker2<TManager, TUser>());
context.Set(BackOfficeUserManager.OwinMarkerKey, new BackOfficeUserManagerMarker<TManager, TUser>());
return func();
});
}
src/Umbraco.Web/Security/BackOfficeSignInManager2.cs → src/Umbraco.Web/Security/BackOfficeSignInManager.cs
+9 -9
View File
@@ -20,17 +20,17 @@ namespace Umbraco.Web.Security
/// Code ported from Umbraco's BackOfficeSignInManager.
/// Can be removed once the web project moves to .NET Core.
/// </summary>
public class BackOfficeSignInManager2 : IDisposable
public class BackOfficeSignInManager : IDisposable
{
private readonly BackOfficeUserManager2<BackOfficeIdentityUser> _userManager;
private readonly BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
private readonly IUserClaimsPrincipalFactory<BackOfficeIdentityUser> _claimsPrincipalFactory;
private readonly IAuthenticationManager _authenticationManager;
private readonly ILogger _logger;
private readonly IGlobalSettings _globalSettings;
private readonly IOwinRequest _request;
public BackOfficeSignInManager2(
BackOfficeUserManager2<BackOfficeIdentityUser> userManager,
public BackOfficeSignInManager(
BackOfficeUserManager<BackOfficeIdentityUser> userManager,
IUserClaimsPrincipalFactory<BackOfficeIdentityUser> claimsPrincipalFactory,
IAuthenticationManager authenticationManager,
ILogger logger,
@@ -53,11 +53,11 @@ namespace Umbraco.Web.Security
return claimsPrincipal.Identity as ClaimsIdentity;
}
public static BackOfficeSignInManager2 Create(IOwinContext context, IGlobalSettings globalSettings, ILogger logger)
public static BackOfficeSignInManager Create(IOwinContext context, IGlobalSettings globalSettings, ILogger logger)
{
var userManager = context.GetBackOfficeUserManager2();
var userManager = context.GetBackOfficeUserManager();
return new BackOfficeSignInManager2(
return new BackOfficeSignInManager(
userManager,
new BackOfficeClaimsPrincipalFactory<BackOfficeIdentityUser>(userManager, new OptionsWrapper<IdentityOptions>(userManager.Options)),
context.Authentication,
@@ -157,7 +157,7 @@ namespace Umbraco.Web.Security
if (requestContext != null)
{
var backofficeUserManager = requestContext.GetBackOfficeUserManager2();
var backofficeUserManager = requestContext.GetBackOfficeUserManager();
if (backofficeUserManager != null) backofficeUserManager.RaiseAccountLockedEvent(user.Id);
}
@@ -167,7 +167,7 @@ namespace Umbraco.Web.Security
if (requestContext != null)
{
var backofficeUserManager = requestContext.GetBackOfficeUserManager2();
var backofficeUserManager = requestContext.GetBackOfficeUserManager();
if (backofficeUserManager != null)
backofficeUserManager.RaiseInvalidLoginAttemptEvent(userName);
}
src/Umbraco.Web/Security/BackOfficeUserManager2.cs → src/Umbraco.Web/Security/BackOfficeUserManager.cs
+11 -11
View File
@@ -16,11 +16,11 @@ using Umbraco.Web.Models.Identity;
namespace Umbraco.Web.Security
{
public class BackOfficeUserManager2 : BackOfficeUserManager2<BackOfficeIdentityUser>
public class BackOfficeUserManager : BackOfficeUserManager<BackOfficeIdentityUser>
{
public const string OwinMarkerKey = "Umbraco.Web.Security.Identity.BackOfficeUserManagerMarker";
public BackOfficeUserManager2(
public BackOfficeUserManager(
IPasswordConfiguration passwordConfiguration,
IIpResolver ipResolver,
IUserStore<BackOfficeIdentityUser> store,
@@ -41,7 +41,7 @@ namespace Umbraco.Web.Security
/// <summary>
/// Creates a BackOfficeUserManager instance with all default options and the default BackOfficeUserManager
/// </summary>
public static BackOfficeUserManager2 Create(
public static BackOfficeUserManager Create(
IUserService userService,
IEntityService entityService,
IExternalLoginService externalLoginService,
@@ -53,7 +53,7 @@ namespace Umbraco.Web.Security
IDataProtectionProvider dataProtectionProvider,
ILogger<UserManager<BackOfficeIdentityUser>> logger)
{
var store = new BackOfficeUserStore2(userService, entityService, externalLoginService, globalSettings, mapper);
var store = new BackOfficeUserStore(userService, entityService, externalLoginService, globalSettings, mapper);
return Create(
passwordConfiguration,
@@ -67,7 +67,7 @@ namespace Umbraco.Web.Security
/// <summary>
/// Creates a BackOfficeUserManager instance with all default options and a custom BackOfficeUserManager instance
/// </summary>
public static BackOfficeUserManager2 Create(
public static BackOfficeUserManager Create(
IPasswordConfiguration passwordConfiguration,
IIpResolver ipResolver,
IUserStore<BackOfficeIdentityUser> customUserStore,
@@ -78,7 +78,7 @@ namespace Umbraco.Web.Security
var options = new IdentityOptions();
// Configure validation logic for usernames
var userValidators = new List<UserValidator<BackOfficeIdentityUser>> { new BackOfficeUserValidator2<BackOfficeIdentityUser>() };
var userValidators = new List<UserValidator<BackOfficeIdentityUser>> { new BackOfficeUserValidator<BackOfficeIdentityUser>() };
options.User.RequireUniqueEmail = true;
// Configure validation logic for passwords
@@ -96,7 +96,7 @@ namespace Umbraco.Web.Security
// locked out or not.
options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromDays(30);
return new BackOfficeUserManager2(
return new BackOfficeUserManager(
passwordConfiguration,
ipResolver,
customUserStore,
@@ -112,12 +112,12 @@ namespace Umbraco.Web.Security
#endregion
}
public class BackOfficeUserManager2<T> : UserManager<T>
public class BackOfficeUserManager<T> : UserManager<T>
where T : BackOfficeIdentityUser
{
private PasswordGenerator _passwordGenerator;
public BackOfficeUserManager2(
public BackOfficeUserManager(
IPasswordConfiguration passwordConfiguration,
IIpResolver ipResolver,
IUserStore<T> store,
@@ -154,7 +154,7 @@ namespace Umbraco.Web.Security
/// Initializes the user manager with the correct options
/// </summary>
protected void InitUserManager(
BackOfficeUserManager2<T> manager,
BackOfficeUserManager<T> manager,
IDataProtectionProvider dataProtectionProvider)
{
//use a custom hasher based on our membership provider
@@ -181,7 +181,7 @@ namespace Umbraco.Web.Security
/// <returns></returns>
public virtual async Task<bool> ValidateSessionIdAsync(string userId, string sessionId)
{
var userSessionStore = Store as IUserSessionStore2<T>;
var userSessionStore = Store as IUserSessionStore<T>;
//if this is not set, for backwards compat (which would be super rare), we'll just approve it
if (userSessionStore == null) return true;
src/Umbraco.Web/Security/BackOfficeUserManagerMarker.cs
+5 -5
View File
@@ -11,14 +11,14 @@ namespace Umbraco.Web.Security
/// </summary>
/// <typeparam name="TManager"></typeparam>
/// <typeparam name="TUser"></typeparam>
internal class BackOfficeUserManagerMarker2<TManager, TUser> : IBackOfficeUserManagerMarker2
where TManager : BackOfficeUserManager2<TUser>
internal class BackOfficeUserManagerMarker<TManager, TUser> : IBackOfficeUserManagerMarker
where TManager : BackOfficeUserManager<TUser>
where TUser : BackOfficeIdentityUser
{
public BackOfficeUserManager2<BackOfficeIdentityUser> GetManager(IOwinContext owin)
public BackOfficeUserManager<BackOfficeIdentityUser> GetManager(IOwinContext owin)
{
var mgr = owin.Get<TManager>() as BackOfficeUserManager2<BackOfficeIdentityUser>;
if (mgr == null) throw new InvalidOperationException("Could not cast the registered back office user of type " + typeof(TManager) + " to " + typeof(BackOfficeUserManager2<BackOfficeIdentityUser>));
var mgr = owin.Get<TManager>() as BackOfficeUserManager<BackOfficeIdentityUser>;
if (mgr == null) throw new InvalidOperationException("Could not cast the registered back office user of type " + typeof(TManager) + " to " + typeof(BackOfficeUserManager<BackOfficeIdentityUser>));
return mgr;
}
}
src/Umbraco.Web/Security/BackOfficeUserStore2.cs → src/Umbraco.Web/Security/BackOfficeUserStore.cs
+3 -3
View File
@@ -20,7 +20,7 @@ using UserLoginInfo = Microsoft.AspNetCore.Identity.UserLoginInfo;
namespace Umbraco.Web.Security
{
public class BackOfficeUserStore2 : DisposableObjectSlim,
public class BackOfficeUserStore : DisposableObjectSlim,
IUserPasswordStore<BackOfficeIdentityUser>,
IUserEmailStore<BackOfficeIdentityUser>,
IUserLoginStore<BackOfficeIdentityUser>,
@@ -28,7 +28,7 @@ namespace Umbraco.Web.Security
IUserSecurityStampStore<BackOfficeIdentityUser>,
IUserLockoutStore<BackOfficeIdentityUser>,
IUserTwoFactorStore<BackOfficeIdentityUser>,
IUserSessionStore2<BackOfficeIdentityUser>
IUserSessionStore<BackOfficeIdentityUser>
// TODO: This would require additional columns/tables for now people will need to implement this on their own
//IUserPhoneNumberStore<BackOfficeIdentityUser, int>,
@@ -42,7 +42,7 @@ namespace Umbraco.Web.Security
private readonly UmbracoMapper _mapper;
private bool _disposed = false;
public BackOfficeUserStore2(IUserService userService, IEntityService entityService, IExternalLoginService externalLoginService, IGlobalSettings globalSettings, UmbracoMapper mapper)
public BackOfficeUserStore(IUserService userService, IEntityService entityService, IExternalLoginService externalLoginService, IGlobalSettings globalSettings, UmbracoMapper mapper)
{
_userService = userService;
_entityService = entityService;
src/Umbraco.Web/Security/BackOfficeUserValidator2.cs → src/Umbraco.Web/Security/BackOfficeUserValidator.cs
+1 -1
View File
@@ -4,7 +4,7 @@ using Umbraco.Web.Models.Identity;
namespace Umbraco.Web.Security
{
public class BackOfficeUserValidator2<T> : UserValidator<T>
public class BackOfficeUserValidator<T> : UserValidator<T>
where T : BackOfficeIdentityUser
{
public override async Task<IdentityResult> ValidateAsync(UserManager<T> manager, T user)
src/Umbraco.Web/Security/IBackOfficeUserManagerMarker.cs
+1 -11
View File
@@ -1,5 +1,4 @@
using Microsoft.Owin;
using Umbraco.Core.Models.Identity;
using Umbraco.Web.Models.Identity;
namespace Umbraco.Web.Security
@@ -11,15 +10,6 @@ namespace Umbraco.Web.Security
/// </summary>
internal interface IBackOfficeUserManagerMarker
{
BackOfficeUserManager2<BackOfficeIdentityUser> GetManager(IOwinContext owin);
}
/// <summary>
/// This interface is only here due to the fact that IOwinContext Get / Set only work in generics, if they worked
/// with regular 'object' then we wouldn't have to use this work around but because of that we have to use this
/// class to resolve the 'real' type of the registered user manager
/// </summary>
internal interface IBackOfficeUserManagerMarker2
{
BackOfficeUserManager2<BackOfficeIdentityUser> GetManager(IOwinContext owin);
BackOfficeUserManager<BackOfficeIdentityUser> GetManager(IOwinContext owin);
}
}
src/Umbraco.Web/Security/IUserSessionStore.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Umbraco.Core.Security
/// An IUserStore interface part to implement if the store supports validating user session Ids
/// </summary>
/// <typeparam name="TUser"></typeparam>
public interface IUserSessionStore2<TUser> : IUserStore<TUser>
public interface IUserSessionStore<TUser> : IUserStore<TUser>
where TUser : class
{
Task<bool> ValidateSessionIdAsync(string userId, string sessionId); // TODO: SB: Should take a user???
src/Umbraco.Web/Security/SessionIdValidator.cs
+1 -1
View File
@@ -85,7 +85,7 @@ namespace Umbraco.Web.Security
if (validate == false)
return true;
var manager = owinCtx.Get<BackOfficeUserManager2>();
var manager = owinCtx.Get<BackOfficeUserManager>();
if (manager == null)
return false;
src/Umbraco.Web/Security/WebSecurity.cs
+7 -7
View File
@@ -52,17 +52,17 @@ namespace Umbraco.Web.Security
}
}
private BackOfficeSignInManager2 _signInManager;
private BackOfficeSignInManager2 SignInManager
private BackOfficeSignInManager _signInManager;
private BackOfficeSignInManager SignInManager
{
get
{
if (_signInManager == null)
{
var mgr = _httpContextAccessor.GetRequiredHttpContext().GetOwinContext().Get<BackOfficeSignInManager2>();
var mgr = _httpContextAccessor.GetRequiredHttpContext().GetOwinContext().Get<BackOfficeSignInManager>();
if (mgr == null)
{
throw new NullReferenceException("Could not resolve an instance of " + typeof(BackOfficeSignInManager2) + " from the " + typeof(IOwinContext));
throw new NullReferenceException("Could not resolve an instance of " + typeof(BackOfficeSignInManager) + " from the " + typeof(IOwinContext));
}
_signInManager = mgr;
}
@@ -70,9 +70,9 @@ namespace Umbraco.Web.Security
}
}
private BackOfficeUserManager2<BackOfficeIdentityUser> _userManager;
protected BackOfficeUserManager2<BackOfficeIdentityUser> UserManager
=> _userManager ?? (_userManager = _httpContextAccessor.GetRequiredHttpContext().GetOwinContext().GetBackOfficeUserManager2());
private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
protected BackOfficeUserManager<BackOfficeIdentityUser> UserManager
=> _userManager ?? (_userManager = _httpContextAccessor.GetRequiredHttpContext().GetOwinContext().GetBackOfficeUserManager());
[Obsolete("This needs to be removed, ASP.NET Identity should always be used for this operation, this is currently only used in the installer which needs to be updated")]
public double PerformLogin(int userId)
src/Umbraco.Web/Umbraco.Web.csproj
+4 -4
View File
@@ -199,11 +199,11 @@
<Compile Include="Scheduling\SchedulerComponent.cs" />
<Compile Include="Scheduling\SchedulerComposer.cs" />
<Compile Include="Security\BackOfficeClaimsPrincipalFactory.cs" />
<Compile Include="Security\BackOfficeSignInManager2.cs" />
<Compile Include="Security\BackOfficeUserManager2.cs" />
<Compile Include="Security\BackOfficeSignInManager.cs" />
<Compile Include="Security\BackOfficeUserManager.cs" />
<Compile Include="Security\BackOfficeUserManagerMarker.cs" />
<Compile Include="Security\BackOfficeUserStore2.cs" />
<Compile Include="Security\BackOfficeUserValidator2.cs" />
<Compile Include="Security\BackOfficeUserStore.cs" />
<Compile Include="Security\BackOfficeUserValidator.cs" />
<Compile Include="Security\ConfiguredPasswordValidator.cs" />
<Compile Include="Security\EmailService.cs" />
<Compile Include="Security\IUserSessionStore.cs" />
src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
+1 -1
View File
@@ -113,7 +113,7 @@ namespace Umbraco.Web.WebApi.Filters
var owinCtx = actionContext.Request.TryGetOwinContext();
if (owinCtx)
{
var signInManager = owinCtx.Result.GetBackOfficeSignInManager2();
var signInManager = owinCtx.Result.GetBackOfficeSignInManager();
var backOfficeIdentityUser = Mapper.Map<BackOfficeIdentityUser>(user);
await signInManager.SignInAsync(backOfficeIdentityUser, isPersistent: true, rememberBrowser: false);
src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
+3 -3
View File
@@ -30,7 +30,7 @@ namespace Umbraco.Web.WebApi
[EnableDetailedErrors]
public abstract class UmbracoAuthorizedApiController : UmbracoApiController
{
private BackOfficeUserManager2<BackOfficeIdentityUser> _userManager;
private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
protected UmbracoAuthorizedApiController()
{
@@ -44,7 +44,7 @@ namespace Umbraco.Web.WebApi
/// <summary>
/// Gets the user manager.
/// </summary>
protected BackOfficeUserManager2<BackOfficeIdentityUser> UserManager
=> _userManager ?? (_userManager = TryGetOwinContext().Result.GetBackOfficeUserManager2());
protected BackOfficeUserManager<BackOfficeIdentityUser> UserManager
=> _userManager ?? (_userManager = TryGetOwinContext().Result.GetBackOfficeUserManager());
}
}