diff --git a/OrchardCore.sln b/OrchardCore.sln index 1d341fab5e2..a01c9492069 100644 --- a/OrchardCore.sln +++ b/OrchardCore.sln @@ -383,6 +383,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Tests.Functiona EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Placements", "src\OrchardCore.Modules\OrchardCore.Placements\OrchardCore.Placements.csproj", "{5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Configuration.KeyVault", "src\OrchardCore\OrchardCore.Configuration.KeyVault\OrchardCore.Configuration.KeyVault.csproj", "{17187E9E-90EE-4484-AC5E-8920D9126025}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1037,6 +1039,10 @@ Global {5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}.Release|Any CPU.ActiveCfg = Release|Any CPU {5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}.Release|Any CPU.Build.0 = Release|Any CPU + {17187E9E-90EE-4484-AC5E-8920D9126025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {17187E9E-90EE-4484-AC5E-8920D9126025}.Debug|Any CPU.Build.0 = Debug|Any CPU + {17187E9E-90EE-4484-AC5E-8920D9126025}.Release|Any CPU.ActiveCfg = Release|Any CPU + {17187E9E-90EE-4484-AC5E-8920D9126025}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1218,6 +1224,7 @@ Global {57EA05E8-0275-4163-8FD1-2B244E396F91} = {F23AC6C2-DE44-4699-999D-3C478EF3D691} {2CA507BD-5517-4CD2-8F30-093AC5D11EBA} = {B8D16C60-99B4-43D5-A3AD-4CD89AF39B25} {5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D} = {90030E85-0C4F-456F-B879-443E8A3F220D} + {17187E9E-90EE-4484-AC5E-8920D9126025} = {F23AC6C2-DE44-4699-999D-3C478EF3D691} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {46A1D25A-78D1-4476-9CBF-25B75E296341} diff --git a/mkdocs.yml b/mkdocs.yml index 97de0ddd418..6ac74e8e07f 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -170,6 +170,7 @@ nav: - GraphQL queries: docs/reference/core/Apis.GraphQL.Abstractions/README.md - Health Check: docs/reference/modules/HealthChecks/README.md - HTTPS: docs/reference/modules/Https/README.md + - Key Vault (Azure): docs/reference/core/KeyVault.Azure/README.md - Localization: docs/reference/modules/Localize/README.md - Logging Serilog: docs/reference/core/Logging.Serilog/readme.md - Mini Profiler: docs/reference/modules/MiniProfiler/README.md diff --git a/src/OrchardCore.Build/Dependencies.props b/src/OrchardCore.Build/Dependencies.props index c5fe7b7983e..a6eb675c3c6 100644 --- a/src/OrchardCore.Build/Dependencies.props +++ b/src/OrchardCore.Build/Dependencies.props @@ -9,7 +9,9 @@ + + @@ -38,9 +40,8 @@ - - - + + diff --git a/src/OrchardCore.Cms.Web/appsettings.json b/src/OrchardCore.Cms.Web/appsettings.json index ac619176b27..01ac0cee8ba 100644 --- a/src/OrchardCore.Cms.Web/appsettings.json +++ b/src/OrchardCore.Cms.Web/appsettings.json @@ -68,6 +68,11 @@ // "TablePrefix": "", // Optionally, configure a table prefix. // "MigrateFromFiles": true // Optionally, enable to migrate existing App_Data files to Database automatically. //}, + // Add 'AddOrchardCoreAzureKeyVault()' to the Generic Host in 'CreateHostBuilder() section'. + // "OrchardCore_KeyVault_Azure": { + // "KeyVaultName": "", // Set the name of your Azure Key Vault. + // "ReloadInterval": // Optional, timespan to wait between attempts at polling the Azure KeyVault for changes. Leave blank to disable reloading. + // }, // See https://docs.orchardcore.net/en/latest/docs/reference/modules/Users/Configuration/#custom-paths //"OrchardCore_Users": { // "LoginPath": "Login", diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Handlers/LocalizationPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Handlers/LocalizationPartHandler.cs index e51d54053fe..76d08b09da4 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Handlers/LocalizationPartHandler.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Handlers/LocalizationPartHandler.cs @@ -24,6 +24,7 @@ public override Task GetContentItemAspectAsync(ContentItemAspectContext context, if (part.Culture != null) { cultureAspect.Culture = CultureInfo.GetCultureInfo(part.Culture); + cultureAspect.HasCulture = true; } return Task.CompletedTask; diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminList-Create.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminList-Create.cshtml index 89cada0d493..362a76f3309 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminList-Create.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminList-Create.cshtml @@ -13,7 +13,7 @@ -
+
@foreach (var item in Model.CreatableTypes) { @T[item.Text] diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminList-Filters.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminList-Filters.cshtml index 362508e8eaf..d03a6267f1e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminList-Filters.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminList-Filters.cshtml @@ -6,10 +6,10 @@
@if (Model.ContentTypeOptions.Any()) { - } - +
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsMeta_SummaryAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsMeta_SummaryAdmin.cshtml index 3d5a3a97ea2..e4f48be83f8 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsMeta_SummaryAdmin.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsMeta_SummaryAdmin.cshtml @@ -1,13 +1,14 @@ @using OrchardCore.ContentManagement - +@using System.Globalization @{ ContentItem contentItem = Model.ContentItem; + var modifiedUtc = contentItem.ModifiedUtc?.ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture); } @if (contentItem.ModifiedUtc.HasValue) { - + @contentItem.Author diff --git a/src/OrchardCore.Modules/OrchardCore.Lucene/Handler/LuceneIndexingContentHandler.cs b/src/OrchardCore.Modules/OrchardCore.Lucene/Handler/LuceneIndexingContentHandler.cs index dc2b9079005..c6b8967bb39 100644 --- a/src/OrchardCore.Modules/OrchardCore.Lucene/Handler/LuceneIndexingContentHandler.cs +++ b/src/OrchardCore.Modules/OrchardCore.Lucene/Handler/LuceneIndexingContentHandler.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using OrchardCore.ContentLocalization; using OrchardCore.ContentManagement; using OrchardCore.ContentManagement.Handlers; using OrchardCore.ContentPreview; @@ -60,14 +61,11 @@ private Task AddContextAsync(ContentContextBase context) private static async Task IndexingAsync(ShellScope scope, IEnumerable contexts) { var services = scope.ServiceProvider; - var contentManager = services.GetRequiredService(); var contentItemIndexHandlers = services.GetServices(); - var luceneIndexManager = services.GetRequiredService(); var luceneIndexSettingsService = services.GetRequiredService(); var logger = services.GetRequiredService>(); - // Multiple items may have been updated in the same scope, e.g through a recipe. var contextsGroupById = contexts.GroupBy(c => c.ContentItem.ContentItemId, c => c); @@ -82,7 +80,9 @@ private static async Task IndexingAsync(ShellScope scope, IEnumerable(context.ContentItem); + var culture = cultureAspect.HasCulture ? cultureAspect.Culture.Name : null; + var ignoreIndexedCulture = indexSettings.Culture == "any" ? false : culture != indexSettings.Culture; if (indexSettings.IndexedContentTypes.Contains(context.ContentItem.ContentType) && !ignoreIndexedCulture) { diff --git a/src/OrchardCore.Modules/OrchardCore.Lucene/OrchardCore.Lucene.csproj b/src/OrchardCore.Modules/OrchardCore.Lucene/OrchardCore.Lucene.csproj index b3fa1cfefc9..a46fa29bb5c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Lucene/OrchardCore.Lucene.csproj +++ b/src/OrchardCore.Modules/OrchardCore.Lucene/OrchardCore.Lucene.csproj @@ -17,6 +17,7 @@ + diff --git a/src/OrchardCore.Modules/OrchardCore.Lucene/Services/LuceneIndexingService.cs b/src/OrchardCore.Modules/OrchardCore.Lucene/Services/LuceneIndexingService.cs index 6a6ee02e490..7e23f45d0fa 100644 --- a/src/OrchardCore.Modules/OrchardCore.Lucene/Services/LuceneIndexingService.cs +++ b/src/OrchardCore.Modules/OrchardCore.Lucene/Services/LuceneIndexingService.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using OrchardCore.ContentLocalization; using OrchardCore.ContentManagement; using OrchardCore.Entities; using OrchardCore.Environment.Shell; @@ -186,7 +187,9 @@ await shellScope.UsingAsync(async scope => continue; } - var ignoreIndexedCulture = settings.Culture == "any" ? false : context.ContentItem.Content?.LocalizationPart?.Culture != settings.Culture; + var cultureAspect = await contentManager.PopulateAspectAsync(context.ContentItem); + var culture = cultureAspect.HasCulture ? cultureAspect.Culture.Name : null; + var ignoreIndexedCulture = settings.Culture == "any" ? false : culture != settings.Culture; // Ignore if the content item content type or culture is not indexed in this index if (!settings.IndexedContentTypes.Contains(context.ContentItem.ContentType) || ignoreIndexedCulture) diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Views/Admin/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Placements/Views/Admin/Index.cshtml index 3a50bcaaf14..c2336d4a044 100644 --- a/src/OrchardCore.Modules/OrchardCore.Placements/Views/Admin/Index.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Placements/Views/Admin/Index.cshtml @@ -27,33 +27,33 @@
    -
  • -
    -
    -
    - - - - + @if (Model.ShapePlacements.Any()) + { +
  • +
    +
    +
    + + + + +
    -
    - - -
    • - @if (Model.ShapePlacements.Any()) - { + @foreach (var entry in Model.ShapePlacements) {
  • diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Views/Template/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Templates/Views/Template/Index.cshtml index f0b201337a8..31befc5ad46 100644 --- a/src/OrchardCore.Modules/OrchardCore.Templates/Views/Template/Index.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Templates/Views/Template/Index.cshtml @@ -2,6 +2,7 @@ @{ int startIndex = (Model.Pager.Page - 1) * (Model.Pager.PageSize) + 1; int endIndex = startIndex + Model.Templates.Count - 1; + var formAction = Model.Options.AdminTemplates ? "admin" : "index"; } @if (Model.Options.AdminTemplates) @@ -14,7 +15,7 @@ else } @* the form is necessary to generate and antiforgery token for the delete action *@ -
    + diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs index 4d75c2ff29e..daa68fdc11a 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs @@ -103,6 +103,10 @@ public async Task Login(string returnUrl = null) } } + foreach (var errorMessage in TempData.Where(x => x.Key.StartsWith("error")).Select(x => x.Value.ToString())) + { + ModelState.AddModelError(string.Empty, errorMessage); + } ViewData["ReturnUrl"] = returnUrl; return View(); } @@ -211,7 +215,10 @@ public async Task Login(LoginViewModel model, string returnUrl = } } } - ModelState.AddModelError(string.Empty, S["Invalid login attempt."]); + else + { + ModelState.AddModelError(string.Empty, S["Invalid login attempt."]); + } await _accountEvents.InvokeAsync((e, model) => e.LoggingInFailedAsync(model.UserName), model, _logger); } } @@ -374,14 +381,16 @@ public async Task ExternalLoginCallback(string returnUrl = null, if (remoteError != null) { _logger.LogError("Error from external provider: {Error}", remoteError); - return RedirectToAction(nameof(Login)); + ModelState.AddModelError("", S["An error occurred in external provider."]); + return RedirectToLogin(returnUrl); } var info = await _signInManager.GetExternalLoginInfoAsync(); if (info == null) { _logger.LogError("Could not get external login info."); - return RedirectToAction(nameof(Login)); + ModelState.AddModelError("", S["An error occurred in external provider."]); + return RedirectToLogin(returnUrl); } var registrationSettings = (await _siteService.GetSiteSettingsAsync()).As(); @@ -389,7 +398,7 @@ public async Task ExternalLoginCallback(string returnUrl = null, if (user != null) { - if (!await AddConfirmEmailError(user)) + if (!await AddConfirmEmailError(user) && !AddUserEnabledError(user)) { await _accountEvents.InvokeAsync((e, user, modelState) => e.LoggingInAsync(user.UserName, (key, message) => modelState.AddModelError(key, message)), user, ModelState, _logger); @@ -420,7 +429,7 @@ public async Task ExternalLoginCallback(string returnUrl = null, ViewData["UserName"] = user.UserName; ViewData["Email"] = email; - return View("LinkExternalLogin"); + return View(nameof(LinkExternalLogin)); } else { @@ -477,7 +486,7 @@ public async Task ExternalLoginCallback(string returnUrl = null, else { ModelState.AddModelError(string.Empty, S["Invalid login attempt."]); - return View(nameof(Login)); + return RedirectToLogin(returnUrl); } } AddIdentityErrors(identityResult); @@ -487,7 +496,21 @@ public async Task ExternalLoginCallback(string returnUrl = null, } } } - return RedirectToAction(nameof(Login)); + return RedirectToLogin(returnUrl); + } + + private RedirectToActionResult RedirectToLogin(string returnUrl) + { + var iix = 0; + foreach (var state in ModelState.Where(x => x.Key == string.Empty)) + { + foreach (var item in state.Value.Errors) + { + iix++; + TempData[$"error_{iix}"] = item.ErrorMessage; + } + } + return RedirectToAction(nameof(Login), new { returnUrl }); } [HttpPost] diff --git a/src/OrchardCore.Themes/TheAdmin/Assets/scss/modules/theme/darkmode/_bootswatch.scss b/src/OrchardCore.Themes/TheAdmin/Assets/scss/modules/theme/darkmode/_bootswatch.scss index 78d13f69610..06e0e59716d 100644 --- a/src/OrchardCore.Themes/TheAdmin/Assets/scss/modules/theme/darkmode/_bootswatch.scss +++ b/src/OrchardCore.Themes/TheAdmin/Assets/scss/modules/theme/darkmode/_bootswatch.scss @@ -39,6 +39,7 @@ #mediaApp { background-color: $body-bg; } + // Buttons ===================================================================== // Typography ================================================================== @@ -49,6 +50,10 @@ } } +.trumbowyg-fullscreen .trumbowyg-editor{ + color: black; +} + // Tables ====================================================================== .table { diff --git a/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml b/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml index 081a9267ff3..aed176e70ea 100644 --- a/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml +++ b/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml @@ -32,7 +32,7 @@
    - @Site.SiteName + @Site.SiteName@Site.SiteName
    @if (adminSettings.DisplayTitlesInTopbar) diff --git a/src/OrchardCore.Themes/TheAdmin/wwwroot/Styles/TheAdmin.css b/src/OrchardCore.Themes/TheAdmin/wwwroot/Styles/TheAdmin.css index 57116a3ab78..a2cc0bed2a5 100644 --- a/src/OrchardCore.Themes/TheAdmin/wwwroot/Styles/TheAdmin.css +++ b/src/OrchardCore.Themes/TheAdmin/wwwroot/Styles/TheAdmin.css @@ -33282,6 +33282,8 @@ background-color: #181a1b; } :root[data-theme='darkmode'] .blockquote-footer { color: #888; } + :root[data-theme='darkmode'] .trumbowyg-fullscreen .trumbowyg-editor { + color: black; } [dir]:root[data-theme='darkmode'] .table-primary, [dir]:root[data-theme='darkmode'] .table-primary > th, [dir]:root[data-theme='darkmode'] .table-primary > td { background-color: #007bff; } [dir]:root[data-theme='darkmode'] .table-secondary, [dir]:root[data-theme='darkmode'] .table-secondary > th, [dir]:root[data-theme='darkmode'] .table-secondary > td { diff --git a/src/OrchardCore/OrchardCore.Configuration.KeyVault/Extensions/AzureKeyVaultWebHostBuilderExtension.cs b/src/OrchardCore/OrchardCore.Configuration.KeyVault/Extensions/AzureKeyVaultWebHostBuilderExtension.cs new file mode 100644 index 00000000000..a8346b7fe8e --- /dev/null +++ b/src/OrchardCore/OrchardCore.Configuration.KeyVault/Extensions/AzureKeyVaultWebHostBuilderExtension.cs @@ -0,0 +1,50 @@ +using System; +using Azure.Extensions.AspNetCore.Configuration.Secrets; +using Azure.Identity; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using OrchardCore.Configuration.KeyVault.Services; + +namespace OrchardCore.Configuration.KeyVault.Extensions +{ + public static class AzureKeyVaultWebHostBuilderExtension + { + /// + /// Adds Azure Key Vault as a Configuration Source. + /// + /// The web host builder to configure. + /// The web host builder. + public static IHostBuilder AddOrchardCoreAzureKeyVault(this IHostBuilder builder) + { + if (builder == null) throw new ArgumentNullException(nameof(builder)); + + builder.ConfigureAppConfiguration((context, configuration) => + { + var builtConfig = configuration.Build(); + var keyVaultName = builtConfig["OrchardCore:OrchardCore_KeyVault_Azure:KeyVaultName"]; + + TimeSpan? reloadInterval = null; + double interval; + if (Double.TryParse(builtConfig["OrchardCore:OrchardCore_KeyVault_Azure:ReloadInterval"], out interval)) + { + reloadInterval = TimeSpan.FromSeconds(interval); + } + + var keyVaultEndpointUri = new Uri("https://" + keyVaultName + ".vault.azure.net"); + var configOptions = new AzureKeyVaultConfigurationOptions() + { + Manager = new AzureKeyVaultSecretManager(), + ReloadInterval = reloadInterval + }; + + configuration.AddAzureKeyVault( + keyVaultEndpointUri, + new DefaultAzureCredential(includeInteractiveCredentials: true), + configOptions + ); + }); + + return builder; + } + } +} diff --git a/src/OrchardCore/OrchardCore.Configuration.KeyVault/OrchardCore.Configuration.KeyVault.csproj b/src/OrchardCore/OrchardCore.Configuration.KeyVault/OrchardCore.Configuration.KeyVault.csproj new file mode 100644 index 00000000000..0b9a826f652 --- /dev/null +++ b/src/OrchardCore/OrchardCore.Configuration.KeyVault/OrchardCore.Configuration.KeyVault.csproj @@ -0,0 +1,20 @@ + + + + $(AspNetCoreTargetFramework) + + + + + + + + + + + + + + + + diff --git a/src/OrchardCore/OrchardCore.Configuration.KeyVault/Services/AzureKeyVaultSecretManager.cs b/src/OrchardCore/OrchardCore.Configuration.KeyVault/Services/AzureKeyVaultSecretManager.cs new file mode 100644 index 00000000000..790e4f7d905 --- /dev/null +++ b/src/OrchardCore/OrchardCore.Configuration.KeyVault/Services/AzureKeyVaultSecretManager.cs @@ -0,0 +1,11 @@ +using Azure.Extensions.AspNetCore.Configuration.Secrets; +using Azure.Security.KeyVault.Secrets; + +namespace OrchardCore.Configuration.KeyVault.Services +{ + public class AzureKeyVaultSecretManager : KeyVaultSecretManager + { + public override string GetKey(KeyVaultSecret secret) => + secret.Name.Replace("---", "_").Replace("--", ":"); + } +} diff --git a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/CultureAspect.cs b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/CultureAspect.cs index 8852548c049..62be850c263 100644 --- a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/CultureAspect.cs +++ b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/CultureAspect.cs @@ -11,5 +11,7 @@ public class CultureAspect /// Gets or sets the culture. /// public CultureInfo Culture { get; set; } = CultureInfo.CurrentUICulture; + + public bool HasCulture { get; set; } } } diff --git a/src/docs/reference/core/KeyVault.Azure/README.md b/src/docs/reference/core/KeyVault.Azure/README.md new file mode 100644 index 00000000000..b45b0fb4585 --- /dev/null +++ b/src/docs/reference/core/KeyVault.Azure/README.md @@ -0,0 +1,40 @@ +# Azure Key Vault (`OrchardCore.Azure.KeyVault`) + +The Azure Key Vault configuration provider adds app configuration values from the Azure Key Vault in order to safeguard your cryptographic keys and secrets used by your app. It also contains custom override of the DefaultKeyVaultManager class that retrieves secrets from Azure Key Vault and translates --- to an underscore (_) and -- to a colon (:). Both underscores and colons are illegal characters in Azure KeyVault. + +Example: +Key Vault Input: "OrchardCore--OrchardCore---Shells---Database--ConnectionString". +Output: "OrchardCore:OrchardCore_Shells_Database:ConnectionString". +See https://github.com/OrchardCMS/OrchardCore/issues/6359. + +## Authenticating with Azure Key Vault +By default, the Azure Key Vault configuration provider uses the [Azure Identity library](https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/identity/Azure.Identity/README.md) for Azure Active Directory token authentication support across the Azure SDK. At this time, the OrchardCore.Azure.KeyVault only supports the DefaultAzureCredential setting, which is appropriate for most scenarios where the application is intended to be run in Azure. + +When debbugging or executing locally, developers have several options for authenticating with Azure Key Vault. To authenticate in Visual Studio select the Tools > Options menu to launch the Options dialog. Then navigate to the Azure Service Authentication options to sign in with your Azure Active Directory account. Developers using Visual Studio Code can use the [Azure Account Extension], to authenticate via the IDE. + +## Configuration +In addition, you will need to specify the name of your Azure Key Vault and optionally a reload interval in seconds. +```json +"OrchardCore_KeyVault_Azure": { + "KeyVaultName": "", // Set the name of your Azure Key Vault. + "ReloadInterval": "" // Optional, sets the timespan to wait between attempts at polling the Azure KeyVault for changes. Leave blank to disable reloading. +} +``` + +In the `Program.cs`, add `AddOrchardCoreAzureKeyVault()` to the Generic Host in `CreateHostBuilder()`. + +```csharp +using OrchardCore.Azure.KeyVault.Extensions;; +public class Program +{ + public static Task Main(string[] args) + => BuildHost(args).RunAsync(); + + public static IHost BuildHost(string[] args) => + Host.CreateDefaultBuilder(args) + .AddOrchardCoreAzureKeyVault() + .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup()) + .Build(); +} +``` + diff --git a/src/docs/resources/libraries/README.md b/src/docs/resources/libraries/README.md index bd2c3140556..355ace06142 100644 --- a/src/docs/resources/libraries/README.md +++ b/src/docs/resources/libraries/README.md @@ -65,4 +65,4 @@ The below table lists the different Tests libraries: |--- | --- | --- | --- | | [Cypress](https://github.com/cypress-io/cypress) | Fast, easy and reliable testing for anything that runs in a browser. | 6.1.0 | [MIT](https://github.com/cypress-io/cypress/blob/develop/LICENSE) | | [Cypress Orchard](https://www.npmjs.com/package/cypress-orchardcore) | A collection of cypress commands for Orchard Core. | 0.4.5 | MIT | -| [xUnit](https://github.com/xunit/xunit/blob/main/LICENSE) | Free, open source, community-focused unit testing tool for the .NET Framework. | 2.3.1 | [MIT](https://github.com/xunit/xunit/blob/main/LICENSE) | +| [xUnit](https://github.com/xunit/xunit/blob/main/LICENSE) | Free, open source, community-focused unit testing tool for the .NET Framework. | 2.4.1 | [MIT](https://github.com/xunit/xunit/blob/main/LICENSE) | diff --git a/test/OrchardCore.Tests/Apis/Recipes/AgencyRecipeTests.cs b/test/OrchardCore.Tests/Apis/Recipes/AgencyRecipeTests.cs deleted file mode 100644 index 84b8443aca4..00000000000 --- a/test/OrchardCore.Tests/Apis/Recipes/AgencyRecipeTests.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Threading.Tasks; -using OrchardCore.Tests.Apis.Context; -using OrchardCore.Tests.Apis.Context.Attributes; -using Xunit; - -namespace OrchardCore.Tests.Apis.Recipes -{ - public class AgencyRecipeTests - { - [Theory] - [SqliteData] - [SqlServerData] - [MySqlData] - [PostgreSqlData] - public async Task ShouldCreateAgency(string databaseProvider, string connectionString) - { - using var context = new AgencyContext() - .WithDatabaseProvider(databaseProvider) - .WithConnectionString(connectionString); - - // Act - await context.InitializeAsync(); - - var result = await context.Client.GetAsync("/"); - Assert.True(result.IsSuccessStatusCode); - } - } -} diff --git a/test/OrchardCore.Tests/Apis/Recipes/BlogRecipeTests.cs b/test/OrchardCore.Tests/Apis/Recipes/BlogRecipeTests.cs deleted file mode 100644 index 53348509ca1..00000000000 --- a/test/OrchardCore.Tests/Apis/Recipes/BlogRecipeTests.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Threading.Tasks; -using OrchardCore.Tests.Apis.Context; -using OrchardCore.Tests.Apis.Context.Attributes; -using Xunit; - -namespace OrchardCore.Tests.Apis.Recipes -{ - public class BlogRecipeTests - { - [Theory] - [SqliteData] - [SqlServerData] - [MySqlData] - [PostgreSqlData] - public async Task ShouldCreateBlog(string databaseProvider, string connectionString) - { - using var context = new SiteContext() - .WithDatabaseProvider(databaseProvider) - .WithConnectionString(connectionString); - - // Act - await context.InitializeAsync(); - - var result = await context.Client.GetAsync("/"); - Assert.True(result.IsSuccessStatusCode); - } - } -} diff --git a/test/OrchardCore.Tests/Apis/Recipes/ComingSoonRecipeTests.cs b/test/OrchardCore.Tests/Apis/Recipes/ComingSoonRecipeTests.cs deleted file mode 100644 index 9646d048c51..00000000000 --- a/test/OrchardCore.Tests/Apis/Recipes/ComingSoonRecipeTests.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Threading.Tasks; -using OrchardCore.Tests.Apis.Context; -using OrchardCore.Tests.Apis.Context.Attributes; -using Xunit; - -namespace OrchardCore.Tests.Apis.Recipes -{ - public class ComingSoonRecipeTests - { - [Theory] - [SqliteData] - [SqlServerData] - [MySqlData] - [PostgreSqlData] - public async Task ShouldCreateComingSoon(string databaseProvider, string connectionString) - { - using var context = new SiteContext() - .WithRecipe("ComingSoon") - .WithDatabaseProvider(databaseProvider) - .WithConnectionString(connectionString); - - // Act - await context.InitializeAsync(); - - var result = await context.Client.GetAsync("/"); - Assert.True(result.IsSuccessStatusCode); - } - } -} diff --git a/test/OrchardCore.Tests/Apis/Recipes/HeadlessRecipeTests.cs b/test/OrchardCore.Tests/Apis/Recipes/HeadlessRecipeTests.cs deleted file mode 100644 index 5b7babc3adf..00000000000 --- a/test/OrchardCore.Tests/Apis/Recipes/HeadlessRecipeTests.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Threading.Tasks; -using OrchardCore.Tests.Apis.Context; -using OrchardCore.Tests.Apis.Context.Attributes; -using Xunit; - -namespace OrchardCore.Tests.Apis.Recipes -{ - public class HeadlessRecipeTests - { - [Theory] - [SqliteData] - [SqlServerData] - [MySqlData] - [PostgreSqlData] - public async Task ShouldCreateHeadless(string databaseProvider, string connectionString) - { - using var context = new SiteContext() - .WithRecipe("Headless") - .WithDatabaseProvider(databaseProvider) - .WithConnectionString(connectionString); - - // Act - await context.InitializeAsync(); - - var result = await context.Client.GetAsync("/"); - Assert.True(result.IsSuccessStatusCode); - } - } -}