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

Merge branch 'netcore/dev' into netcore/members-userstore

Browse Source
This commit is contained in:
Emma Garland
2021-02-09 13:22:40 +00:00
parent 8a9c3d0c2e b0b1de9972
commit 19fcbf80f4
220 changed files with 2869 additions and 6196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
View File

@@ -65,7 +65,6 @@ namespace Umbraco.Web.BackOffice.Controllers
private readonly IEmailSender _emailSender;
private readonly ISmsSender _smsSender;
private readonly Core.Hosting.IHostingEnvironment _hostingEnvironment;
private readonly IRequestAccessor _requestAccessor;
private readonly LinkGenerator _linkGenerator;
private readonly IBackOfficeExternalLoginProviders _externalAuthenticationOptions;
private readonly IBackOfficeTwoFactorOptions _backOfficeTwoFactorOptions;
@@ -87,7 +86,6 @@ namespace Umbraco.Web.BackOffice.Controllers
IEmailSender emailSender,
ISmsSender smsSender,
Core.Hosting.IHostingEnvironment hostingEnvironment,
IRequestAccessor requestAccessor,
LinkGenerator linkGenerator,
IBackOfficeExternalLoginProviders externalAuthenticationOptions,
IBackOfficeTwoFactorOptions backOfficeTwoFactorOptions)
@@ -106,7 +104,6 @@ namespace Umbraco.Web.BackOffice.Controllers
_emailSender = emailSender;
_smsSender = smsSender;
_hostingEnvironment = hostingEnvironment;
_requestAccessor = requestAccessor;
_linkGenerator = linkGenerator;
_externalAuthenticationOptions = externalAuthenticationOptions;
_backOfficeTwoFactorOptions = backOfficeTwoFactorOptions;
@@ -625,7 +622,7 @@ namespace Umbraco.Web.BackOffice.Controllers
});
// Construct full URL using configured application URL (which will fall back to request)
var applicationUri = _requestAccessor.GetApplicationUrl();
var applicationUri = _hostingEnvironment.ApplicationMainUrl;
var callbackUri = new Uri(applicationUri, action);
return callbackUri.ToString();
}

2
src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
View File

@@ -13,7 +13,7 @@ using Umbraco.Core.Hosting;
using Umbraco.Core.Media;
using Umbraco.Core.WebAssets;
using Umbraco.Extensions;
using Umbraco.Web.BackOffice.HealthCheck;
using Umbraco.Web.BackOffice.HealthChecks;
using Umbraco.Web.BackOffice.Profiling;
using Umbraco.Web.BackOffice.PropertyEditors;
using Umbraco.Web.BackOffice.Routing;

2
src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
View File

@@ -1661,7 +1661,7 @@ namespace Umbraco.Web.BackOffice.Controllers
}
var toCopyResult = ValidateMoveOrCopy(copy);
if ((toCopyResult.Result is null))
if (!(toCopyResult.Result is null))
{
return toCopyResult.Result;
}

5
src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
View File

@@ -55,7 +55,6 @@ namespace Umbraco.Web.BackOffice.Controllers
private readonly ISqlContext _sqlContext;
private readonly IImageUrlGenerator _imageUrlGenerator;
private readonly SecuritySettings _securitySettings;
private readonly IRequestAccessor _requestAccessor;
private readonly IEmailSender _emailSender;
private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
private readonly AppCaches _appCaches;
@@ -78,7 +77,6 @@ namespace Umbraco.Web.BackOffice.Controllers
ISqlContext sqlContext,
IImageUrlGenerator imageUrlGenerator,
IOptions<SecuritySettings> securitySettings,
IRequestAccessor requestAccessor,
IEmailSender emailSender,
IBackOfficeSecurityAccessor backofficeSecurityAccessor,
AppCaches appCaches,
@@ -99,7 +97,6 @@ namespace Umbraco.Web.BackOffice.Controllers
_sqlContext = sqlContext;
_imageUrlGenerator = imageUrlGenerator;
_securitySettings = securitySettings.Value;
_requestAccessor = requestAccessor;
_emailSender = emailSender;
_backofficeSecurityAccessor = backofficeSecurityAccessor;
_appCaches = appCaches;
@@ -567,7 +564,7 @@ namespace Umbraco.Web.BackOffice.Controllers
});
// Construct full URL using configured application URL (which will fall back to request)
var applicationUri = _requestAccessor.GetApplicationUrl();
var applicationUri = _hostingEnvironment.ApplicationMainUrl;
var inviteUri = new Uri(applicationUri, action);
var emailSubject = _localizedTextService.Localize("user/inviteEmailCopySubject",