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

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3970-membership-providers

Browse Source 
# Conflicts:
#	src/Umbraco.Web/Editors/Filters/MemberSaveModelValidator.cs
#	src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs
This commit is contained in:
Bjarke Berg
2019-12-03 08:54:31 +01:00
parent 97ad7a0239 1da4429177
commit e7c85daa2e
164 changed files with 7437 additions and 6106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
View File

@@ -75,7 +75,8 @@ namespace Umbraco.Web.Security
/// </param>
public static void ForUmbracoBackOffice(this AuthenticationOptions options, string style, string icon, string callbackPath = null)
{
if (string.IsNullOrEmpty(options.AuthenticationType)) throw new ArgumentNullOrEmptyException("options.AuthenticationType");
if (options == null) throw new ArgumentNullException(nameof(options));
if (string.IsNullOrEmpty(options.AuthenticationType)) throw new InvalidOperationException("The authentication type can't be null or empty.");
//Ensure the prefix is set
if (options.AuthenticationType.StartsWith(Constants.Security.BackOfficeExternalAuthenticationTypePrefix) == false)