Skip to content

#631 Add name validation for special chars and generate valid instanc… #654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndreyFilchenkov merged 1 commit into from
Jan 19, 2022
Merged

#631 Add name validation for special chars and generate valid instanc… #654

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/SIM.Tool.Windows/UserControls/Install/Instance9Details.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,12 @@ private string GetValidWebsiteName()
var name = instanceName.Text.EmptyToNull();
Assert.IsNotNull(name, @"Instance name isn't set");

if (!Uri.IsWellFormedUriString("https://" + name, UriKind.Absolute))
{
Alert($"The '{name}' site name contains special characters that are not allowed to generate URI.");
return null;
}

var websiteExists = WebServerManager.WebsiteExists(name);
if (websiteExists)
{
Expand Down Expand Up @@ -350,7 +356,7 @@ protected void Alert([NotNull] string message, [NotNull] params object[] args)
Assert.ArgumentNotNull(message, nameof(message));
Assert.ArgumentNotNull(args, nameof(args));

WindowHelper.ShowMessage(message.FormatWith(args), "Conflict is found", MessageBoxButton.OK, MessageBoxImage.Stop);
WindowHelper.ShowMessage(message.FormatWith(args), "Conflict is found", MessageBoxButton.OK, MessageBoxImage.Warning);
}

#endregion
Expand Down Expand Up @@ -396,7 +402,8 @@ private void ProductRevisionChanged([CanBeNull] object sender, [CanBeNull] Selec
}

var name = product.DefaultInstanceName;
InstanceName.Text = name;
// Truncate the (WDP XP1 packages) string in case package name has similar format to Sitecore 10.2.0 rev. 006766 (WDP XP1 packages)
InstanceName.Text = name.Split()[0];

var frameworkVersions = new ObservableCollection<string>(_AllFrameworkVersions);

Expand Down