Use ShellSettings.RequestUrlHosts that uses static separators #13021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jtkech
changed the title
jtkech
added a commit
to MikeAlhayek/OrchardCore
that referenced
this pull request
Jan 2, 2023
hishamco
requested changes
Jan 2, 2023
| @@ -131,7 +132,13 @@ public void WhenHostSingletonAndScoped_GetServices_Returns_CorrectImplementation | |||
| Assert.IsType<HostScopedOfTheSameTypeAsSingleton>(services.ElementAt(1)); | |||
| } | |||
|
|
|||
| private ShellBlueprint CreateBlueprint() | |||
| private static readonly ShellSettings _uninitializedDefaultShell = new() | |||
There was a problem hiding this comment.
Can we move it to fields area at the top
src/OrchardCore.Modules/OrchardCore.Tenants/Services/TenantValidator.cs
Outdated
Show resolved
Hide resolved
| @@ -588,7 +588,8 @@ private static X509Certificate2 GenerateCertificate(X509KeyUsageFlags type, RSA | |||
|
|
|||
| X500DistinguishedName GetSubjectName() | |||
| { | |||
| try { return new X500DistinguishedName("CN=" + (settings.RequestUrlHost ?? "localhost")); } | |||
| var host = settings.RequestUrlHosts.FirstOrDefault(host => host != "localhost"); | |||
| try { return new X500DistinguishedName("CN=" + (host ?? "localhost")); } | |||
There was a problem hiding this comment.
Can you format try .. cache block in your way
hishamco
approved these changes
Jan 2, 2023
…tors # Conflicts: # src/OrchardCore.Modules/OrchardCore.Tenants/Services/TenantValidator.cs # test/OrchardCore.Tests/Shell/ShellContainerFactoryTests.cs
jtkech
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.