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

More clean up of old configs

Browse Source
This commit is contained in:
Bjarke Berg
2020-09-14 14:12:38 +02:00
parent 4173a2fb20
commit e74570c0ac
65 changed files with 131 additions and 1138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/Umbraco.Infrastructure/Configuration/ConfigModelConversionsFromLegacy.cs
View File

@@ -1,66 +0,0 @@
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Configuration.UmbracoSettings;
namespace Umbraco.Infrastructure.Configuration
{
/// <summary>
/// TEMPORARY: this class has been added just to ensure Umbraco.Web functionality continues to compile, by
/// converting between e.g. <see cref="IGlobalSettings"></see> (used by
/// legacy configuration and <see cref="GlobalSettings"></see> (used by Netcore/IOptions configuration).
/// </summary>
public static class ConfigModelConversionsFromLegacy
{
public static GlobalSettings ConvertGlobalSettings(IGlobalSettings globalSettings)
{
return new GlobalSettings
{
DatabaseFactoryServerVersion = globalSettings.DatabaseFactoryServerVersion,
DefaultUILanguage = globalSettings.DefaultUILanguage,
DisableElectionForSingleServer = globalSettings.DisableElectionForSingleServer,
HideTopLevelNodeFromPath = globalSettings.HideTopLevelNodeFromPath,
InstallEmptyDatabase = globalSettings.InstallEmptyDatabase,
InstallMissingDatabase = globalSettings.InstallMissingDatabase,
MainDomLock = globalSettings.MainDomLock,
NoNodesViewPath = globalSettings.NoNodesViewPath,
RegisterType = globalSettings.RegisterType,
ReservedPaths = globalSettings.ReservedPaths,
ReservedUrls = globalSettings.ReservedUrls,
Smtp = globalSettings.SmtpSettings != null
? new SmtpSettings
{
DeliveryMethod = globalSettings.SmtpSettings.DeliveryMethod,
From = globalSettings.SmtpSettings.From,
Host = globalSettings.SmtpSettings.Host,
Password = globalSettings.SmtpSettings.Password,
PickupDirectoryLocation = globalSettings.SmtpSettings.PickupDirectoryLocation,
Port = globalSettings.SmtpSettings.Port,
Username = globalSettings.SmtpSettings.Username,
}
: new SmtpSettings(),
TimeOutInMinutes = globalSettings.TimeOutInMinutes,
UmbracoCssPath = globalSettings.UmbracoCssPath,
UmbracoMediaPath = globalSettings.UmbracoMediaPath,
UmbracoPath = globalSettings.UmbracoPath,
UmbracoScriptsPath = globalSettings.UmbracoScriptsPath,
IconsPath = globalSettings.IconsPath,
UseHttps = globalSettings.UseHttps,
VersionCheckPeriod = globalSettings.VersionCheckPeriod,
};
}
public static UserPasswordConfigurationSettings ConvertUserPasswordConfiguration(IUserPasswordConfiguration passwordConfiguration)
{
return new UserPasswordConfigurationSettings
{
HashAlgorithmType = passwordConfiguration.HashAlgorithmType,
RequireDigit = passwordConfiguration.RequireDigit,
RequiredLength = passwordConfiguration.RequiredLength,
RequireLowercase = passwordConfiguration.RequireLowercase,
RequireNonLetterOrDigit = passwordConfiguration.RequireNonLetterOrDigit,
RequireUppercase = passwordConfiguration.RequireUppercase,
};
}
}
}

130
src/Umbraco.Infrastructure/Configuration/ConfigModelConversionsToLegacy.cs
View File

@@ -1,130 +0,0 @@
using System.Collections.Generic;
using System.Net.Mail;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
namespace Umbraco.Infrastructure.Configuration
{
/// <summary>
/// TEMPORARY: this class has been added just to ensure tests on Umbraco.Web functionality, that still use the interface
/// based configuration, by converting between e.g <see cref="GlobalSettings"></see> (used by
/// legacy configuration and <see cref="IGlobalSettings"></see> (used by Netcore/IOptions configuration).
/// </summary>
public static class ConfigModelConversionsToLegacy
{
public static IGlobalSettings ConvertGlobalSettings(GlobalSettings globalSettings)
{
return new TestGlobalSettings
{
DatabaseFactoryServerVersion = globalSettings.DatabaseFactoryServerVersion,
DefaultUILanguage = globalSettings.DefaultUILanguage,
DisableElectionForSingleServer = globalSettings.DisableElectionForSingleServer,
HideTopLevelNodeFromPath = globalSettings.HideTopLevelNodeFromPath,
InstallEmptyDatabase = globalSettings.InstallEmptyDatabase,
InstallMissingDatabase = globalSettings.InstallMissingDatabase,
MainDomLock = globalSettings.MainDomLock,
NoNodesViewPath = globalSettings.NoNodesViewPath,
RegisterType = globalSettings.RegisterType,
ReservedPaths = globalSettings.ReservedPaths,
ReservedUrls = globalSettings.ReservedUrls,
SmtpSettings = new SmtpSettings
{
DeliveryMethod = globalSettings.Smtp.DeliveryMethod,
From = globalSettings.Smtp.From,
Host = globalSettings.Smtp.Host,
Password = globalSettings.Smtp.Password,
PickupDirectoryLocation = globalSettings.Smtp.PickupDirectoryLocation,
Port = globalSettings.Smtp.Port,
Username = globalSettings.Smtp.Username,
},
TimeOutInMinutes = globalSettings.TimeOutInMinutes,
UmbracoCssPath = globalSettings.UmbracoCssPath,
UmbracoMediaPath = globalSettings.UmbracoMediaPath,
UmbracoPath = globalSettings.UmbracoPath,
UmbracoScriptsPath = globalSettings.UmbracoScriptsPath,
IconsPath = globalSettings.IconsPath,
UseHttps = globalSettings.UseHttps,
VersionCheckPeriod = globalSettings.VersionCheckPeriod,
};
}
public static IUserPasswordConfiguration ConvertUserPasswordConfiguration(UserPasswordConfigurationSettings passwordConfiguration)
{
return new TestUserPasswordConfiguration
{
HashAlgorithmType = passwordConfiguration.HashAlgorithmType,
RequireDigit = passwordConfiguration.RequireDigit,
RequiredLength = passwordConfiguration.RequiredLength,
RequireLowercase = passwordConfiguration.RequireLowercase,
RequireNonLetterOrDigit = passwordConfiguration.RequireNonLetterOrDigit,
RequireUppercase = passwordConfiguration.RequireUppercase,
};
}
private class TestGlobalSettings : IGlobalSettings
{
public string ReservedUrls { get; set; }
public string ReservedPaths { get; set; }
public int TimeOutInMinutes { get; set; }
public string DefaultUILanguage { get; set; }
public bool HideTopLevelNodeFromPath { get; set; }
public bool UseHttps { get; set; }
public int VersionCheckPeriod { get; set; }
public string UmbracoPath { get; set; }
public string UmbracoCssPath { get; set; }
public string UmbracoScriptsPath { get; set; }
public string UmbracoMediaPath { get; set; }
public bool IsSmtpServerConfigured { get; set; }
public SmtpSettings SmtpSettings { get; set; }
public bool InstallMissingDatabase { get; set; }
public bool InstallEmptyDatabase { get; set; }
public bool DisableElectionForSingleServer { get; set; }
public string RegisterType { get; set; }
public string DatabaseFactoryServerVersion { get; set; }
public string MainDomLock { get; set; }
public string NoNodesViewPath { get; set; }
public string IconsPath { get; set; }
public string ConfigurationStatus { get; set; }
}
private class TestUserPasswordConfiguration : IUserPasswordConfiguration
{
public int RequiredLength { get; set; }
public bool RequireNonLetterOrDigit { get; set; }
public bool RequireDigit { get; set; }
public bool RequireLowercase { get; set; }
public bool RequireUppercase { get; set; }
public string HashAlgorithmType { get; set; }
public int MaxFailedAccessAttemptsBeforeLockout { get; set; }
}
}
}