* Rename InstallVResponseModel to InstallRequestModel * Align SettingsInstallController * Rename split DatabaseInstallResponseModel in two * Change UserInstallResponseModel to UserInstallViewModel * Use PresentationModel instead of ViewModel * Use operation status pattern when validating database * Prepare for install to return a message * Begin updating steps * Make StepBase sharable between upgrade and install * Update steps * Use error message from install steps in install controller * Use error message from upgrade steps in upgrade controller * Use 500 for install/upgrade failed It's entirely likely that it has nothing to do with the request * Updated OpenApi.Json --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk>
148 lines
7.3 KiB
C#
148 lines
7.3 KiB
C#
using Umbraco.Cms.Core.Install.Models;
|
|
using Umbraco.Cms.Core.Mapping;
|
|
using Umbraco.Cms.Infrastructure.Persistence;
|
|
using Umbraco.Cms.Api.Management.ViewModels.Installer;
|
|
using Umbraco.Cms.Core.Models.Installer;
|
|
|
|
namespace Umbraco.Cms.Api.Management.Mapping.Installer;
|
|
|
|
public class InstallerViewModelsMapDefinition : IMapDefinition
|
|
{
|
|
public void DefineMaps(IUmbracoMapper mapper)
|
|
{
|
|
mapper.Define<InstallRequestModel, InstallData>((source, context) => new InstallData(), Map);
|
|
mapper.Define<UserInstallPresentationModel, UserInstallData>((source, context) => new UserInstallData(), Map);
|
|
mapper.Define<DatabaseInstallPresentationModel, DatabaseInstallData>((source, context) => new DatabaseInstallData(), Map);
|
|
mapper.Define<DatabaseInstallPresentationModel, DatabaseModel>((source, context) => new DatabaseModel(), Map);
|
|
mapper.Define<DatabaseInstallData, DatabaseModel>((source, context) => new DatabaseModel(), Map);
|
|
mapper.Define<InstallSettingsModel, InstallSettingsResponseModel>((source, context) => new InstallSettingsResponseModel(), Map);
|
|
mapper.Define<UserSettingsModel, UserSettingsPresentationModel>((source, context) => new UserSettingsPresentationModel(), Map);
|
|
mapper.Define<IDatabaseProviderMetadata, DatabaseSettingsModel>((source, context) => new DatabaseSettingsModel(), Map);
|
|
mapper.Define<DatabaseSettingsModel, DatabaseSettingsPresentationModel>((source, context) => new DatabaseSettingsPresentationModel(), Map);
|
|
mapper.Define<ConsentLevelModel, ConsentLevelPresentationModel>((source, context) => new ConsentLevelPresentationModel(), Map);
|
|
mapper.Define<UpgradeSettingsModel, UpgradeSettingsResponseModel>((source, context) => new UpgradeSettingsResponseModel(), Map);
|
|
}
|
|
|
|
// Umbraco.Code.MapAll
|
|
private void Map(UpgradeSettingsModel source, UpgradeSettingsResponseModel target, MapperContext context)
|
|
{
|
|
target.CurrentState = source.CurrentState;
|
|
target.NewState = source.NewState;
|
|
target.NewVersion = source.NewVersion.ToString();
|
|
target.OldVersion = source.OldVersion.ToString();
|
|
}
|
|
|
|
// Umbraco.Code.MapAll
|
|
private void Map(DatabaseInstallPresentationModel source, DatabaseModel target, MapperContext context)
|
|
{
|
|
target.ConnectionString = source.ConnectionString;
|
|
target.DatabaseName = source.Name ?? string.Empty;
|
|
target.DatabaseProviderMetadataId = source.Id;
|
|
target.IntegratedAuth = source.UseIntegratedAuthentication;
|
|
target.Login = source.Username;
|
|
target.Password = source.Password;
|
|
target.ProviderName = source.ProviderName;
|
|
target.Server = source.Server!;
|
|
target.TrustServerCertificate = source.TrustServerCertificate;
|
|
}
|
|
|
|
// Umbraco.Code.MapAll
|
|
private static void Map(InstallRequestModel source, InstallData target, MapperContext context)
|
|
{
|
|
target.TelemetryLevel = source.TelemetryLevel;
|
|
target.User = context.Map<UserInstallData>(source.User)!;
|
|
target.Database = context.Map<DatabaseInstallData>(source.Database)!;
|
|
}
|
|
|
|
// Umbraco.Code.MapAll
|
|
private static void Map(UserInstallPresentationModel source, UserInstallData target, MapperContext context)
|
|
{
|
|
target.Email = source.Email;
|
|
target.Name = source.Name;
|
|
target.Password = source.Password;
|
|
target.SubscribeToNewsletter = source.SubscribeToNewsletter;
|
|
}
|
|
|
|
// Umbraco.Code.MapAll
|
|
private static void Map(DatabaseInstallPresentationModel source, DatabaseInstallData target, MapperContext context)
|
|
{
|
|
target.Id = source.Id;
|
|
target.ProviderName = source.ProviderName;
|
|
target.Server = source.Server;
|
|
target.Name = source.Name;
|
|
target.Username = source.Username;
|
|
target.Password = source.Password;
|
|
target.UseIntegratedAuthentication = source.UseIntegratedAuthentication;
|
|
target.ConnectionString = source.ConnectionString;
|
|
target.TrustServerCertificate = source.TrustServerCertificate;
|
|
}
|
|
|
|
// Umbraco.Code.MapAll
|
|
private static void Map(DatabaseInstallData source, DatabaseModel target, MapperContext context)
|
|
{
|
|
target.ConnectionString = source.ConnectionString;
|
|
target.DatabaseName = source.Name ?? string.Empty;
|
|
target.DatabaseProviderMetadataId = source.Id;
|
|
target.IntegratedAuth = source.UseIntegratedAuthentication;
|
|
target.Login = source.Username;
|
|
target.Password = source.Password;
|
|
target.ProviderName = source.ProviderName;
|
|
target.Server = source.Server!;
|
|
target.TrustServerCertificate = source.TrustServerCertificate;
|
|
}
|
|
|
|
// Umbraco.Code.MapAll
|
|
private static void Map(InstallSettingsModel source, InstallSettingsResponseModel target, MapperContext context)
|
|
{
|
|
target.User = context.Map<UserSettingsPresentationModel>(source.UserSettings)!;
|
|
target.Databases = context.MapEnumerable<DatabaseSettingsModel, DatabaseSettingsPresentationModel>(source.DatabaseSettings);
|
|
}
|
|
|
|
// Umbraco.Code.MapAll
|
|
private static void Map(UserSettingsModel source, UserSettingsPresentationModel target, MapperContext context)
|
|
{
|
|
target.MinCharLength = source.PasswordSettings.MinCharLength;
|
|
target.MinNonAlphaNumericLength = source.PasswordSettings.MinNonAlphaNumericLength;
|
|
target.ConsentLevels = context.MapEnumerable<ConsentLevelModel, ConsentLevelPresentationModel>(source.ConsentLevels);
|
|
}
|
|
|
|
// Umbraco.Code.MapAll
|
|
private static void Map(IDatabaseProviderMetadata source, DatabaseSettingsModel target, MapperContext context)
|
|
{
|
|
target.DefaultDatabaseName = source.DefaultDatabaseName;
|
|
target.DisplayName = source.DisplayName;
|
|
target.Id = source.Id;
|
|
target.ProviderName = source.ProviderName ?? string.Empty;
|
|
target.RequiresConnectionTest = source.RequiresConnectionTest;
|
|
target.RequiresCredentials = source.RequiresCredentials;
|
|
target.RequiresServer = source.RequiresServer;
|
|
target.ServerPlaceholder = source.ServerPlaceholder ?? string.Empty;
|
|
target.SortOrder = source.SortOrder;
|
|
target.SupportsIntegratedAuthentication = source.SupportsIntegratedAuthentication;
|
|
target.IsConfigured = false; // Defaults to false, we'll set this to true if needed,
|
|
}
|
|
|
|
// Umbraco.Code.MapAll
|
|
private static void Map(DatabaseSettingsModel source, DatabaseSettingsPresentationModel target, MapperContext context)
|
|
{
|
|
target.DefaultDatabaseName = source.DefaultDatabaseName;
|
|
target.DisplayName = source.DisplayName;
|
|
target.Id = source.Id;
|
|
target.IsConfigured = source.IsConfigured;
|
|
target.ProviderName = source.ProviderName;
|
|
target.RequiresConnectionTest = source.RequiresConnectionTest;
|
|
target.RequiresCredentials = source.RequiresCredentials;
|
|
target.RequiresServer = source.RequiresServer;
|
|
target.ServerPlaceholder = source.ServerPlaceholder;
|
|
target.SortOrder = source.SortOrder;
|
|
target.SupportsIntegratedAuthentication = source.SupportsIntegratedAuthentication;
|
|
}
|
|
|
|
// Umbraco.Code.MapAll
|
|
private static void Map(ConsentLevelModel source, ConsentLevelPresentationModel target, MapperContext context)
|
|
{
|
|
target.Description = source.Description;
|
|
target.Level = source.Level;
|
|
}
|
|
}
|