From c48a58fa90c814188b859d18b1dd4e92f09e0880 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Wed, 20 Feb 2019 16:22:24 +0100 Subject: [PATCH 01/55] Started with first refactoring. --- .../Actions/Algolia/AlgoliaAction.cs | 3 +- .../Actions/Algolia/AlgoliaPlugin.cs | 22 ++++++ .../Actions/AzureQueue/AzureQueueAction.cs | 1 + .../Actions/AzureQueue/AzureQueuePlugin.cs | 22 ++++++ .../Actions/Discourse/DiscourseAction.cs | 1 + .../Actions/Discourse/DiscoursePlugin.cs | 22 ++++++ .../ElasticSearch/ElasticSearchAction.cs | 1 + .../ElasticSearch/ElasticSearchPlugin.cs | 22 ++++++ .../Actions/Email/EmailAction.cs | 1 + .../Actions/Email/EmailPlugin.cs | 22 ++++++ .../Actions/Fastly/FastlyAction.cs | 1 + .../Actions/Fastly/FastlyPlugin.cs | 22 ++++++ .../Actions/Medium/MediumAction.cs | 1 + .../Actions/Medium/MediumPlugin.cs | 22 ++++++ .../Actions/Prerender/PrerenderAction.cs | 1 + .../Actions/Prerender/PrerenderPlugin.cs | 22 ++++++ .../Actions/Slack/SlackAction.cs | 1 + .../Actions/Slack/SlackPlugin.cs | 22 ++++++ .../Actions/TriggerTypes.cs | 57 -------------- .../Actions/Twitter/TweetAction.cs | 1 + .../Actions/Twitter/TwitterPlugin.cs | 22 ++++++ .../Actions/Webhook/WebhookAction.cs | 1 + .../Actions/Webhook/WebhookPlugin.cs | 22 ++++++ .../HandleRules/FormattableAttribute.cs | 16 ++++ .../HandleRules}/RuleActionAttribute.cs | 2 +- .../HandleRules/RuleActionDefinition.cs | 4 +- .../RuleActionHandlerAttribute.cs | 3 +- .../HandleRules/RuleActionRegistry.cs | 71 ++++++++++------- .../ImageSharpAssetThumbnailGenerator.cs | 4 +- .../Configuration/ConfigurationExtensions.cs | 65 ++++++++++++++++ .../Configuration}/Options.cs | 4 +- .../DependencyInjectionExtensions.cs} | 70 ++++------------- src/Squidex.Infrastructure/Plugins/IPlugin.cs | 18 +++++ .../Plugins/IWebPlugin.cs | 16 ++++ .../Plugins/PluginManager.cs | 59 ++++++++++++++ .../Plugins/PluginOptions.cs | 14 ++++ .../Squidex.Infrastructure.csproj | 1 + .../Translations/DeepLTranslator.cs | 16 ++-- .../Translations/DeepLTranslatorOptions.cs | 14 ++++ .../Api/Config/Swagger/SwaggerServices.cs | 2 +- .../Rules/Models/RuleActionConverter.cs | 3 +- .../Rules/Models/RuleActionProcessor.cs | 3 +- .../Api/Controllers/Rules/RulesController.cs | 26 +------ src/Squidex/Config/Domain/AssetServices.cs | 2 + src/Squidex/Config/Domain/EntitiesServices.cs | 2 + .../Config/Domain/EventPublishersServices.cs | 1 + .../Config/Domain/EventStoreServices.cs | 2 + .../Config/Domain/InfrastructureServices.cs | 18 +---- src/Squidex/Config/Domain/LoggingServices.cs | 1 + src/Squidex/Config/Domain/RuleServices.cs | 3 +- .../Config/Domain/SerializationServices.cs | 1 - src/Squidex/Config/Domain/StoreServices.cs | 2 + .../Config/Domain/SubscriptionServices.cs | 1 + src/Squidex/Config/Orleans/OrleansServices.cs | 1 + src/Squidex/Config/Web/WebServices.cs | 1 + .../Pipeline/Plugins/PluginExtensions.cs | 76 +++++++++++++++++++ src/Squidex/Squidex.csproj | 1 + src/Squidex/WebStartup.cs | 3 + 58 files changed, 641 insertions(+), 197 deletions(-) create mode 100644 extensions/Squidex.Extensions/Actions/Algolia/AlgoliaPlugin.cs create mode 100644 extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueuePlugin.cs create mode 100644 extensions/Squidex.Extensions/Actions/Discourse/DiscoursePlugin.cs create mode 100644 extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchPlugin.cs create mode 100644 extensions/Squidex.Extensions/Actions/Email/EmailPlugin.cs create mode 100644 extensions/Squidex.Extensions/Actions/Fastly/FastlyPlugin.cs create mode 100644 extensions/Squidex.Extensions/Actions/Medium/MediumPlugin.cs create mode 100644 extensions/Squidex.Extensions/Actions/Prerender/PrerenderPlugin.cs create mode 100644 extensions/Squidex.Extensions/Actions/Slack/SlackPlugin.cs delete mode 100644 extensions/Squidex.Extensions/Actions/TriggerTypes.cs create mode 100644 extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs create mode 100644 extensions/Squidex.Extensions/Actions/Webhook/WebhookPlugin.cs create mode 100644 src/Squidex.Domain.Apps.Core.Operations/HandleRules/FormattableAttribute.cs rename {extensions/Squidex.Extensions/Actions => src/Squidex.Domain.Apps.Core.Operations/HandleRules}/RuleActionAttribute.cs (94%) rename extensions/Squidex.Extensions/Actions/RuleElement.cs => src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionDefinition.cs (88%) rename {extensions/Squidex.Extensions/Actions => src/Squidex.Domain.Apps.Core.Operations/HandleRules}/RuleActionHandlerAttribute.cs (92%) rename extensions/Squidex.Extensions/Actions/RuleElementRegistry.cs => src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistry.cs (55%) create mode 100644 src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs rename src/{Squidex/Config => Squidex.Infrastructure/Configuration}/Options.cs (84%) rename src/{Squidex/Config/ServiceExtensions.cs => Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs} (61%) create mode 100644 src/Squidex.Infrastructure/Plugins/IPlugin.cs create mode 100644 src/Squidex.Infrastructure/Plugins/IWebPlugin.cs create mode 100644 src/Squidex.Infrastructure/Plugins/PluginManager.cs create mode 100644 src/Squidex.Infrastructure/Plugins/PluginOptions.cs create mode 100644 src/Squidex.Infrastructure/Translations/DeepLTranslatorOptions.cs create mode 100644 src/Squidex/Pipeline/Plugins/PluginExtensions.cs diff --git a/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaAction.cs b/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaAction.cs index baff5dc43..cef0f0aba 100644 --- a/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaAction.cs +++ b/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaAction.cs @@ -6,6 +6,7 @@ // ========================================================================== using System.ComponentModel.DataAnnotations; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Extensions.Actions.Algolia @@ -28,7 +29,7 @@ namespace Squidex.Extensions.Actions.Algolia public string ApiKey { get; set; } [Required] - [Display(Name = "Index Name", Description = "THe name of the index.")] + [Display(Name = "Index Name", Description = "The name of the index.")] public string IndexName { get; set; } } } diff --git a/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaPlugin.cs b/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaPlugin.cs new file mode 100644 index 000000000..71d0f4c08 --- /dev/null +++ b/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaPlugin.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Infrastructure.Plugins; + +namespace Squidex.Extensions.Actions.Algolia +{ + public sealed class AlgoliaPlugin : IPlugin + { + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + { + RuleActionRegistry.Add(); + } + } +} diff --git a/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs index 0ee5de663..2acc7ec7c 100644 --- a/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs +++ b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Text.RegularExpressions; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; using Squidex.Infrastructure; diff --git a/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueuePlugin.cs b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueuePlugin.cs new file mode 100644 index 000000000..e069c08d2 --- /dev/null +++ b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueuePlugin.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Infrastructure.Plugins; + +namespace Squidex.Extensions.Actions.AzureQueue +{ + public sealed class AzureQueuePlugin : IPlugin + { + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + { + RuleActionRegistry.Add(); + } + } +} diff --git a/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs b/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs index 4711dec26..a73f1f493 100644 --- a/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs +++ b/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs @@ -7,6 +7,7 @@ using System; using System.ComponentModel.DataAnnotations; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; using Squidex.Infrastructure; diff --git a/extensions/Squidex.Extensions/Actions/Discourse/DiscoursePlugin.cs b/extensions/Squidex.Extensions/Actions/Discourse/DiscoursePlugin.cs new file mode 100644 index 000000000..2d7d9f6d7 --- /dev/null +++ b/extensions/Squidex.Extensions/Actions/Discourse/DiscoursePlugin.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Infrastructure.Plugins; + +namespace Squidex.Extensions.Actions.Discourse +{ + public sealed class DiscoursePlugin : IPlugin + { + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + { + RuleActionRegistry.Add(); + } + } +} diff --git a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs index 620f9ef6e..2bf262e82 100644 --- a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs +++ b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs @@ -7,6 +7,7 @@ using System; using System.ComponentModel.DataAnnotations; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; using Squidex.Infrastructure; diff --git a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchPlugin.cs b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchPlugin.cs new file mode 100644 index 000000000..49cf06697 --- /dev/null +++ b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchPlugin.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Infrastructure.Plugins; + +namespace Squidex.Extensions.Actions.ElasticSearch +{ + public sealed class ElasticSearchPlugin : IPlugin + { + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + { + RuleActionRegistry.Add(); + } + } +} diff --git a/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs b/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs index 0de1cb24f..067e5fbce 100644 --- a/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs +++ b/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs @@ -6,6 +6,7 @@ // ========================================================================== using System.ComponentModel.DataAnnotations; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Extensions.Actions.Email diff --git a/extensions/Squidex.Extensions/Actions/Email/EmailPlugin.cs b/extensions/Squidex.Extensions/Actions/Email/EmailPlugin.cs new file mode 100644 index 000000000..34a5c88ce --- /dev/null +++ b/extensions/Squidex.Extensions/Actions/Email/EmailPlugin.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Infrastructure.Plugins; + +namespace Squidex.Extensions.Actions.Email +{ + public sealed class EmailPlugin : IPlugin + { + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + { + RuleActionRegistry.Add(); + } + } +} diff --git a/extensions/Squidex.Extensions/Actions/Fastly/FastlyAction.cs b/extensions/Squidex.Extensions/Actions/Fastly/FastlyAction.cs index 928dab189..d1840782d 100644 --- a/extensions/Squidex.Extensions/Actions/Fastly/FastlyAction.cs +++ b/extensions/Squidex.Extensions/Actions/Fastly/FastlyAction.cs @@ -6,6 +6,7 @@ // ========================================================================== using System.ComponentModel.DataAnnotations; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Extensions.Actions.Fastly diff --git a/extensions/Squidex.Extensions/Actions/Fastly/FastlyPlugin.cs b/extensions/Squidex.Extensions/Actions/Fastly/FastlyPlugin.cs new file mode 100644 index 000000000..8268d912a --- /dev/null +++ b/extensions/Squidex.Extensions/Actions/Fastly/FastlyPlugin.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Infrastructure.Plugins; + +namespace Squidex.Extensions.Actions.Fastly +{ + public sealed class FastlyPlugin : IPlugin + { + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + { + RuleActionRegistry.Add(); + } + } +} diff --git a/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs b/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs index 1363aa430..6bbf1bb30 100644 --- a/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs +++ b/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs @@ -6,6 +6,7 @@ // ========================================================================== using System.ComponentModel.DataAnnotations; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Extensions.Actions.Medium diff --git a/extensions/Squidex.Extensions/Actions/Medium/MediumPlugin.cs b/extensions/Squidex.Extensions/Actions/Medium/MediumPlugin.cs new file mode 100644 index 000000000..8a1090672 --- /dev/null +++ b/extensions/Squidex.Extensions/Actions/Medium/MediumPlugin.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Infrastructure.Plugins; + +namespace Squidex.Extensions.Actions.Medium +{ + public sealed class MediumPlugin : IPlugin + { + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + { + RuleActionRegistry.Add(); + } + } +} diff --git a/extensions/Squidex.Extensions/Actions/Prerender/PrerenderAction.cs b/extensions/Squidex.Extensions/Actions/Prerender/PrerenderAction.cs index 47c37eafa..4672a8d61 100644 --- a/extensions/Squidex.Extensions/Actions/Prerender/PrerenderAction.cs +++ b/extensions/Squidex.Extensions/Actions/Prerender/PrerenderAction.cs @@ -6,6 +6,7 @@ // ========================================================================== using System.ComponentModel.DataAnnotations; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Extensions.Actions.Prerender diff --git a/extensions/Squidex.Extensions/Actions/Prerender/PrerenderPlugin.cs b/extensions/Squidex.Extensions/Actions/Prerender/PrerenderPlugin.cs new file mode 100644 index 000000000..89e1a6c9b --- /dev/null +++ b/extensions/Squidex.Extensions/Actions/Prerender/PrerenderPlugin.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Infrastructure.Plugins; + +namespace Squidex.Extensions.Actions.Prerender +{ + public sealed class PrerenderPlugin : IPlugin + { + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + { + RuleActionRegistry.Add(); + } + } +} diff --git a/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs b/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs index 792a0f3fc..4e2863f8a 100644 --- a/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs +++ b/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs @@ -7,6 +7,7 @@ using System; using System.ComponentModel.DataAnnotations; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; using Squidex.Infrastructure; diff --git a/extensions/Squidex.Extensions/Actions/Slack/SlackPlugin.cs b/extensions/Squidex.Extensions/Actions/Slack/SlackPlugin.cs new file mode 100644 index 000000000..1149a5875 --- /dev/null +++ b/extensions/Squidex.Extensions/Actions/Slack/SlackPlugin.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Infrastructure.Plugins; + +namespace Squidex.Extensions.Actions.Slack +{ + public sealed class SlackPlugin : IPlugin + { + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + { + RuleActionRegistry.Add(); + } + } +} diff --git a/extensions/Squidex.Extensions/Actions/TriggerTypes.cs b/extensions/Squidex.Extensions/Actions/TriggerTypes.cs deleted file mode 100644 index 731a280f9..000000000 --- a/extensions/Squidex.Extensions/Actions/TriggerTypes.cs +++ /dev/null @@ -1,57 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using System.Collections.Generic; -using Squidex.Domain.Apps.Core.Rules.Triggers; -using Squidex.Infrastructure; - -namespace Squidex.Extensions.Actions -{ - public static class TriggerTypes - { - private const string TriggerSuffix = "Trigger"; - private const string TriggerSuffixV2 = "TriggerV2"; - - public static readonly IReadOnlyDictionary All = new Dictionary - { - [GetTriggerName(typeof(ContentChangedTriggerV2))] = new RuleElement - { - IconImage = "", - IconColor = "#3389ff", - Display = "Content changed", - Description = "For content changes like created, updated, published, unpublished..." - }, - [GetTriggerName(typeof(AssetChangedTriggerV2))] = new RuleElement - { - IconImage = "", - IconColor = "#3389ff", - Display = "Asset changed", - Description = "For asset changes like uploaded, updated (reuploaded), renamed, deleted..." - }, - [GetTriggerName(typeof(SchemaChangedTrigger))] = new RuleElement - { - IconImage = "", - IconColor = "#3389ff", - Display = "Schema changed", - Description = "When a schema definition has been created, updated, published or deleted..." - }, - [GetTriggerName(typeof(UsageTrigger))] = new RuleElement - { - IconImage = "", - IconColor = "#3389ff", - Display = "Usage exceeded", - Description = "When monthly API calls exceed a specified limit for one time a month..." - } - }; - - private static string GetTriggerName(Type type) - { - return type.TypeName(false, TriggerSuffix, TriggerSuffixV2); - } - } -} diff --git a/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs b/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs index a16f98c6f..cc0fa3d17 100644 --- a/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs +++ b/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs @@ -6,6 +6,7 @@ // ========================================================================== using System.ComponentModel.DataAnnotations; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Extensions.Actions.Twitter diff --git a/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs b/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs new file mode 100644 index 000000000..a5b120f4a --- /dev/null +++ b/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Infrastructure.Plugins; + +namespace Squidex.Extensions.Actions.Twitter +{ + public sealed class TwitterPlugin : IPlugin + { + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + { + RuleActionRegistry.Add(); + } + } +} diff --git a/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs b/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs index e2c260b11..0877c37c9 100644 --- a/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs +++ b/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs @@ -7,6 +7,7 @@ using System; using System.ComponentModel.DataAnnotations; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; using Squidex.Infrastructure; diff --git a/extensions/Squidex.Extensions/Actions/Webhook/WebhookPlugin.cs b/extensions/Squidex.Extensions/Actions/Webhook/WebhookPlugin.cs new file mode 100644 index 000000000..c9786cdf0 --- /dev/null +++ b/extensions/Squidex.Extensions/Actions/Webhook/WebhookPlugin.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Infrastructure.Plugins; + +namespace Squidex.Extensions.Actions.Webhook +{ + public sealed class WebhookPlugin : IPlugin + { + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + { + RuleActionRegistry.Add(); + } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/FormattableAttribute.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/FormattableAttribute.cs new file mode 100644 index 000000000..296dcb840 --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/FormattableAttribute.cs @@ -0,0 +1,16 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; + +namespace Squidex.Domain.Apps.Core.HandleRules +{ + [AttributeUsage(AttributeTargets.Property)] + public sealed class FormattableAttribute : Attribute + { + } +} diff --git a/extensions/Squidex.Extensions/Actions/RuleActionAttribute.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionAttribute.cs similarity index 94% rename from extensions/Squidex.Extensions/Actions/RuleActionAttribute.cs rename to src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionAttribute.cs index c5fa0343f..31c1f2368 100644 --- a/extensions/Squidex.Extensions/Actions/RuleActionAttribute.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionAttribute.cs @@ -7,7 +7,7 @@ using System; -namespace Squidex.Extensions.Actions +namespace Squidex.Domain.Apps.Core.HandleRules { [AttributeUsage(AttributeTargets.Class, Inherited = false)] public sealed class RuleActionAttribute : Attribute diff --git a/extensions/Squidex.Extensions/Actions/RuleElement.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionDefinition.cs similarity index 88% rename from extensions/Squidex.Extensions/Actions/RuleElement.cs rename to src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionDefinition.cs index 6d7244c01..595f6d56b 100644 --- a/extensions/Squidex.Extensions/Actions/RuleElement.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionDefinition.cs @@ -7,9 +7,9 @@ using System; -namespace Squidex.Extensions.Actions +namespace Squidex.Domain.Apps.Core.HandleRules { - public sealed class RuleElement + public sealed class RuleActionDefinition { public Type Type { get; set; } diff --git a/extensions/Squidex.Extensions/Actions/RuleActionHandlerAttribute.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionHandlerAttribute.cs similarity index 92% rename from extensions/Squidex.Extensions/Actions/RuleActionHandlerAttribute.cs rename to src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionHandlerAttribute.cs index 5da96ebf5..24d29ccea 100644 --- a/extensions/Squidex.Extensions/Actions/RuleActionHandlerAttribute.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionHandlerAttribute.cs @@ -6,10 +6,9 @@ // ========================================================================== using System; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Infrastructure; -namespace Squidex.Extensions.Actions +namespace Squidex.Domain.Apps.Core.HandleRules { [AttributeUsage(AttributeTargets.Class, Inherited = false)] public sealed class RuleActionHandlerAttribute : Attribute diff --git a/extensions/Squidex.Extensions/Actions/RuleElementRegistry.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistry.cs similarity index 55% rename from extensions/Squidex.Extensions/Actions/RuleElementRegistry.cs rename to src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistry.cs index dac6d42dc..a17a58872 100644 --- a/extensions/Squidex.Extensions/Actions/RuleElementRegistry.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistry.cs @@ -12,21 +12,16 @@ using System.Reflection; using Squidex.Domain.Apps.Core.Rules; using Squidex.Infrastructure; -namespace Squidex.Extensions.Actions +namespace Squidex.Domain.Apps.Core.HandleRules { - public static class RuleElementRegistry + public static class RuleActionRegistry { private const string ActionSuffix = "Action"; private const string ActionSuffixV2 = "Action"; private static readonly HashSet ActionHandlerTypes = new HashSet(); - private static readonly Dictionary ActionTypes = new Dictionary(); + private static readonly Dictionary ActionTypes = new Dictionary(); - public static IReadOnlyDictionary Triggers - { - get { return TriggerTypes.All; } - } - - public static IReadOnlyDictionary Actions + public static IReadOnlyDictionary Actions { get { return ActionTypes; } } @@ -36,10 +31,10 @@ namespace Squidex.Extensions.Actions get { return ActionHandlerTypes; } } - static RuleElementRegistry() + static RuleActionRegistry() { var actionTypes = - typeof(RuleElementRegistry).Assembly + typeof(RuleActionRegistry).Assembly .GetTypes() .Where(x => typeof(RuleAction).IsAssignableFrom(x)) .Where(x => x.GetCustomAttribute() != null) @@ -48,25 +43,47 @@ namespace Squidex.Extensions.Actions foreach (var actionType in actionTypes) { - var name = GetActionName(actionType); - - var metadata = actionType.GetCustomAttribute(); - - ActionTypes[name] = - new RuleElement - { - Type = actionType, - Display = metadata.Display, - Description = metadata.Description, - IconColor = metadata.IconColor, - IconImage = metadata.IconImage, - ReadMore = metadata.ReadMore - }; - - ActionHandlerTypes.Add(actionType.GetCustomAttribute().HandlerType); + Add(actionType); } } + public static void Add() where T : RuleAction + { + Add(typeof(T)); + } + + private static void Add(Type actionType) + { + var metadata = actionType.GetCustomAttribute(); + + if (metadata == null) + { + return; + } + + var handlerAttribute = actionType.GetCustomAttribute(); + + if (handlerAttribute == null) + { + return; + } + + var name = GetActionName(actionType); + + ActionTypes[name] = + new RuleActionDefinition + { + Type = actionType, + Display = metadata.Display, + Description = metadata.Description, + IconColor = metadata.IconColor, + IconImage = metadata.IconImage, + ReadMore = metadata.ReadMore + }; + + ActionHandlerTypes.Add(actionType.GetCustomAttribute().HandlerType); + } + public static TypeNameRegistry MapRuleActions(this TypeNameRegistry typeNameRegistry) { foreach (var actionType in ActionTypes.Values) diff --git a/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs b/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs index f36089eeb..82c4e2dc9 100644 --- a/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs +++ b/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs @@ -19,8 +19,8 @@ namespace Squidex.Infrastructure.Assets.ImageSharp { public ImageSharpAssetThumbnailGenerator() { - Configuration.Default.ImageFormatsManager.AddImageFormat(ImageFormats.Jpeg); - Configuration.Default.ImageFormatsManager.AddImageFormat(ImageFormats.Png); + SixLabors.ImageSharp.Configuration.Default.ImageFormatsManager.AddImageFormat(ImageFormats.Jpeg); + SixLabors.ImageSharp.Configuration.Default.ImageFormatsManager.AddImageFormat(ImageFormats.Png); } public Task CreateThumbnailAsync(Stream source, Stream destination, int? width, int? height, string mode) diff --git a/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs b/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs new file mode 100644 index 000000000..2194f753b --- /dev/null +++ b/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs @@ -0,0 +1,65 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Globalization; +using System.Linq; +using Microsoft.Extensions.Configuration; + +namespace Squidex.Infrastructure.Configuration +{ + public static class ConfigurationExtensions + { + public static T GetOptionalValue(this IConfiguration config, string path, T defaultValue = default) + { + var value = config.GetValue(path, defaultValue); + + return value; + } + + public static int GetOptionalValue(this IConfiguration config, string path, int defaultValue) + { + var value = config.GetValue(path); + + if (string.IsNullOrWhiteSpace(value) || !int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var result)) + { + result = defaultValue; + } + + return result; + } + + public static string GetRequiredValue(this IConfiguration config, string path) + { + var value = config.GetValue(path); + + if (string.IsNullOrWhiteSpace(value)) + { + var name = string.Join(" ", path.Split(':').Select(x => x.ToPascalCase())); + + throw new ConfigurationException($"Configure the {name} with '{path}'."); + } + + return value; + } + + public static string ConfigureByOption(this IConfiguration config, string path, Options options) + { + var value = config.GetRequiredValue(path); + + if (options.TryGetValue(value, out var action)) + { + action(); + } + else + { + throw new ConfigurationException($"Unsupported value '{value}' for '{path}', supported: {string.Join(" ", options.Keys)}."); + } + + return value; + } + } +} diff --git a/src/Squidex/Config/Options.cs b/src/Squidex.Infrastructure/Configuration/Options.cs similarity index 84% rename from src/Squidex/Config/Options.cs rename to src/Squidex.Infrastructure/Configuration/Options.cs index 1962bba5e..79a3cdfae 100644 --- a/src/Squidex/Config/Options.cs +++ b/src/Squidex.Infrastructure/Configuration/Options.cs @@ -1,14 +1,14 @@ // ========================================================================== // Squidex Headless CMS // ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschränkt) +// Copyright (c) Squidex UG (haftungsbeschraenkt) // All rights reserved. Licensed under the MIT license. // ========================================================================== using System; using System.Collections.Generic; -namespace Squidex.Config +namespace Squidex.Infrastructure.Configuration { public sealed class Options : Dictionary { diff --git a/src/Squidex/Config/ServiceExtensions.cs b/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs similarity index 61% rename from src/Squidex/Config/ServiceExtensions.cs rename to src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs index 8d185bf60..5b39ad14b 100644 --- a/src/Squidex/Config/ServiceExtensions.cs +++ b/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs @@ -1,20 +1,18 @@ // ========================================================================== // Squidex Headless CMS // ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschränkt) +// Copyright (c) Squidex UG (haftungsbeschraenkt) // All rights reserved. Licensed under the MIT license. // ========================================================================== using System; -using System.Globalization; using System.Linq; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Infrastructure; +using Microsoft.Extensions.DependencyInjection.Extensions; -namespace Squidex.Config +namespace Squidex.Infrastructure.DependencyInjection { - public static class ServiceExtensions + public static class DependencyInjectionExtensions { public sealed class InterfaceRegistrator { @@ -30,6 +28,16 @@ namespace Squidex.Config return this; } + public InterfaceRegistrator AsOptional() + { + if (typeof(TInterface) != typeof(T)) + { + services.TryAddSingleton(typeof(TInterface), c => c.GetRequiredService()); + } + + return this; + } + public InterfaceRegistrator As() { if (typeof(TInterface) != typeof(T)) @@ -89,55 +97,5 @@ namespace Squidex.Config services.AddSingleton(typeof(IInitializable), c => c.GetRequiredService()); } } - - public static T GetOptionalValue(this IConfiguration config, string path, T defaultValue = default) - { - var value = config.GetValue(path, defaultValue); - - return value; - } - - public static int GetOptionalValue(this IConfiguration config, string path, int defaultValue) - { - var value = config.GetValue(path); - var result = defaultValue; - - if (string.IsNullOrWhiteSpace(value) || !int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out result)) - { - result = defaultValue; - } - - return result; - } - - public static string GetRequiredValue(this IConfiguration config, string path) - { - var value = config.GetValue(path); - - if (string.IsNullOrWhiteSpace(value)) - { - var name = string.Join(' ', path.Split(':').Select(x => x.ToPascalCase())); - - throw new ConfigurationException($"Configure the {name} with '{path}'."); - } - - return value; - } - - public static string ConfigureByOption(this IConfiguration config, string path, Options options) - { - var value = config.GetRequiredValue(path); - - if (options.TryGetValue(value, out var action)) - { - action(); - } - else - { - throw new ConfigurationException($"Unsupported value '{value}' for '{path}', supported: {string.Join(' ', options.Keys)}."); - } - - return value; - } } } diff --git a/src/Squidex.Infrastructure/Plugins/IPlugin.cs b/src/Squidex.Infrastructure/Plugins/IPlugin.cs new file mode 100644 index 000000000..72ed11047 --- /dev/null +++ b/src/Squidex.Infrastructure/Plugins/IPlugin.cs @@ -0,0 +1,18 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; + +namespace Squidex.Infrastructure.Plugins +{ + public interface IPlugin + { + void ConfigureServices(IServiceCollection services, IConfiguration configuration); + } +} diff --git a/src/Squidex.Infrastructure/Plugins/IWebPlugin.cs b/src/Squidex.Infrastructure/Plugins/IWebPlugin.cs new file mode 100644 index 000000000..2baddf066 --- /dev/null +++ b/src/Squidex.Infrastructure/Plugins/IWebPlugin.cs @@ -0,0 +1,16 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.AspNetCore.Builder; + +namespace Squidex.Infrastructure.Plugins +{ + public interface IWebPlugin + { + void Configure(IApplicationBuilder app); + } +} diff --git a/src/Squidex.Infrastructure/Plugins/PluginManager.cs b/src/Squidex.Infrastructure/Plugins/PluginManager.cs new file mode 100644 index 000000000..08e2381ce --- /dev/null +++ b/src/Squidex.Infrastructure/Plugins/PluginManager.cs @@ -0,0 +1,59 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; + +namespace Squidex.Infrastructure.Plugins +{ + public sealed class PluginManager + { + private readonly HashSet plugins = new HashSet(); + + public void Add(Assembly assembly) + { + Guard.NotNull(assembly, nameof(assembly)); + + var pluginTypes = + assembly.GetTypes() + .Where(t => typeof(IPlugin).IsAssignableFrom(t) && !t.IsAbstract); + + foreach (var pluginType in pluginTypes) + { + var plugin = (IPlugin)Activator.CreateInstance(pluginType); + + plugins.Add(plugin); + } + } + + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + { + Guard.NotNull(services, nameof(services)); + Guard.NotNull(configuration, nameof(configuration)); + + foreach (var plugin in plugins) + { + plugin.ConfigureServices(services, configuration); + } + } + + public void Configure(IApplicationBuilder app) + { + Guard.NotNull(app, nameof(app)); + + foreach (var plugin in plugins.OfType()) + { + plugin.Configure(app); + } + } + } +} diff --git a/src/Squidex.Infrastructure/Plugins/PluginOptions.cs b/src/Squidex.Infrastructure/Plugins/PluginOptions.cs new file mode 100644 index 000000000..561e0845a --- /dev/null +++ b/src/Squidex.Infrastructure/Plugins/PluginOptions.cs @@ -0,0 +1,14 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Infrastructure.Plugins +{ + public sealed class PluginOptions + { + public string[] Plugins { get; set; } + } +} diff --git a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj index ea5c0a8b0..f411a7f4c 100644 --- a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj +++ b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj @@ -8,6 +8,7 @@ True + diff --git a/src/Squidex.Infrastructure/Translations/DeepLTranslator.cs b/src/Squidex.Infrastructure/Translations/DeepLTranslator.cs index 877e76d7a..09920e6b6 100644 --- a/src/Squidex.Infrastructure/Translations/DeepLTranslator.cs +++ b/src/Squidex.Infrastructure/Translations/DeepLTranslator.cs @@ -10,6 +10,7 @@ using System.Net; using System.Net.Http; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.Options; using Squidex.Infrastructure.Json; namespace Squidex.Infrastructure.Translations @@ -18,7 +19,7 @@ namespace Squidex.Infrastructure.Translations { private const string Url = "https://api.deepl.com/v2/translate"; private readonly HttpClient httpClient = new HttpClient(); - private readonly string authKey; + private readonly DeepLTranslatorOptions deepLOptions; private readonly IJsonSerializer jsonSerializer; private sealed class Response @@ -31,12 +32,12 @@ namespace Squidex.Infrastructure.Translations public string Text { get; set; } } - public DeepLTranslator(string authKey, IJsonSerializer jsonSerializer) + public DeepLTranslator(IOptions deepLOptions, IJsonSerializer jsonSerializer) { - Guard.NotNull(authKey, nameof(authKey)); + Guard.NotNull(deepLOptions, nameof(deepLOptions)); Guard.NotNull(jsonSerializer, nameof(jsonSerializer)); - this.authKey = authKey; + this.deepLOptions = deepLOptions.Value; this.jsonSerializer = jsonSerializer; } @@ -48,9 +49,14 @@ namespace Squidex.Infrastructure.Translations return new Translation(TranslationResult.NotTranslated, sourceText); } + if (string.IsNullOrWhiteSpace(deepLOptions.AuthKey)) + { + return new Translation(TranslationResult.NotImplemented); + } + var parameters = new Dictionary { - ["auth_key"] = authKey, + ["auth_key"] = deepLOptions.AuthKey, ["text"] = sourceText, ["target_lang"] = GetLanguageCode(targetLanguage) }; diff --git a/src/Squidex.Infrastructure/Translations/DeepLTranslatorOptions.cs b/src/Squidex.Infrastructure/Translations/DeepLTranslatorOptions.cs new file mode 100644 index 000000000..d7124e343 --- /dev/null +++ b/src/Squidex.Infrastructure/Translations/DeepLTranslatorOptions.cs @@ -0,0 +1,14 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Infrastructure.Translations +{ + public sealed class DeepLTranslatorOptions + { + public string AuthKey { get; set; } + } +} diff --git a/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs b/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs index 5059cb21c..07a973ea4 100644 --- a/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs @@ -14,8 +14,8 @@ using NSwag.SwaggerGeneration; using NSwag.SwaggerGeneration.Processors; using Squidex.Areas.Api.Controllers.Contents.Generator; using Squidex.Areas.Api.Controllers.Rules.Models; -using Squidex.Config; using Squidex.Infrastructure; +using Squidex.Infrastructure.DependencyInjection; namespace Squidex.Areas.Api.Config.Swagger { diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs index 4efcfb7ad..fe5666dad 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; using Squidex.Extensions.Actions; @@ -15,7 +16,7 @@ namespace Squidex.Areas.Api.Controllers.Rules.Models { public sealed class RuleActionConverter : MyJsonInheritanceConverter { - private static readonly Dictionary Mapping = RuleElementRegistry.Actions.ToDictionary(x => x.Key, x => x.Value.Type); + private static readonly Dictionary Mapping = RuleActionRegistry.Actions.ToDictionary(x => x.Key, x => x.Value.Type); public RuleActionConverter() : base("actionType", Mapping) diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs index a0d23e12b..2ea9995b8 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs @@ -11,6 +11,7 @@ using System.Threading.Tasks; using NJsonSchema; using NSwag.SwaggerGeneration.Processors; using NSwag.SwaggerGeneration.Processors.Contexts; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; using Squidex.Extensions.Actions; @@ -36,7 +37,7 @@ namespace Squidex.Areas.Api.Controllers.Rules.Models Type = JsonObjectType.String, IsRequired = true }; - foreach (var derived in RuleElementRegistry.Actions) + foreach (var derived in RuleActionRegistry.Actions) { var derivedSchema = await context.SchemaGenerator.GenerateAsync(derived.Value.Type, context.SchemaResolver); diff --git a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs index 998f08a70..752b4e041 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs @@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Net.Http.Headers; using NodaTime; using Squidex.Areas.Api.Controllers.Rules.Models; +using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Entities; using Squidex.Domain.Apps.Entities.Rules.Commands; using Squidex.Domain.Apps.Entities.Rules.Repositories; @@ -31,8 +32,7 @@ namespace Squidex.Areas.Api.Controllers.Rules [ApiExplorerSettings(GroupName = nameof(Rules))] public sealed class RulesController : ApiController { - private static readonly string RuleActionsEtag = string.Join(";", RuleElementRegistry.Actions.Select(x => x.Key)).Sha256Base64(); - private static readonly string RuleTriggersEtag = string.Join(";", RuleElementRegistry.Triggers.Select(x => x.Key)).Sha256Base64(); + private static readonly string RuleActionsEtag = string.Join(";", RuleActionRegistry.Actions.Select(x => x.Key)).Sha256Base64(); private readonly IAppProvider appProvider; private readonly IRuleEventRepository ruleEventsRepository; @@ -58,33 +58,13 @@ namespace Squidex.Areas.Api.Controllers.Rules [ApiCosts(0)] public IActionResult GetActions() { - var response = RuleElementRegistry.Actions.ToDictionary(x => x.Key, x => SimpleMapper.Map(x.Value, new RuleElementDto())); + var response = RuleActionRegistry.Actions.ToDictionary(x => x.Key, x => SimpleMapper.Map(x.Value, new RuleElementDto())); Response.Headers[HeaderNames.ETag] = RuleActionsEtag; return Ok(response); } - /// - /// Get the supported rule triggers. - /// - /// - /// 200 => Rule triggers returned. - /// - [HttpGet] - [Route("rules/triggers/")] - [ProducesResponseType(typeof(Dictionary), 200)] - [ApiPermission] - [ApiCosts(0)] - public IActionResult GetTriggers() - { - var response = RuleElementRegistry.Triggers.ToDictionary(x => x.Key, x => SimpleMapper.Map(x.Value, new RuleElementDto())); - - Response.Headers[HeaderNames.ETag] = RuleTriggersEtag; - - return Ok(response); - } - /// /// Get rules. /// diff --git a/src/Squidex/Config/Domain/AssetServices.cs b/src/Squidex/Config/Domain/AssetServices.cs index 8ec712b17..d1edf5d54 100644 --- a/src/Squidex/Config/Domain/AssetServices.cs +++ b/src/Squidex/Config/Domain/AssetServices.cs @@ -12,6 +12,8 @@ using MongoDB.Driver.GridFS; using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Assets.ImageSharp; +using Squidex.Infrastructure.Configuration; +using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.Log; namespace Squidex.Config.Domain diff --git a/src/Squidex/Config/Domain/EntitiesServices.cs b/src/Squidex/Config/Domain/EntitiesServices.cs index 98641c63f..8cd35728e 100644 --- a/src/Squidex/Config/Domain/EntitiesServices.cs +++ b/src/Squidex/Config/Domain/EntitiesServices.cs @@ -42,6 +42,8 @@ using Squidex.Domain.Apps.Entities.Schemas.Indexes; using Squidex.Domain.Apps.Entities.Tags; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; +using Squidex.Infrastructure.Configuration; +using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Migrations; using Squidex.Pipeline; diff --git a/src/Squidex/Config/Domain/EventPublishersServices.cs b/src/Squidex/Config/Domain/EventPublishersServices.cs index dad6cd6ec..82004c1db 100644 --- a/src/Squidex/Config/Domain/EventPublishersServices.cs +++ b/src/Squidex/Config/Domain/EventPublishersServices.cs @@ -10,6 +10,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Infrastructure; using Squidex.Infrastructure.CQRS.Events; +using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Json; diff --git a/src/Squidex/Config/Domain/EventStoreServices.cs b/src/Squidex/Config/Domain/EventStoreServices.cs index defcbc2c7..03cb235e2 100644 --- a/src/Squidex/Config/Domain/EventStoreServices.cs +++ b/src/Squidex/Config/Domain/EventStoreServices.cs @@ -11,6 +11,8 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using MongoDB.Driver; using Squidex.Infrastructure; +using Squidex.Infrastructure.Configuration; +using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.Diagnostics; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.EventSourcing.Grains; diff --git a/src/Squidex/Config/Domain/InfrastructureServices.cs b/src/Squidex/Config/Domain/InfrastructureServices.cs index 33687222d..a623e3650 100644 --- a/src/Squidex/Config/Domain/InfrastructureServices.cs +++ b/src/Squidex/Config/Domain/InfrastructureServices.cs @@ -18,8 +18,8 @@ using Squidex.Domain.Apps.Entities.Apps.Diagnostics; using Squidex.Domain.Users; using Squidex.Infrastructure; using Squidex.Infrastructure.Caching; +using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.Diagnostics; -using Squidex.Infrastructure.Json; using Squidex.Infrastructure.Translations; using Squidex.Infrastructure.UsageTracking; using Squidex.Shared.Users; @@ -32,19 +32,6 @@ namespace Squidex.Config.Domain { public static void AddMyInfrastructureServices(this IServiceCollection services, IConfiguration config) { - var deeplAuthKey = config.GetValue("translations:deeplAuthKey"); - - if (!string.IsNullOrWhiteSpace(deeplAuthKey)) - { - services.AddSingletonAs(c => new DeepLTranslator(deeplAuthKey, c.GetRequiredService())) - .As(); - } - else - { - services.AddSingletonAs() - .As(); - } - services.AddHealthChecks() .AddCheck("GC", tags: new[] { "node" }) .AddCheck("Orleans", tags: new[] { "cluster" }) @@ -59,6 +46,9 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .AsSelf(); + services.AddSingletonAs() + .As(); + services.AddSingletonAs(c => new CachingUsageTracker(c.GetRequiredService(), c.GetRequiredService())) .As(); diff --git a/src/Squidex/Config/Domain/LoggingServices.cs b/src/Squidex/Config/Domain/LoggingServices.cs index 5e18bd491..92885e424 100644 --- a/src/Squidex/Config/Domain/LoggingServices.cs +++ b/src/Squidex/Config/Domain/LoggingServices.cs @@ -9,6 +9,7 @@ using System; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Domain.Apps.Entities.Apps; +using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.Log; using Squidex.Pipeline; diff --git a/src/Squidex/Config/Domain/RuleServices.cs b/src/Squidex/Config/Domain/RuleServices.cs index 02f36ecc3..5bdc3f45d 100644 --- a/src/Squidex/Config/Domain/RuleServices.cs +++ b/src/Squidex/Config/Domain/RuleServices.cs @@ -13,6 +13,7 @@ using Squidex.Domain.Apps.Entities.Rules; using Squidex.Domain.Apps.Entities.Rules.UsageTracking; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Extensions.Actions; +using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.EventSourcing; namespace Squidex.Config.Domain @@ -45,7 +46,7 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .AsSelf(); - foreach (var actionHandler in RuleElementRegistry.ActionHandlers) + foreach (var actionHandler in RuleActionRegistry.ActionHandlers) { services.AddSingleton(typeof(IRuleActionHandler), actionHandler); } diff --git a/src/Squidex/Config/Domain/SerializationServices.cs b/src/Squidex/Config/Domain/SerializationServices.cs index 04646016c..4ef371ba4 100644 --- a/src/Squidex/Config/Domain/SerializationServices.cs +++ b/src/Squidex/Config/Domain/SerializationServices.cs @@ -16,7 +16,6 @@ using Squidex.Domain.Apps.Core.Rules.Json; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Schemas.Json; using Squidex.Domain.Apps.Events; -using Squidex.Extensions.Actions; using Squidex.Infrastructure; using Squidex.Infrastructure.Json; using Squidex.Infrastructure.Json.Newtonsoft; diff --git a/src/Squidex/Config/Domain/StoreServices.cs b/src/Squidex/Config/Domain/StoreServices.cs index 15a41a4d7..8d79f0ec5 100644 --- a/src/Squidex/Config/Domain/StoreServices.cs +++ b/src/Squidex/Config/Domain/StoreServices.cs @@ -27,6 +27,8 @@ using Squidex.Domain.Users; using Squidex.Domain.Users.MongoDb; using Squidex.Domain.Users.MongoDb.Infrastructure; using Squidex.Infrastructure; +using Squidex.Infrastructure.Configuration; +using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.Diagnostics; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Json; diff --git a/src/Squidex/Config/Domain/SubscriptionServices.cs b/src/Squidex/Config/Domain/SubscriptionServices.cs index 10437c2b7..f9d6ca1a1 100644 --- a/src/Squidex/Config/Domain/SubscriptionServices.cs +++ b/src/Squidex/Config/Domain/SubscriptionServices.cs @@ -12,6 +12,7 @@ using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Domain.Apps.Entities.Apps.Services.Implementations; using Squidex.Domain.Users; using Squidex.Infrastructure; +using Squidex.Infrastructure.DependencyInjection; namespace Squidex.Config.Domain { diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs index aed630ded..957a3cda5 100644 --- a/src/Squidex/Config/Orleans/OrleansServices.cs +++ b/src/Squidex/Config/Orleans/OrleansServices.cs @@ -15,6 +15,7 @@ using Orleans.Hosting; using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Rules; using Squidex.Domain.Apps.Entities.Rules.UsageTracking; +using Squidex.Infrastructure.Configuration; using Squidex.Infrastructure.EventSourcing.Grains; using Squidex.Infrastructure.Orleans; diff --git a/src/Squidex/Config/Web/WebServices.cs b/src/Squidex/Config/Web/WebServices.cs index 3de6a6f33..19c375aa0 100644 --- a/src/Squidex/Config/Web/WebServices.cs +++ b/src/Squidex/Config/Web/WebServices.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.DependencyInjection; using Squidex.Config.Domain; +using Squidex.Infrastructure.DependencyInjection; using Squidex.Pipeline; using Squidex.Pipeline.Robots; diff --git a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs new file mode 100644 index 000000000..94de2338e --- /dev/null +++ b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs @@ -0,0 +1,76 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Reflection; +using McMaster.NETCore.Plugins; +using Microsoft.AspNetCore.Mvc.ApplicationParts; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Squidex.Infrastructure.Plugins; + +namespace Squidex.Pipeline.Plugins +{ + public static class PluginExtensions + { + private static readonly Type[] SharedTypes = { typeof(IPlugin) }; + + public static void AddPlugins(IMvcBuilder mvcBuilder, IConfiguration configuration) + { + var options = configuration.Get(); + + if (options.Plugins != null) + { + var pluginManager = new PluginManager(); + + foreach (var pluginPath in options.Plugins) + { + PluginLoader plugin = null; + + if (pluginPath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) + { + plugin = PluginLoader.CreateFromAssemblyFile(pluginPath, SharedTypes); + } + else + { + plugin = PluginLoader.CreateFromConfigFile(pluginPath, SharedTypes); + } + + if (plugin != null) + { + var pluginAssembly = plugin.LoadDefaultAssembly(); + + AddParts(mvcBuilder, pluginAssembly); + + var relatedAssemblies = pluginAssembly.GetCustomAttributes(); + + foreach (var relatedAssembly in relatedAssemblies) + { + var assembly = plugin.LoadAssembly(relatedAssembly.AssemblyFileName); + + AddParts(mvcBuilder, assembly); + } + + pluginManager.Add(pluginAssembly); + } + } + + mvcBuilder.Services.AddSingleton(pluginManager); + } + } + + private static void AddParts(IMvcBuilder mvcBuilder, Assembly assembly) + { + var partFactory = ApplicationPartFactory.GetApplicationPartFactory(assembly); + + foreach (var part in partFactory.GetApplicationParts(assembly)) + { + mvcBuilder.PartManager.ApplicationParts.Add(part); + } + } + } +} diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index 93a7fd8f6..0cab6d9a6 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -68,6 +68,7 @@ + diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs index b68fffec1..61dd0a38d 100644 --- a/src/Squidex/WebStartup.cs +++ b/src/Squidex/WebStartup.cs @@ -29,6 +29,7 @@ using Squidex.Domain.Apps.Entities.Contents; using Squidex.Extensions.Actions.Twitter; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Diagnostics; +using Squidex.Infrastructure.Translations; using Squidex.Pipeline; using Squidex.Pipeline.Robots; @@ -72,6 +73,8 @@ namespace Squidex config.GetSection("contents")); services.Configure( config.GetSection("assets")); + services.Configure( + config.GetSection("translations:deepL")); services.Configure( config.GetSection("mode")); services.Configure( From 8ca8e0ae9ab8fa31f66e8f72acf59afea4132192 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Wed, 20 Feb 2019 17:19:19 +0100 Subject: [PATCH 02/55] Annotate field properties. --- .../Actions/Algolia/AlgoliaAction.cs | 6 +++ .../Actions/AzureQueue/AzureQueueAction.cs | 4 ++ .../Actions/Discourse/DiscourseAction.cs | 11 ++++- .../ElasticSearch/ElasticSearchAction.cs | 9 ++++ .../Actions/Email/EmailAction.cs | 13 +++++ .../Actions/Fastly/FastlyAction.cs | 2 + .../Actions/Medium/MediumAction.cs | 10 ++++ .../Actions/Prerender/PrerenderAction.cs | 3 ++ .../Actions/Slack/SlackAction.cs | 4 ++ .../Actions/Twitter/TweetAction.cs | 3 ++ .../Actions/Webhook/WebhookAction.cs | 5 +- .../Squidex.Extensions/SquidexExtensions.cs | 16 ++++++ src/Squidex/Config/Web/WebServices.cs | 8 ++- .../Pipeline/Plugins/PluginExtensions.cs | 22 +++++++-- src/Squidex/WebStartup.cs | 5 +- .../pages/rules/rule-element.component.html | 12 ++++- .../pages/rules/rule-element.component.scss | 9 ++++ .../rules/pages/rules/rules-page.component.ts | 8 +-- .../app/shared/services/rules.service.spec.ts | 41 +--------------- .../app/shared/services/rules.service.ts | 49 +++++++++++-------- 20 files changed, 162 insertions(+), 78 deletions(-) create mode 100644 extensions/Squidex.Extensions/SquidexExtensions.cs diff --git a/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaAction.cs b/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaAction.cs index cef0f0aba..c6952b152 100644 --- a/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaAction.cs +++ b/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaAction.cs @@ -22,14 +22,20 @@ namespace Squidex.Extensions.Actions.Algolia { [Required] [Display(Name = "Application Id", Description = "The application ID.")] + [DataType(DataType.Text)] + [Formattable] public string AppId { get; set; } [Required] [Display(Name = "Api Key", Description = "The API key to grant access to Squidex.")] + [DataType(DataType.Text)] + [Formattable] public string ApiKey { get; set; } [Required] [Display(Name = "Index Name", Description = "The name of the index.")] + [DataType(DataType.Text)] + [Formattable] public string IndexName { get; set; } } } diff --git a/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs index 2acc7ec7c..45f176d9f 100644 --- a/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs +++ b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs @@ -25,10 +25,14 @@ namespace Squidex.Extensions.Actions.AzureQueue { [Required] [Display(Name = "Connection String", Description = "The connection string to the storage account.")] + [DataType(DataType.Text)] + [Formattable] public string ConnectionString { get; set; } [Required] [Display(Name = "Queue", Description = "The name of the queue.")] + [DataType(DataType.Text)] + [Formattable] public string Queue { get; set; } protected override IEnumerable CustomValidate() diff --git a/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs b/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs index a73f1f493..97f6b6538 100644 --- a/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs +++ b/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs @@ -24,28 +24,37 @@ namespace Squidex.Extensions.Actions.Discourse { [AbsoluteUrl] [Required] - [Display(Name = "Url", Description = "he url to the discourse server.")] + [Display(Name = "Url", Description = "The url to the discourse server.")] + [DataType(DataType.Url)] public Uri Url { get; set; } [Required] [Display(Name = "Api Key", Description = "The api key to authenticate to your discourse server.")] + [DataType(DataType.Text)] public string ApiKey { get; set; } [Required] [Display(Name = "Api Username", Description = "The api username to authenticate to your discourse server.")] + [DataType(DataType.Text)] public string ApiUsername { get; set; } [Required] [Display(Name = "Text", Description = "The text as markdown.")] + [DataType(DataType.MultilineText)] + [Formattable] public string Text { get; set; } [Display(Name = "Title", Description = "The optional title when creating new topics.")] + [DataType(DataType.Text)] + [Formattable] public string Title { get; set; } [Display(Name = "Topic", Description = "The optional topic id.")] + [DataType(DataType.Custom)] public int? Topic { get; set; } [Display(Name = "Category", Description = "The optional category id.")] + [DataType(DataType.Custom)] public int? Category { get; set; } } } diff --git a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs index 2bf262e82..44f0ce8c2 100644 --- a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs +++ b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs @@ -25,20 +25,29 @@ namespace Squidex.Extensions.Actions.ElasticSearch [AbsoluteUrl] [Required] [Display(Name = "Host", Description = "The hostname of the elastic search instance or cluster.")] + [DataType(DataType.Url)] public Uri Host { get; set; } [Required] [Display(Name = "Index Name", Description = "The name of the index.")] + [DataType(DataType.Text)] + [Formattable] public string IndexName { get; set; } [Required] [Display(Name = "Index Type", Description = "The name of the index type.")] + [DataType(DataType.Text)] + [Formattable] public string IndexType { get; set; } [Display(Name = "Username", Description = "The optional username.")] + [DataType(DataType.Text)] + [Formattable] public string Username { get; set; } [Display(Name = "Password", Description = "The optional password.")] + [DataType(DataType.Password)] + [Formattable] public string Password { get; set; } } } diff --git a/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs b/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs index 067e5fbce..be24d3166 100644 --- a/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs +++ b/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs @@ -22,38 +22,51 @@ namespace Squidex.Extensions.Actions.Email { [Required] [Display(Name = "ServerHost", Description = "The IP address or host to the SMTP server.")] + [DataType(DataType.Text)] public string ServerHost { get; set; } [Required] [Display(Name = "ServerPort", Description = "The port to the SMTP server.")] + [DataType(DataType.Custom)] public int ServerPort { get; set; } [Required] [Display(Name = "ServerUseSsl", Description = "Specify whether the SMPT client uses Secure Sockets Layer (SSL) to encrypt the connection.")] + [DataType(DataType.Custom)] public bool ServerUseSsl { get; set; } [Required] [Display(Name = "ServerUsername", Description = "The username for the SMTP server.")] + [DataType(DataType.Text)] public string ServerUsername { get; set; } [Required] [Display(Name = "ServerPassword", Description = "The password for the SMTP server.")] + [DataType(DataType.Password)] public string ServerPassword { get; set; } [Required] [Display(Name = "MessageFrom", Description = "The email sending address.")] + [DataType(DataType.Text)] + [Formattable] public string MessageFrom { get; set; } [Required] [Display(Name = "MessageTo", Description = "The email message will be sent to.")] + [DataType(DataType.Text)] + [Formattable] public string MessageTo { get; set; } [Required] [Display(Name = "MessageSubject", Description = "The subject line for this email message.")] + [DataType(DataType.Text)] + [Formattable] public string MessageSubject { get; set; } [Required] [Display(Name = "MessageBody", Description = "The message body.")] + [DataType(DataType.MultilineText)] + [Formattable] public string MessageBody { get; set; } } } diff --git a/extensions/Squidex.Extensions/Actions/Fastly/FastlyAction.cs b/extensions/Squidex.Extensions/Actions/Fastly/FastlyAction.cs index d1840782d..e4e056ba7 100644 --- a/extensions/Squidex.Extensions/Actions/Fastly/FastlyAction.cs +++ b/extensions/Squidex.Extensions/Actions/Fastly/FastlyAction.cs @@ -22,10 +22,12 @@ namespace Squidex.Extensions.Actions.Fastly { [Required] [Display(Name = "Api Key", Description = "The API key to grant access to Squidex.")] + [DataType(DataType.Text)] public string ApiKey { get; set; } [Required] [Display(Name = "Service Id", Description = "The ID of the fastly service.")] + [DataType(DataType.Text)] public string ServiceId { get; set; } } } diff --git a/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs b/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs index 6bbf1bb30..65eddcefd 100644 --- a/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs +++ b/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs @@ -22,26 +22,36 @@ namespace Squidex.Extensions.Actions.Medium { [Required] [Display(Name = "Access Token", Description = "The self issued access token.")] + [DataType(DataType.Text)] public string AccessToken { get; set; } [Required] [Display(Name = "Title", Description = "The title, used for the url.")] + [DataType(DataType.Text)] + [Formattable] public string Title { get; set; } [Required] [Display(Name = "Content", Description = "The content, either html or markdown.")] + [DataType(DataType.MultilineText)] + [Formattable] public string Content { get; set; } [Display(Name = "Canonical Url", Description = "The original home of this content, if it was originally published elsewhere.")] + [DataType(DataType.Text)] + [Formattable] public string CanonicalUrl { get; set; } [Display(Name = "PublicationId", Description = "Optional publication id.")] + [DataType(DataType.Text)] public string PublicationId { get; set; } [Display(Name = "Tags", Description = "The optional comma separated list of tags.")] + [DataType(DataType.Text)] public string Tags { get; set; } [Display(Name = "Is Html", Description = "Indicates whether the content is markdown or html.")] + [DataType(DataType.Custom)] public bool IsHtml { get; set; } } } diff --git a/extensions/Squidex.Extensions/Actions/Prerender/PrerenderAction.cs b/extensions/Squidex.Extensions/Actions/Prerender/PrerenderAction.cs index 4672a8d61..0978a79a4 100644 --- a/extensions/Squidex.Extensions/Actions/Prerender/PrerenderAction.cs +++ b/extensions/Squidex.Extensions/Actions/Prerender/PrerenderAction.cs @@ -22,10 +22,13 @@ namespace Squidex.Extensions.Actions.Prerender { [Required] [Display(Name = "Token", Description = "The prerender token from your account.")] + [DataType(DataType.Text)] + [Formattable] public string Token { get; set; } [Required] [Display(Name = "Url", Description = "The url to recache.")] + [DataType(DataType.Text)] public string Url { get; set; } } } diff --git a/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs b/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs index 4e2863f8a..e85c19f32 100644 --- a/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs +++ b/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs @@ -25,10 +25,14 @@ namespace Squidex.Extensions.Actions.Slack [AbsoluteUrl] [Required] [Display(Name = "Webhook Url", Description = "The slack webhook url.")] + [DataType(DataType.Text)] + [Formattable] public Uri WebhookUrl { get; set; } [Required] [Display(Name = "Text", Description = "The text that is sent as message to slack.")] + [DataType(DataType.MultilineText)] + [Formattable] public string Text { get; set; } } } diff --git a/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs b/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs index cc0fa3d17..c23b3dd98 100644 --- a/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs +++ b/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs @@ -22,14 +22,17 @@ namespace Squidex.Extensions.Actions.Twitter { [Required] [Display(Name = "Access Token", Description = " The generated access token.")] + [DataType(DataType.Text)] public string AccessToken { get; set; } [Required] [Display(Name = "Access Secret", Description = " The generated access secret.")] + [DataType(DataType.Text)] public string AccessSecret { get; set; } [Required] [Display(Name = "Text", Description = "The text that is sent as tweet to twitter.")] + [DataType(DataType.MultilineText)] public string Text { get; set; } } } diff --git a/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs b/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs index 0877c37c9..cdd50c429 100644 --- a/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs +++ b/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs @@ -24,10 +24,13 @@ namespace Squidex.Extensions.Actions.Webhook { [AbsoluteUrl] [Required] - [Display(Name = "Url", Description = "he url to the webhook.")] + [Display(Name = "Url", Description = "The url to the webhook.")] + [DataType(DataType.Text)] + [Formattable] public Uri Url { get; set; } [Display(Name = "Shared Secret", Description = "The shared secret that is used to calculate the signature.")] + [DataType(DataType.Text)] public string SharedSecret { get; set; } } } diff --git a/extensions/Squidex.Extensions/SquidexExtensions.cs b/extensions/Squidex.Extensions/SquidexExtensions.cs new file mode 100644 index 000000000..9803ae4ce --- /dev/null +++ b/extensions/Squidex.Extensions/SquidexExtensions.cs @@ -0,0 +1,16 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Reflection; + +namespace Squidex.Extensions +{ + public static class SquidexExtensions + { + public static readonly Assembly Assembly = typeof(SquidexExtensions).Assembly; + } +} diff --git a/src/Squidex/Config/Web/WebServices.cs b/src/Squidex/Config/Web/WebServices.cs index 19c375aa0..315f01547 100644 --- a/src/Squidex/Config/Web/WebServices.cs +++ b/src/Squidex/Config/Web/WebServices.cs @@ -6,17 +6,19 @@ // ========================================================================== using Microsoft.AspNetCore.Authentication; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Config.Domain; using Squidex.Infrastructure.DependencyInjection; using Squidex.Pipeline; +using Squidex.Pipeline.Plugins; using Squidex.Pipeline.Robots; namespace Squidex.Config.Web { public static class WebServices { - public static void AddMyMvc(this IServiceCollection services) + public static void AddMyMvc(this IServiceCollection services, IConfiguration config) { services.AddSingletonAs() .AsSelf(); @@ -47,7 +49,9 @@ namespace Squidex.Config.Web options.Filters.Add(); options.Filters.Add(); options.Filters.Add(); - }).AddMySerializers(); + }) + .AddMySerializers() + .AddMyPlugins(config); services.AddCors(); services.AddRouting(); diff --git a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs index 94de2338e..f2397b7ed 100644 --- a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs +++ b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs @@ -8,9 +8,11 @@ using System; using System.Reflection; using McMaster.NETCore.Plugins; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Mvc.ApplicationParts; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Squidex.Extensions; using Squidex.Infrastructure.Plugins; namespace Squidex.Pipeline.Plugins @@ -19,14 +21,14 @@ namespace Squidex.Pipeline.Plugins { private static readonly Type[] SharedTypes = { typeof(IPlugin) }; - public static void AddPlugins(IMvcBuilder mvcBuilder, IConfiguration configuration) + public static void AddMyPlugins(this IMvcBuilder mvcBuilder, IConfiguration configuration) { + var pluginManager = new PluginManager(); + var options = configuration.Get(); if (options.Plugins != null) { - var pluginManager = new PluginManager(); - foreach (var pluginPath in options.Plugins) { PluginLoader plugin = null; @@ -58,9 +60,19 @@ namespace Squidex.Pipeline.Plugins pluginManager.Add(pluginAssembly); } } - - mvcBuilder.Services.AddSingleton(pluginManager); } + + pluginManager.Add(SquidexExtensions.Assembly); + pluginManager.ConfigureServices(mvcBuilder.Services, configuration); + + mvcBuilder.Services.AddSingleton(pluginManager); + } + + public static void UsePlugins(this IApplicationBuilder app) + { + var pluginManager = app.ApplicationServices.GetRequiredService(); + + pluginManager.Configure(app); } private static void AddParts(IMvcBuilder mvcBuilder, Assembly assembly) diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs index 61dd0a38d..486c5ea25 100644 --- a/src/Squidex/WebStartup.cs +++ b/src/Squidex/WebStartup.cs @@ -31,6 +31,7 @@ using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Diagnostics; using Squidex.Infrastructure.Translations; using Squidex.Pipeline; +using Squidex.Pipeline.Plugins; using Squidex.Pipeline.Robots; namespace Squidex @@ -62,7 +63,7 @@ namespace Squidex services.AddMyInfrastructureServices(config); services.AddMyLoggingServices(config); services.AddMyMigrationServices(); - services.AddMyMvc(); + services.AddMyMvc(config); services.AddMyRuleServices(); services.AddMySerializers(); services.AddMyStoreServices(config); @@ -124,6 +125,8 @@ namespace Squidex app.ConfigureOrleansDashboard(); app.ConfigureIdentityServer(); app.ConfigureFrontend(); + + app.UsePlugins(); } } } diff --git a/src/Squidex/app/features/rules/pages/rules/rule-element.component.html b/src/Squidex/app/features/rules/pages/rules/rule-element.component.html index 6ad970abc..977302dab 100644 --- a/src/Squidex/app/features/rules/pages/rules/rule-element.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rule-element.component.html @@ -1,7 +1,11 @@
- + + + + +
@@ -14,7 +18,11 @@
-
+ + + + +
diff --git a/src/Squidex/app/features/rules/pages/rules/rule-element.component.scss b/src/Squidex/app/features/rules/pages/rules/rule-element.component.scss index fca4de50b..b22df1cd7 100644 --- a/src/Squidex/app/features/rules/pages/rules/rule-element.component.scss +++ b/src/Squidex/app/features/rules/pages/rules/rule-element.component.scss @@ -27,6 +27,10 @@ height: 3rem; } + .icon { + font-size: 20px; + } + .svg-icon { width: 20px; } @@ -56,6 +60,7 @@ } &-icon { + color: $color-dark-foreground; display: inline-block; margin-right: .5rem; position: relative; @@ -63,6 +68,10 @@ line-height: 1px; } + .icon { + font-size: 30px; + } + .svg-icon { width: 30px; } diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts b/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts index 849f26c94..3c21249db 100644 --- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts +++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts @@ -9,6 +9,7 @@ import { Component, OnInit } from '@angular/core'; import { onErrorResumeNext } from 'rxjs/operators'; import { + ALL_TRIGGERS, AppsState, DialogModel, RuleDto, @@ -30,7 +31,7 @@ export class RulesPageComponent implements OnInit { public wizardRule: RuleDto | null; public ruleActions: { [name: string]: RuleElementDto }; - public ruleTriggers: { [name: string]: RuleElementDto }; + public ruleTriggers = ALL_TRIGGERS; constructor( public readonly appsState: AppsState, @@ -48,11 +49,6 @@ export class RulesPageComponent implements OnInit { this.ruleActions = actions; }); - this.rulesService.getTriggers() - .subscribe(triggers => { - this.ruleTriggers = triggers; - }); - this.schemasState.load().pipe(onErrorResumeNext()).subscribe(); } diff --git a/src/Squidex/app/shared/services/rules.service.spec.ts b/src/Squidex/app/shared/services/rules.service.spec.ts index f765ab29d..c5d6fe99b 100644 --- a/src/Squidex/app/shared/services/rules.service.spec.ts +++ b/src/Squidex/app/shared/services/rules.service.spec.ts @@ -77,45 +77,8 @@ describe('RulesService', () => { }); expect(actions!).toEqual({ - 'action1': new RuleElementDto('display1', 'description1', '#111', '', 'link1'), - 'action2': new RuleElementDto('display2', 'description2', '#222', '', 'link2') - }); - })); - - it('should make get request to get triggers', - inject([RulesService, HttpTestingController], (rulesService: RulesService, httpMock: HttpTestingController) => { - - let triggers: { [ name: string ]: RuleElementDto }; - - rulesService.getTriggers().subscribe(result => { - triggers = result; - }); - - const req = httpMock.expectOne('http://service/p/api/rules/triggers'); - - expect(req.request.method).toEqual('GET'); - expect(req.request.headers.get('If-Match')).toBeNull(); - - req.flush({ - 'trigger2': { - display: 'display2', - description: 'description2', - iconColor: '#222', - iconImage: '', - readMore: 'link2' - }, - 'trigger1': { - display: 'display1', - description: 'description1', - iconColor: '#111', - iconImage: '', - readMore: 'link1' - } - }); - - expect(triggers!).toEqual({ - 'trigger1': new RuleElementDto('display1', 'description1', '#111', '', 'link1'), - 'trigger2': new RuleElementDto('display2', 'description2', '#222', '', 'link2') + 'action1': new RuleElementDto('display1', 'description1', '#111', '', null, 'link1'), + 'action2': new RuleElementDto('display2', 'description2', '#222', '', null, 'link2') }); })); diff --git a/src/Squidex/app/shared/services/rules.service.ts b/src/Squidex/app/shared/services/rules.service.ts index 6f395ef87..cb2eae816 100644 --- a/src/Squidex/app/shared/services/rules.service.ts +++ b/src/Squidex/app/shared/services/rules.service.ts @@ -21,12 +21,39 @@ import { Versioned } from '@app/framework'; +export const ALL_TRIGGERS = { + 'ContentChanged': { + description: 'For content changes like created, updated, published, unpublished...', + display: 'Content changed', + iconColor: '#3389ff', + iconCode: 'contents' + }, + 'AssetChanged': { + description: 'For asset changes like uploaded, updated (reuploaded), renamed, deleted...', + display: 'Asset changed', + iconColor: '#3389ff', + iconCode: 'assets' + }, + 'SchemaChanged': { + description: 'When a schema definition has been created, updated, published or deleted...', + display: 'Schema changed', + iconColor: '#3389ff', + iconCode: 'schemas'}, + 'Usage': { + description: 'When monthly API calls exceed a specified limit for one time a month...', + display: 'Usage exceeded', + iconColor: '#3389ff', + iconCode: 'dashboard' + } +}; + export class RuleElementDto { constructor( public readonly display: string, public readonly description: string, public readonly iconColor: string, public readonly iconImage: string, + public readonly iconCode: string | null, public readonly readMore: string ) { } @@ -120,27 +147,7 @@ export class RulesService { for (let key of Object.keys(items).sort()) { const value = items[key]; - result[key] = new RuleElementDto(value.display, value.description, value.iconColor, value.iconImage, value.readMore); - } - - return result; - }), - pretifyError('Failed to load Rules. Please reload.')); - } - - public getTriggers(): Observable<{ [name: string]: RuleElementDto }> { - const url = this.apiUrl.buildUrl('api/rules/triggers'); - - return HTTP.getVersioned(this.http, url).pipe( - map(response => { - const items: { [name: string]: any } = response.payload.body; - - const result: { [name: string]: RuleElementDto } = {}; - - for (let key of Object.keys(items).sort()) { - const value = items[key]; - - result[key] = new RuleElementDto(value.display, value.description, value.iconColor, value.iconImage, value.readMore); + result[key] = new RuleElementDto(value.display, value.description, value.iconColor, value.iconImage, null, value.readMore); } return result; From 82213d5871feeca8c66fc2e6fee76e0022bb6811 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Wed, 20 Feb 2019 18:53:04 +0100 Subject: [PATCH 03/55] Plugin system for rule actions. --- .../ElasticSearch/ElasticSearchAction.cs | 4 +- .../Actions/Slack/SlackAction.cs | 1 - .../HandleRules/RuleActionDefinition.cs | 3 + .../HandleRules/RuleActionProperty.cs | 24 +++ .../HandleRules/RuleActionPropertyEditor.cs | 20 +++ .../HandleRules/RuleActionRegistry.cs | 77 +++++++- src/Squidex.Infrastructure/Plugins/IPlugin.cs | 1 - .../Rules/Models/RuleActionConverter.cs | 1 - .../Rules/Models/RuleActionProcessor.cs | 1 - .../Rules/Models/RuleElementDto.cs | 18 ++ .../Rules/Models/RuleElementPropertyDto.cs | 48 +++++ .../Api/Controllers/Rules/RulesController.cs | 4 +- src/Squidex/Config/Domain/RuleServices.cs | 1 - .../app/features/rules/declarations.ts | 12 +- src/Squidex/app/features/rules/module.ts | 28 +-- .../actions/algolia-action.component.html | 43 ----- .../actions/algolia-action.component.scss | 2 - .../rules/actions/algolia-action.component.ts | 42 ----- .../actions/azure-queue-action.component.html | 29 --- .../actions/azure-queue-action.component.scss | 2 - .../actions/azure-queue-action.component.ts | 40 ----- .../actions/discourse-action.component.html | 99 ----------- .../actions/discourse-action.component.scss | 6 - .../actions/discourse-action.component.ts | 56 ------ .../elastic-search-action.component.html | 71 -------- .../elastic-search-action.component.scss | 2 - .../elastic-search-action.component.ts | 46 ----- .../rules/actions/email-action.component.html | 128 -------------- .../rules/actions/email-action.component.scss | 6 - .../rules/actions/email-action.component.ts | 70 -------- .../actions/fastly-action.component.html | 29 --- .../actions/fastly-action.component.scss | 2 - .../rules/actions/fastly-action.component.ts | 37 ---- .../actions/generic-action.component.html | 34 ++++ .../actions/generic-action.component.scss | 6 + .../rules/actions/generic-action.component.ts | 44 +++++ .../actions/medium-action.component.html | 96 ---------- .../actions/medium-action.component.scss | 6 - .../rules/actions/medium-action.component.ts | 54 ------ .../actions/prerender-action.component.html | 29 --- .../actions/prerender-action.component.scss | 2 - .../actions/prerender-action.component.ts | 37 ---- .../rules/actions/slack-action.component.html | 29 --- .../rules/actions/slack-action.component.scss | 6 - .../rules/actions/slack-action.component.ts | 37 ---- .../rules/actions/tweet-action.component.html | 55 ------ .../rules/actions/tweet-action.component.scss | 6 - .../rules/actions/tweet-action.component.ts | 98 ----------- .../actions/webhook-action.component.html | 29 --- .../actions/webhook-action.component.scss | 2 - .../rules/actions/webhook-action.component.ts | 35 ---- .../pages/rules/rule-element.component.html | 10 +- .../pages/rules/rule-element.component.scss | 9 +- .../pages/rules/rule-wizard.component.html | 85 +-------- .../app/shared/services/rules.service.spec.ts | 32 +++- .../app/shared/services/rules.service.ts | 33 +++- .../HandleRules/RuleElementRegistry.cs | 166 ++++++++++++++++++ 57 files changed, 519 insertions(+), 1374 deletions(-) create mode 100644 src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionProperty.cs create mode 100644 src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionPropertyEditor.cs create mode 100644 src/Squidex/Areas/Api/Controllers/Rules/Models/RuleElementPropertyDto.cs delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/algolia-action.component.html delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/algolia-action.component.scss delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/algolia-action.component.ts delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.html delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.scss delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.ts delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/discourse-action.component.html delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/discourse-action.component.scss delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/discourse-action.component.ts delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/elastic-search-action.component.html delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/elastic-search-action.component.scss delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/elastic-search-action.component.ts delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/email-action.component.html delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/email-action.component.scss delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/email-action.component.ts delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/fastly-action.component.html delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/fastly-action.component.scss delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/fastly-action.component.ts create mode 100644 src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.html create mode 100644 src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.scss create mode 100644 src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.ts delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/medium-action.component.html delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/medium-action.component.scss delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/medium-action.component.ts delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/prerender-action.component.html delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/prerender-action.component.scss delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/prerender-action.component.ts delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/slack-action.component.html delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/slack-action.component.scss delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/slack-action.component.ts delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.html delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.scss delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.ts delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/webhook-action.component.html delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/webhook-action.component.scss delete mode 100644 src/Squidex/app/features/rules/pages/rules/actions/webhook-action.component.ts create mode 100644 tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleElementRegistry.cs diff --git a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs index 44f0ce8c2..00b4a74db 100644 --- a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs +++ b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs @@ -42,12 +42,10 @@ namespace Squidex.Extensions.Actions.ElasticSearch [Display(Name = "Username", Description = "The optional username.")] [DataType(DataType.Text)] - [Formattable] public string Username { get; set; } [Display(Name = "Password", Description = "The optional password.")] - [DataType(DataType.Password)] - [Formattable] + [DataType(DataType.Text)] public string Password { get; set; } } } diff --git a/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs b/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs index e85c19f32..47e1dddc7 100644 --- a/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs +++ b/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs @@ -26,7 +26,6 @@ namespace Squidex.Extensions.Actions.Slack [Required] [Display(Name = "Webhook Url", Description = "The slack webhook url.")] [DataType(DataType.Text)] - [Formattable] public Uri WebhookUrl { get; set; } [Required] diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionDefinition.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionDefinition.cs index 595f6d56b..97a9110d1 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionDefinition.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionDefinition.cs @@ -6,6 +6,7 @@ // ========================================================================== using System; +using System.Collections.Generic; namespace Squidex.Domain.Apps.Core.HandleRules { @@ -22,5 +23,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules public string Display { get; set; } public string Description { get; set; } + + public List Properties { get; } = new List(); } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionProperty.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionProperty.cs new file mode 100644 index 000000000..1611e76ea --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionProperty.cs @@ -0,0 +1,24 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Domain.Apps.Core.HandleRules +{ + public sealed class RuleActionProperty + { + public RuleActionPropertyEditor Editor { get; set; } + + public string Name { get; set; } + + public string Display { get; set; } + + public string Description { get; set; } + + public bool IsFormattable { get; set; } + + public bool IsRequired { get; set; } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionPropertyEditor.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionPropertyEditor.cs new file mode 100644 index 000000000..469e01a35 --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionPropertyEditor.cs @@ -0,0 +1,20 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Domain.Apps.Core.HandleRules +{ + public enum RuleActionPropertyEditor + { + Checkbox, + Email, + Number, + Password, + Text, + TextArea, + Url + } +} diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistry.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistry.cs index a17a58872..c1eebfb1e 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistry.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistry.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Reflection; using Squidex.Domain.Apps.Core.Rules; @@ -17,7 +18,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules public static class RuleActionRegistry { private const string ActionSuffix = "Action"; - private const string ActionSuffixV2 = "Action"; + private const string ActionSuffixV2 = "ActionV2"; private static readonly HashSet ActionHandlerTypes = new HashSet(); private static readonly Dictionary ActionTypes = new Dictionary(); @@ -70,7 +71,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules var name = GetActionName(actionType); - ActionTypes[name] = + var definition = new RuleActionDefinition { Type = actionType, @@ -81,9 +82,81 @@ namespace Squidex.Domain.Apps.Core.HandleRules ReadMore = metadata.ReadMore }; + foreach (var property in actionType.GetProperties()) + { + if (property.CanRead && property.CanWrite) + { + var actionProperty = new RuleActionProperty { Name = property.Name.ToCamelCase(), Display = property.Name }; + + var display = property.GetCustomAttribute(); + + if (!string.IsNullOrWhiteSpace(display?.Name)) + { + actionProperty.Display = display.Name; + } + + if (!string.IsNullOrWhiteSpace(display?.Description)) + { + actionProperty.Description = display.Description; + } + + var type = property.PropertyType; + + if ((property.GetCustomAttribute() != null || (type.IsValueType && !IsNullable(type))) && type != typeof(bool) && type != typeof(bool?)) + { + actionProperty.IsRequired = true; + } + + if (property.GetCustomAttribute() != null) + { + actionProperty.IsFormattable = true; + } + + var dataType = property.GetCustomAttribute()?.DataType; + + if (type == typeof(bool) || type == typeof(bool?)) + { + actionProperty.Editor = RuleActionPropertyEditor.Checkbox; + } + else if (type == typeof(int) || type == typeof(int?)) + { + actionProperty.Editor = RuleActionPropertyEditor.Number; + } + else if (dataType == DataType.Url) + { + actionProperty.Editor = RuleActionPropertyEditor.Url; + } + else if (dataType == DataType.Password) + { + actionProperty.Editor = RuleActionPropertyEditor.Password; + } + else if (dataType == DataType.EmailAddress) + { + actionProperty.Editor = RuleActionPropertyEditor.Email; + } + else if (dataType == DataType.MultilineText) + { + actionProperty.Editor = RuleActionPropertyEditor.TextArea; + } + else + { + actionProperty.Editor = RuleActionPropertyEditor.Text; + } + + definition.Properties.Add(actionProperty); + } + } + + ActionTypes[name] = definition; + ActionHandlerTypes.Add(actionType.GetCustomAttribute().HandlerType); } + private static bool IsNullable(Type type) + { + return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>); + } + public static TypeNameRegistry MapRuleActions(this TypeNameRegistry typeNameRegistry) { foreach (var actionType in ActionTypes.Values) diff --git a/src/Squidex.Infrastructure/Plugins/IPlugin.cs b/src/Squidex.Infrastructure/Plugins/IPlugin.cs index 72ed11047..2c8fc4674 100644 --- a/src/Squidex.Infrastructure/Plugins/IPlugin.cs +++ b/src/Squidex.Infrastructure/Plugins/IPlugin.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs index fe5666dad..b36243b4f 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs @@ -10,7 +10,6 @@ using System.Collections.Generic; using System.Linq; using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; -using Squidex.Extensions.Actions; namespace Squidex.Areas.Api.Controllers.Rules.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs index 2ea9995b8..b2abd5b91 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs @@ -13,7 +13,6 @@ using NSwag.SwaggerGeneration.Processors; using NSwag.SwaggerGeneration.Processors.Contexts; using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; -using Squidex.Extensions.Actions; namespace Squidex.Areas.Api.Controllers.Rules.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleElementDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleElementDto.cs index e419be526..910e87c38 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleElementDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleElementDto.cs @@ -6,6 +6,9 @@ // ========================================================================== using System.ComponentModel.DataAnnotations; +using System.Linq; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Infrastructure.Reflection; namespace Squidex.Areas.Api.Controllers.Rules.Models { @@ -37,5 +40,20 @@ namespace Squidex.Areas.Api.Controllers.Rules.Models /// The optional link to the product that is integrated. /// public string ReadMore { get; set; } + + /// + /// The properties. + /// + [Required] + public RuleElementPropertyDto[] Properties { get; set; } + + public static RuleElementDto FromDefinition(RuleActionDefinition definition) + { + var result = SimpleMapper.Map(definition, new RuleElementDto()); + + result.Properties = definition.Properties.Select(x => SimpleMapper.Map(x, new RuleElementPropertyDto())).ToArray(); + + return result; + } } } diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleElementPropertyDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleElementPropertyDto.cs new file mode 100644 index 000000000..81170e36f --- /dev/null +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleElementPropertyDto.cs @@ -0,0 +1,48 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.ComponentModel.DataAnnotations; +using Squidex.Domain.Apps.Core.HandleRules; + +namespace Squidex.Areas.Api.Controllers.Rules.Models +{ + public sealed class RuleElementPropertyDto + { + /// + /// The html editor. + /// + [Required] + public RuleActionPropertyEditor Editor { get; set; } + + /// + /// The name of the editor. + /// + [Required] + public string Name { get; set; } + + /// + /// The label to use. + /// + [Required] + public string Display { get; set; } + + /// + /// The optional description. + /// + public string Description { get; set; } + + /// + /// Indicates if the property is formattable. + /// + public bool IsFormattable { get; set; } + + /// + /// Indicates if the property is required. + /// + public bool IsRequired { get; set; } + } +} diff --git a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs index 752b4e041..d3d7edd1b 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs @@ -17,10 +17,8 @@ using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Entities; using Squidex.Domain.Apps.Entities.Rules.Commands; using Squidex.Domain.Apps.Entities.Rules.Repositories; -using Squidex.Extensions.Actions; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Infrastructure.Reflection; using Squidex.Pipeline; using Squidex.Shared; @@ -58,7 +56,7 @@ namespace Squidex.Areas.Api.Controllers.Rules [ApiCosts(0)] public IActionResult GetActions() { - var response = RuleActionRegistry.Actions.ToDictionary(x => x.Key, x => SimpleMapper.Map(x.Value, new RuleElementDto())); + var response = RuleActionRegistry.Actions.ToDictionary(x => x.Key, x => RuleElementDto.FromDefinition(x.Value)); Response.Headers[HeaderNames.ETag] = RuleActionsEtag; diff --git a/src/Squidex/Config/Domain/RuleServices.cs b/src/Squidex/Config/Domain/RuleServices.cs index 5bdc3f45d..685bc2077 100644 --- a/src/Squidex/Config/Domain/RuleServices.cs +++ b/src/Squidex/Config/Domain/RuleServices.cs @@ -12,7 +12,6 @@ using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Rules; using Squidex.Domain.Apps.Entities.Rules.UsageTracking; using Squidex.Domain.Apps.Entities.Schemas; -using Squidex.Extensions.Actions; using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.EventSourcing; diff --git a/src/Squidex/app/features/rules/declarations.ts b/src/Squidex/app/features/rules/declarations.ts index 6b65eccfb..e8d6e49d0 100644 --- a/src/Squidex/app/features/rules/declarations.ts +++ b/src/Squidex/app/features/rules/declarations.ts @@ -5,17 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -export * from './pages/rules/actions/algolia-action.component'; -export * from './pages/rules/actions/azure-queue-action.component'; -export * from './pages/rules/actions/discourse-action.component'; -export * from './pages/rules/actions/elastic-search-action.component'; -export * from './pages/rules/actions/email-action.component'; -export * from './pages/rules/actions/fastly-action.component'; -export * from './pages/rules/actions/medium-action.component'; -export * from './pages/rules/actions/prerender-action.component'; -export * from './pages/rules/actions/slack-action.component'; -export * from './pages/rules/actions/tweet-action.component'; -export * from './pages/rules/actions/webhook-action.component'; +export * from './pages/rules/actions/generic-action.component'; export * from './pages/rules/triggers/asset-changed-trigger.component'; export * from './pages/rules/triggers/content-changed-trigger.component'; diff --git a/src/Squidex/app/features/rules/module.ts b/src/Squidex/app/features/rules/module.ts index 95551399c..7ee3218b3 100644 --- a/src/Squidex/app/features/rules/module.ts +++ b/src/Squidex/app/features/rules/module.ts @@ -15,26 +15,16 @@ import { } from '@app/shared'; import { - AlgoliaActionComponent, AssetChangedTriggerComponent, - AzureQueueActionComponent, ContentChangedTriggerComponent, - DiscourseActionComponent, - ElasticSearchActionComponent, - EmailActionComponent, - FastlyActionComponent, - MediumActionComponent, - PrerenderActionComponent, + GenericActionComponent, RuleElementComponent, RuleEventBadgeClassPipe, RuleEventsPageComponent, RulesPageComponent, RuleWizardComponent, SchemaChangedTriggerComponent, - SlackActionComponent, - TweetActionComponent, - UsageTriggerComponent, - WebhookActionComponent + UsageTriggerComponent } from './declarations'; const routes: Routes = [ @@ -64,26 +54,16 @@ const routes: Routes = [ RouterModule.forChild(routes) ], declarations: [ - AlgoliaActionComponent, AssetChangedTriggerComponent, - AzureQueueActionComponent, ContentChangedTriggerComponent, - DiscourseActionComponent, - EmailActionComponent, - ElasticSearchActionComponent, - FastlyActionComponent, - MediumActionComponent, - PrerenderActionComponent, + GenericActionComponent, RuleElementComponent, RuleEventBadgeClassPipe, RuleEventsPageComponent, RulesPageComponent, RuleWizardComponent, SchemaChangedTriggerComponent, - SlackActionComponent, - TweetActionComponent, - UsageTriggerComponent, - WebhookActionComponent + UsageTriggerComponent ] }) export class SqxFeatureRulesModule { } \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/algolia-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/algolia-action.component.html deleted file mode 100644 index 10e8f129e..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/algolia-action.component.html +++ /dev/null @@ -1,43 +0,0 @@ -
-
- - -
- - - - - - The ID to you algolia application. - -
-
- -
- - -
- - - - - - The API Key to access you algolia app. - -
-
- -
- - -
- - - - - - The name of the index. You can use advanced formatting (read help section). - -
-
-
\ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/algolia-action.component.scss b/src/Squidex/app/features/rules/pages/rules/actions/algolia-action.component.scss deleted file mode 100644 index fbb752506..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/algolia-action.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import '_vars'; -@import '_mixins'; \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/algolia-action.component.ts b/src/Squidex/app/features/rules/pages/rules/actions/algolia-action.component.ts deleted file mode 100644 index 0ac2c1641..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/algolia-action.component.ts +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { Component, Input, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; - -@Component({ - selector: 'sqx-algolia-action', - styleUrls: ['./algolia-action.component.scss'], - templateUrl: './algolia-action.component.html' -}) -export class AlgoliaActionComponent implements OnInit { - @Input() - public action: any; - - @Input() - public actionForm: FormGroup; - - @Input() - public actionFormSubmitted = false; - - public ngOnInit() { - this.actionForm.setControl('appId', - new FormControl(this.action.appId || '', [ - Validators.required - ])); - - this.actionForm.setControl('apiKey', - new FormControl(this.action.apiKey || '', [ - Validators.required - ])); - - this.actionForm.setControl('indexName', - new FormControl(this.action.indexName || '$SCHEMA_NAME', [ - Validators.required - ])); - } -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.html deleted file mode 100644 index ffae8dd67..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.html +++ /dev/null @@ -1,29 +0,0 @@ -
-
- - -
- - - - - - The connection string to the storage account. - -
-
- -
- - -
- - - - - - The name of the queue. - -
-
-
\ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.scss b/src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.scss deleted file mode 100644 index fbb752506..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import '_vars'; -@import '_mixins'; \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.ts b/src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.ts deleted file mode 100644 index 8df30f90e..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { Component, Input, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; - -import { ValidatorsEx } from '@app/shared'; - -@Component({ - selector: 'sqx-azure-queue-action', - styleUrls: ['./azure-queue-action.component.scss'], - templateUrl: './azure-queue-action.component.html' -}) -export class AzureQueueActionComponent implements OnInit { - @Input() - public action: any; - - @Input() - public actionForm: FormGroup; - - @Input() - public actionFormSubmitted = false; - - public ngOnInit() { - this.actionForm.setControl('connectionString', - new FormControl(this.action.connectionString || '', [ - Validators.required - ])); - - this.actionForm.setControl('queue', - new FormControl(this.action.queue || 'squidex', [ - Validators.required, - ValidatorsEx.pattern('[a-z][a-z0-9]{2,}(\-[a-z0-9]+)*', 'Name must be a valid azure queue name.') - ])); - } -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/discourse-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/discourse-action.component.html deleted file mode 100644 index e22fd9080..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/discourse-action.component.html +++ /dev/null @@ -1,99 +0,0 @@ -
-
- - -
- - - - - - The url to your discourse server. - -
-
- -
- - -
- - - - - - The api key to authenticate to your discourse server. - -
-
- -
- - -
- - - - - - The api username to authenticate to your discourse server. - -
-
- -
- - -
- - - - - - The text for your topic or post. Read the help section for information about advanced formatting. - -
-
- -
- - -
- - - - - - The optional title, when you want to create a topic. Read the help section for information about advanced formatting. - -
-
- -
- - -
- - - - - - The topic id when you want to create a post. - -
-
- -
- - -
- - - - - - The category id when you create a topic. - -
-
-
\ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/discourse-action.component.scss b/src/Squidex/app/features/rules/pages/rules/actions/discourse-action.component.scss deleted file mode 100644 index 756609665..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/discourse-action.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -@import '_vars'; -@import '_mixins'; - -textarea { - height: 150px; -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/discourse-action.component.ts b/src/Squidex/app/features/rules/pages/rules/actions/discourse-action.component.ts deleted file mode 100644 index a2e25ac55..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/discourse-action.component.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { Component, Input, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; - -@Component({ - selector: 'sqx-discourse-action', - styleUrls: ['./discourse-action.component.scss'], - templateUrl: './discourse-action.component.html' -}) -export class DiscourseActionComponent implements OnInit { - @Input() - public action: any; - - @Input() - public actionForm: FormGroup; - - @Input() - public actionFormSubmitted = false; - - public ngOnInit() { - this.actionForm.setControl('url', - new FormControl(this.action.url || '', [ - Validators.required - ])); - - this.actionForm.setControl('apiKey', - new FormControl(this.action.apiKey || '', [ - Validators.required - ])); - - this.actionForm.setControl('apiUsername', - new FormControl(this.action.apiUsername || '', [ - Validators.required - ])); - - this.actionForm.setControl('text', - new FormControl(this.action.text || '', [ - Validators.required - ])); - - this.actionForm.setControl('title', - new FormControl(this.action.title)); - - this.actionForm.setControl('topic', - new FormControl(this.action.topic)); - - this.actionForm.setControl('category', - new FormControl(this.action.category)); - } -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/elastic-search-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/elastic-search-action.component.html deleted file mode 100644 index fee16364c..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/elastic-search-action.component.html +++ /dev/null @@ -1,71 +0,0 @@ -
-
- - -
- - - - - - The url to your elastic search instance. - -
-
- -
- - -
- - - - - - The username for authentication. Highly recommended. - -
-
- -
- - -
- - - - - - The password for authentication. Highly recommended. - -
-
- -
- - -
- - - - - - The name of the index. You can use advanced formatting (read help section). - -
-
- -
- - -
- - - - - - The name of the type. You can use advanced formatting (read help section). - -
-
-
\ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/elastic-search-action.component.scss b/src/Squidex/app/features/rules/pages/rules/actions/elastic-search-action.component.scss deleted file mode 100644 index fbb752506..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/elastic-search-action.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import '_vars'; -@import '_mixins'; \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/elastic-search-action.component.ts b/src/Squidex/app/features/rules/pages/rules/actions/elastic-search-action.component.ts deleted file mode 100644 index 8e6e0c8f2..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/elastic-search-action.component.ts +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { Component, Input, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; - -@Component({ - selector: 'sqx-elastic-search-action', - styleUrls: ['./elastic-search-action.component.scss'], - templateUrl: './elastic-search-action.component.html' -}) -export class ElasticSearchActionComponent implements OnInit { - @Input() - public action: any; - - @Input() - public actionForm: FormGroup; - - @Input() - public actionFormSubmitted = false; - - public ngOnInit() { - this.actionForm.setControl('host', - new FormControl(this.action.host || '', [ - Validators.required - ])); - - this.actionForm.setControl('indexName', - new FormControl(this.action.indexName || '$APP_NAME', [ - Validators.required - ])); - - this.actionForm.setControl('indexType', - new FormControl(this.action.indexType || '$SCHEMA_NAME')); - - this.actionForm.setControl('username', - new FormControl(this.action.username)); - - this.actionForm.setControl('password', - new FormControl(this.action.password)); - } -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/email-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/email-action.component.html deleted file mode 100644 index c083bb1cc..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/email-action.component.html +++ /dev/null @@ -1,128 +0,0 @@ -
-
- - -
- - - - - - The IP address or host to the SMTP server. - -
-
- -
- - -
- - - - - - The port to the SMTP server. - -
-
- -
-
-
- - -
- - Specify whether the SMTP client uses Secure Sockets Layer (SSL) to encrypt the connection. - -
-
- -
- - -
- - - - - - The username for the SMTP server. - -
-
- -
- - -
- - - - - - The password for the SMTP server. - -
-
- -
- - -
- - - - - - The email sending address. Read the help section for information about advanced formatting. - -
-
- -
- - -
- - - - - - The email message will be sent to. Read the help section for information about advanced formatting. - -
-
- -
- - -
- - - - - - The subject line for this email message. Read the help section for information about advanced formatting. - -
-
- - -
- - -
- - - - - - The message body. Read the help section for information about advanced formatting. - -
-
-
\ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/email-action.component.scss b/src/Squidex/app/features/rules/pages/rules/actions/email-action.component.scss deleted file mode 100644 index 51468cba5..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/email-action.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -@import '_vars'; -@import '_mixins'; - -textarea { - height: 250px; -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/email-action.component.ts b/src/Squidex/app/features/rules/pages/rules/actions/email-action.component.ts deleted file mode 100644 index 31761bef8..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/email-action.component.ts +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { Component, Input, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; - -@Component({ - selector: 'sqx-email-action', - styleUrls: ['./email-action.component.scss'], - templateUrl: './email-action.component.html' -}) -export class EmailActionComponent implements OnInit { - @Input() - public action: any; - - @Input() - public actionForm: FormGroup; - - @Input() - public actionFormSubmitted = false; - - public ngOnInit() { - this.actionForm.setControl('serverHost', - new FormControl(this.action.serverHost || 'smtp.gmail.com', [ - Validators.required - ])); - - this.actionForm.setControl('serverPort', - new FormControl(this.action.serverPort || 465, [ - Validators.required - ])); - - this.actionForm.setControl('serverUseSsl', - new FormControl(this.action.serverUseSsl || true)); - - this.actionForm.setControl('serverUsername', - new FormControl(this.action.serverUsername || '', [ - Validators.required - ])); - - this.actionForm.setControl('serverPassword', - new FormControl(this.action.serverPassword || '', [ - Validators.required - ])); - - this.actionForm.setControl('messageFrom', - new FormControl(this.action.messageFrom || '', [ - Validators.required - ])); - - this.actionForm.setControl('messageTo', - new FormControl(this.action.messageTo || '', [ - Validators.required - ])); - - this.actionForm.setControl('messageSubject', - new FormControl(this.action.messageSubject || '', [ - Validators.required - ])); - - this.actionForm.setControl('messageBody', - new FormControl(this.action.messageBody || '', [ - Validators.required - ])); - } -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/fastly-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/fastly-action.component.html deleted file mode 100644 index b089b622c..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/fastly-action.component.html +++ /dev/null @@ -1,29 +0,0 @@ -
-
- - -
- - - - - - The service ID of the fastly account. - -
-
- -
- - -
- - - - - - The API key for the fastly account. - -
-
-
\ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/fastly-action.component.scss b/src/Squidex/app/features/rules/pages/rules/actions/fastly-action.component.scss deleted file mode 100644 index fbb752506..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/fastly-action.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import '_vars'; -@import '_mixins'; \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/fastly-action.component.ts b/src/Squidex/app/features/rules/pages/rules/actions/fastly-action.component.ts deleted file mode 100644 index 192216769..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/fastly-action.component.ts +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { Component, Input, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; - -@Component({ - selector: 'sqx-fastly-action', - styleUrls: ['./fastly-action.component.scss'], - templateUrl: './fastly-action.component.html' -}) -export class FastlyActionComponent implements OnInit { - @Input() - public action: any; - - @Input() - public actionForm: FormGroup; - - @Input() - public actionFormSubmitted = false; - - public ngOnInit() { - this.actionForm.setControl('serviceId', - new FormControl(this.action.serviceId || '', [ - Validators.required - ])); - - this.actionForm.setControl('apiKey', - new FormControl(this.action.apiKey || '', [ - Validators.required - ])); - } -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.html new file mode 100644 index 000000000..5c0438347 --- /dev/null +++ b/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.html @@ -0,0 +1,34 @@ +
+
+ + +
+ + +
+
+ +
+
+
+ + +
+
+
+ +
+
+ + + {{property.description}} + + + You can use advanced formatting: Documentation + + +
+
+
\ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.scss b/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.scss new file mode 100644 index 000000000..6f7a94e21 --- /dev/null +++ b/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.scss @@ -0,0 +1,6 @@ +@import '_vars'; +@import '_mixins'; + +.form-check { + padding-top: .5rem; +} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.ts b/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.ts new file mode 100644 index 000000000..06992b17e --- /dev/null +++ b/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.ts @@ -0,0 +1,44 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { Component, Input, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; + +import { RuleElementDto } from '@app/shared'; + +@Component({ + selector: 'sqx-generic-action', + styleUrls: ['./generic-action.component.scss'], + templateUrl: './generic-action.component.html' +}) +export class GenericActionComponent implements OnInit { + @Input() + public definition: RuleElementDto; + + @Input() + public action: any; + + @Input() + public actionForm: FormGroup; + + @Input() + public actionFormSubmitted = false; + + public ngOnInit() { + for (let property of this.definition.properties) { + const validators = []; + + if (property.isRequired) { + validators.push(Validators.required); + } + + const control = new FormControl(this.action[property.name] || '', validators); + + this.actionForm.setControl(property.name, control); + } + } +} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/medium-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/medium-action.component.html deleted file mode 100644 index d92a5c7e8..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/medium-action.component.html +++ /dev/null @@ -1,96 +0,0 @@ -
-
- - -
- - - - - - The self issued access token. Can be created under https://medium.com/me/settings. - -
-
- -
- - -
- - - - - - The title of the post. Note that this title is used for SEO and when rendering the post as a listing. - -
-
- -
- - -
- - - - - - The body of the post, in a valid, semantic, HTML fragment, or Markdown. - -
-
- -
-
-
- - -
-
-
- -
- - -
- - - - - - The original home of this content, if it was originally published elsewhere. - -
-
- -
- - -
- - - - - - Optional comma-separated list of tags. - -
-
- -
- - -
- - - - - - Optional publication id. Go to https://medium.com/[PUBLICATION]?format=json to fetch the id. - -
-
-
\ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/medium-action.component.scss b/src/Squidex/app/features/rules/pages/rules/actions/medium-action.component.scss deleted file mode 100644 index 756609665..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/medium-action.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -@import '_vars'; -@import '_mixins'; - -textarea { - height: 150px; -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/medium-action.component.ts b/src/Squidex/app/features/rules/pages/rules/actions/medium-action.component.ts deleted file mode 100644 index a14f0841c..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/medium-action.component.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { Component, Input, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; - -@Component({ - selector: 'sqx-medium-action', - styleUrls: ['./medium-action.component.scss'], - templateUrl: './medium-action.component.html' -}) -export class MediumActionComponent implements OnInit { - @Input() - public action: any; - - @Input() - public actionForm: FormGroup; - - @Input() - public actionFormSubmitted = false; - - public ngOnInit() { - this.actionForm.setControl('accessToken', - new FormControl(this.action.accessToken || '', [ - Validators.required - ])); - - this.actionForm.setControl('title', - new FormControl(this.action.title || '', [ - Validators.required - ])); - - this.actionForm.setControl('content', - new FormControl(this.action.content || '', [ - Validators.required - ])); - - this.actionForm.setControl('canonicalUrl', - new FormControl(this.action.canonicalUrl || '')); - - this.actionForm.setControl('tags', - new FormControl(this.action.tags || '')); - - this.actionForm.setControl('publicationId', - new FormControl(this.action.publicationId || '')); - - this.actionForm.setControl('isHtml', - new FormControl(this.action.isHtml || false)); - } -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/prerender-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/prerender-action.component.html deleted file mode 100644 index 63b5a2319..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/prerender-action.component.html +++ /dev/null @@ -1,29 +0,0 @@ -
-
- - -
- - - - - - The prerender token from your account. - -
-
- -
- - -
- - - - - - The url to recache. Read the help section for information about advanced formatting. - -
-
-
\ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/prerender-action.component.scss b/src/Squidex/app/features/rules/pages/rules/actions/prerender-action.component.scss deleted file mode 100644 index fbb752506..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/prerender-action.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import '_vars'; -@import '_mixins'; \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/prerender-action.component.ts b/src/Squidex/app/features/rules/pages/rules/actions/prerender-action.component.ts deleted file mode 100644 index adf25fb6d..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/prerender-action.component.ts +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { Component, Input, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; - -@Component({ - selector: 'sqx-prerender-action', - styleUrls: ['./prerender-action.component.scss'], - templateUrl: './prerender-action.component.html' -}) -export class PrerenderActionComponent implements OnInit { - @Input() - public action: any; - - @Input() - public actionForm: FormGroup; - - @Input() - public actionFormSubmitted = false; - - public ngOnInit() { - this.actionForm.setControl('token', - new FormControl(this.action.token || '', [ - Validators.required - ])); - - this.actionForm.setControl('url', - new FormControl(this.action.url || '', [ - Validators.required - ])); - } -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/slack-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/slack-action.component.html deleted file mode 100644 index 0f21696a0..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/slack-action.component.html +++ /dev/null @@ -1,29 +0,0 @@ -
-
- - -
- - - - - - The url to the incoming slack webhook. - -
-
- -
- - -
- - - - - - The text to send to slack. Read the help section for information about advanced formatting. - -
-
-
\ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/slack-action.component.scss b/src/Squidex/app/features/rules/pages/rules/actions/slack-action.component.scss deleted file mode 100644 index 756609665..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/slack-action.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -@import '_vars'; -@import '_mixins'; - -textarea { - height: 150px; -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/slack-action.component.ts b/src/Squidex/app/features/rules/pages/rules/actions/slack-action.component.ts deleted file mode 100644 index 9a425591b..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/slack-action.component.ts +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { Component, Input, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; - -@Component({ - selector: 'sqx-slack-action', - styleUrls: ['./slack-action.component.scss'], - templateUrl: './slack-action.component.html' -}) -export class SlackActionComponent implements OnInit { - @Input() - public action: any; - - @Input() - public actionForm: FormGroup; - - @Input() - public actionFormSubmitted = false; - - public ngOnInit() { - this.actionForm.setControl('webhookUrl', - new FormControl(this.action.webhookUrl || '', [ - Validators.required - ])); - - this.actionForm.setControl('text', - new FormControl(this.action.text || '', [ - Validators.required - ])); - } -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.html deleted file mode 100644 index 341d20043..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.html +++ /dev/null @@ -1,55 +0,0 @@ -
-
-
- - - - - - - - - - - -
-
- -
- - -
- - - -
-
- -
- - -
- - - -
-
- -
- - -
- - - - - - The text to tweet. Read the help section for information about advanced formatting. - -
-
- \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.scss b/src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.scss deleted file mode 100644 index 756609665..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -@import '_vars'; -@import '_mixins'; - -textarea { - height: 150px; -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.ts b/src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.ts deleted file mode 100644 index 84b8b802c..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.ts +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { HttpClient } from '@angular/common/http'; -import { Component, Input, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; - -import { DialogService } from '@app/shared'; - -@Component({ - selector: 'sqx-tweet-action', - styleUrls: ['./tweet-action.component.scss'], - templateUrl: './tweet-action.component.html' -}) -export class TweetActionComponent implements OnInit { - private request: any; - - @Input() - public action: any; - - @Input() - public actionForm: FormGroup; - - @Input() - public actionFormSubmitted = false; - - public isAuthenticating = false; - public isRedirected = false; - - public pinCode: string; - - constructor( - private readonly dialogs: DialogService, - private readonly httpClient: HttpClient - ) { - } - - public ngOnInit() { - this.actionForm.setControl('accessToken', - new FormControl(this.action.accessToken || '', [ - Validators.required - ])); - - this.actionForm.setControl('accessSecret', - new FormControl(this.action.accessSecret || '', [ - Validators.required - ])); - - this.actionForm.setControl('text', - new FormControl(this.action.text || '', [ - Validators.required, - Validators.maxLength(280) - ])); - } - - public auth() { - this.isAuthenticating = true; - - this.httpClient.get('api/rules/twitter/auth') - .subscribe((response: any) => { - this.request = { - requestToken: response.requestToken, - requestTokenSecret: response.requestTokenSecret - }; - - this.isAuthenticating = false; - this.isRedirected = true; - - window.open(response.authorizeUri, '_blank'); - }, () => { - this.dialogs.notifyError('Failed to authenticate with twitter.'); - - this.isAuthenticating = false; - this.isRedirected = false; - }); - } - - public complete() { - this.request.pinCode = this.pinCode; - - this.httpClient.post('api/rules/twitter/token', this.request) - .subscribe((response: any) => { - this.actionForm.get('accessToken')!.setValue(response.accessToken); - this.actionForm.get('accessSecret')!.setValue(response.accessTokenSecret); - - this.isRedirected = false; - }, () => { - this.dialogs.notifyError('Failed to request access token.'); - - this.isAuthenticating = false; - this.isRedirected = false; - }); - } -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/webhook-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/webhook-action.component.html deleted file mode 100644 index b8d4bb1d8..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/webhook-action.component.html +++ /dev/null @@ -1,29 +0,0 @@ -
-
- - -
- - - - - - The url where the events will be sent to. - -
-
- -
- - -
- - - - - - The shared secret will be used to add a header X-Signature=Base64(Sha256(RequestBody + Secret)) - -
-
-
\ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/webhook-action.component.scss b/src/Squidex/app/features/rules/pages/rules/actions/webhook-action.component.scss deleted file mode 100644 index fbb752506..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/webhook-action.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import '_vars'; -@import '_mixins'; \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/actions/webhook-action.component.ts b/src/Squidex/app/features/rules/pages/rules/actions/webhook-action.component.ts deleted file mode 100644 index 767ed1442..000000000 --- a/src/Squidex/app/features/rules/pages/rules/actions/webhook-action.component.ts +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { Component, Input, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; - -@Component({ - selector: 'sqx-webhook-action', - styleUrls: ['./webhook-action.component.scss'], - templateUrl: './webhook-action.component.html' -}) -export class WebhookActionComponent implements OnInit { - @Input() - public action: any; - - @Input() - public actionForm: FormGroup; - - @Input() - public actionFormSubmitted = false; - - public ngOnInit() { - this.actionForm.setControl('url', - new FormControl(this.action.url || '', [ - Validators.required - ])); - - this.actionForm.setControl('sharedSecret', - new FormControl(this.action.sharedSecret || '')); - } -} \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/rule-element.component.html b/src/Squidex/app/features/rules/pages/rules/rule-element.component.html index 977302dab..695bdea88 100644 --- a/src/Squidex/app/features/rules/pages/rules/rule-element.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rule-element.component.html @@ -1,16 +1,14 @@ -
-
+
+
-
-
- {{element.display}} -
+
+ {{element.display}}
diff --git a/src/Squidex/app/features/rules/pages/rules/rule-element.component.scss b/src/Squidex/app/features/rules/pages/rules/rule-element.component.scss index b22df1cd7..aab579f44 100644 --- a/src/Squidex/app/features/rules/pages/rules/rule-element.component.scss +++ b/src/Squidex/app/features/rules/pages/rules/rule-element.component.scss @@ -5,9 +5,12 @@ & { @include transition(background-color .4s ease); cursor: pointer; + height: 3rem; + position: relative; } &-text { + @include absolute(0, 0, 0, 3rem); @include truncate; color: $color-dark-foreground; line-height: 3rem; @@ -17,16 +20,14 @@ } &-icon { + @include absolute(0, auto, 0, 0); + color: $color-dark-foreground; line-height: 3.2rem; font-size: 1.2rem; font-weight: normal; padding: 0 .8rem; } - .col { - height: 3rem; - } - .icon { font-size: 20px; } diff --git a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html index 16f1fca8e..9c5b40f42 100644 --- a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html @@ -79,85 +79,12 @@

{{ruleActions[actionType].display}}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
diff --git a/src/Squidex/app/shared/services/rules.service.spec.ts b/src/Squidex/app/shared/services/rules.service.spec.ts index c5d6fe99b..da576b6f0 100644 --- a/src/Squidex/app/shared/services/rules.service.spec.ts +++ b/src/Squidex/app/shared/services/rules.service.spec.ts @@ -22,6 +22,7 @@ import { UpdateRuleDto, Version } from './../'; +import { RuleElementPropertyDto } from './rules.service'; describe('RulesService', () => { const now = DateTime.now(); @@ -65,20 +66,43 @@ describe('RulesService', () => { description: 'description2', iconColor: '#222', iconImage: '', - readMore: 'link2' + readMore: 'link2', + properties: [{ + name: 'property1', + editor: 'Editor1', + display: 'Display1', + description: 'Description1', + isRequired: true, + isFormattable: false + }, { + name: 'property2', + editor: 'Editor2', + display: 'Display2', + description: 'Description2', + isRequired: false, + isFormattable: true + }] }, 'action1': { display: 'display1', description: 'description1', iconColor: '#111', iconImage: '', - readMore: 'link1' + readMore: 'link1', + properties: [] } }); + const action1 = new RuleElementDto('display1', 'description1', '#111', '', null, 'link1', []); + + const action2 = new RuleElementDto('display2', 'description2', '#222', '', null, 'link2', [ + new RuleElementPropertyDto('property1', 'Editor1', 'Display1', 'Description1', false, true), + new RuleElementPropertyDto('property2', 'Editor2', 'Display2', 'Description2', true, false) + ]); + expect(actions!).toEqual({ - 'action1': new RuleElementDto('display1', 'description1', '#111', '', null, 'link1'), - 'action2': new RuleElementDto('display2', 'description2', '#222', '', null, 'link2') + 'action1': action1, + 'action2': action2 }); })); diff --git a/src/Squidex/app/shared/services/rules.service.ts b/src/Squidex/app/shared/services/rules.service.ts index cb2eae816..9ca980f73 100644 --- a/src/Squidex/app/shared/services/rules.service.ts +++ b/src/Squidex/app/shared/services/rules.service.ts @@ -54,7 +54,20 @@ export class RuleElementDto { public readonly iconColor: string, public readonly iconImage: string, public readonly iconCode: string | null, - public readonly readMore: string + public readonly readMore: string, + public readonly properties: RuleElementPropertyDto[] + ) { + } +} + +export class RuleElementPropertyDto { + constructor( + public readonly name: string, + public readonly editor: string, + public readonly display: string, + public readonly description: string, + public readonly isFormattable: boolean, + public readonly isRequired: boolean ) { } } @@ -147,7 +160,23 @@ export class RulesService { for (let key of Object.keys(items).sort()) { const value = items[key]; - result[key] = new RuleElementDto(value.display, value.description, value.iconColor, value.iconImage, null, value.readMore); + const properties = value.properties.map((property: any) => + new RuleElementPropertyDto( + property.name, + property.editor, + property.display, + property.description, + property.isFormattable, + property.isRequired + )); + + result[key] = new RuleElementDto( + value.display, + value.description, + value.iconColor, + value.iconImage, null, + value.readMore, + properties); } return result; diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleElementRegistry.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleElementRegistry.cs new file mode 100644 index 000000000..3cef0cc4d --- /dev/null +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleElementRegistry.cs @@ -0,0 +1,166 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using FluentAssertions; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Domain.Apps.Core.Rules; +using Xunit; + +namespace Squidex.Domain.Apps.Core.Operations.HandleRules +{ + public class RuleElementRegistry + { + private abstract class MyRuleActionHandler : RuleActionHandler + { + protected MyRuleActionHandler(RuleEventFormatter formatter) + : base(formatter) + { + } + } + + [RuleActionHandler(typeof(MyRuleActionHandler))] + [RuleAction( + IconImage = "", + IconColor = "#1e5470", + Display = "Action display", + Description = "Action description.", + ReadMore = "https://www.readmore.com/")] + public sealed class MyRuleAction : RuleAction + { + [Required] + [Display(Name = "Url Name", Description = "Url Description")] + [DataType(DataType.Url)] + [Formattable] + public Uri Url { get; set; } + + [DataType(DataType.EmailAddress)] + public string Email { get; set; } + + [DataType(DataType.Text)] + public string Text { get; set; } + + [DataType(DataType.MultilineText)] + public string TextMultiline { get; set; } + + [DataType(DataType.Password)] + public string Password { get; set; } + + public bool Boolean { get; set; } + + public bool? BooleanOptional { get; set; } + + public int Number { get; set; } + + public int? NumberOptional { get; set; } + } + + [Fact] + public void Should_create_definition() + { + var expected = new RuleActionDefinition + { + Type = typeof(MyRuleAction), + IconImage = "", + IconColor = "#1e5470", + Display = "Action display", + Description = "Action description.", + ReadMore = "https://www.readmore.com/" + }; + + expected.Properties.Add(new RuleActionProperty + { + Name = "url", + Display = "Url Name", + Description = "Url Description", + Editor = RuleActionPropertyEditor.Url, + IsFormattable = true, + IsRequired = true + }); + + expected.Properties.Add(new RuleActionProperty + { + Name = "email", + Display = "Email", + Description = null, + Editor = RuleActionPropertyEditor.Email, + IsRequired = false + }); + + expected.Properties.Add(new RuleActionProperty + { + Name = "text", + Display = "Text", + Description = null, + Editor = RuleActionPropertyEditor.Text, + IsRequired = false + }); + + expected.Properties.Add(new RuleActionProperty + { + Name = "textMultiline", + Display = "TextMultiline", + Description = null, + Editor = RuleActionPropertyEditor.TextArea, + IsRequired = false + }); + + expected.Properties.Add(new RuleActionProperty + { + Name = "password", + Display = "Password", + Description = null, + Editor = RuleActionPropertyEditor.Password, + IsRequired = false + }); + + expected.Properties.Add(new RuleActionProperty + { + Name = "boolean", + Display = "Boolean", + Description = null, + Editor = RuleActionPropertyEditor.Checkbox, + IsRequired = false + }); + + expected.Properties.Add(new RuleActionProperty + { + Name = "booleanOptional", + Display = "BooleanOptional", + Description = null, + Editor = RuleActionPropertyEditor.Checkbox, + IsRequired = false + }); + + expected.Properties.Add(new RuleActionProperty + { + Name = "number", + Display = "Number", + Description = null, + Editor = RuleActionPropertyEditor.Number, + IsRequired = true + }); + + expected.Properties.Add(new RuleActionProperty + { + Name = "numberOptional", + Display = "NumberOptional", + Description = null, + Editor = RuleActionPropertyEditor.Number, + IsRequired = false + }); + + RuleActionRegistry.Add(); + + var currentDefinition = RuleActionRegistry.Actions.Values.First(); + + currentDefinition.Should().BeEquivalentTo(expected); + } + } +} From 4b80525d92df60f15d71155f17fb226220b86341 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Wed, 20 Feb 2019 20:28:46 +0100 Subject: [PATCH 04/55] Optional services and improved plugin loading. --- .../Actions/Twitter/TwitterPlugin.cs | 3 + .../Squidex.Extensions/SquidexExtensions.cs | 16 ---- .../Log/SemanticLogExtensions.cs | 12 ++- .../Plugins/IWebPlugin.cs | 2 +- .../Plugins/PluginManager.cs | 69 ++++++++++++-- .../Controllers/Rules/TwitterController.cs | 69 -------------- .../Areas/Api/Controllers/UI/UIController.cs | 7 +- src/Squidex/Config/Domain/AssetServices.cs | 8 +- src/Squidex/Config/Domain/EntitiesServices.cs | 2 +- .../Config/Domain/EventStoreServices.cs | 4 +- .../Config/Domain/InfrastructureServices.cs | 4 +- src/Squidex/Config/Domain/LoggingServices.cs | 2 +- src/Squidex/Config/Domain/StoreServices.cs | 24 ++--- .../Config/Domain/SubscriptionServices.cs | 6 +- .../Pipeline/Plugins/PluginExtensions.cs | 90 ++++++++++++++----- src/Squidex/Squidex.csproj | 3 - src/Squidex/WebStartup.cs | 5 +- src/Squidex/appsettings.json | 24 +++-- 18 files changed, 182 insertions(+), 168 deletions(-) delete mode 100644 extensions/Squidex.Extensions/SquidexExtensions.cs delete mode 100644 src/Squidex/Areas/Api/Controllers/Rules/TwitterController.cs diff --git a/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs b/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs index a5b120f4a..911db17d3 100644 --- a/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs @@ -16,6 +16,9 @@ namespace Squidex.Extensions.Actions.Twitter { public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { + services.Configure( + configuration.GetSection("twitter")); + RuleActionRegistry.Add(); } } diff --git a/extensions/Squidex.Extensions/SquidexExtensions.cs b/extensions/Squidex.Extensions/SquidexExtensions.cs deleted file mode 100644 index 9803ae4ce..000000000 --- a/extensions/Squidex.Extensions/SquidexExtensions.cs +++ /dev/null @@ -1,16 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System.Reflection; - -namespace Squidex.Extensions -{ - public static class SquidexExtensions - { - public static readonly Assembly Assembly = typeof(SquidexExtensions).Assembly; - } -} diff --git a/src/Squidex.Infrastructure/Log/SemanticLogExtensions.cs b/src/Squidex.Infrastructure/Log/SemanticLogExtensions.cs index 7c232bdf6..1b58a9d02 100644 --- a/src/Squidex.Infrastructure/Log/SemanticLogExtensions.cs +++ b/src/Squidex.Infrastructure/Log/SemanticLogExtensions.cs @@ -126,8 +126,16 @@ namespace Squidex.Infrastructure.Log return writer.WriteObject(nameof(exception), exception, (ctx, w) => { w.WriteProperty("type", ctx.GetType().FullName); - w.WriteProperty("message", ctx.Message); - w.WriteProperty("stackTrace", ctx.StackTrace); + + if (ctx.Message != null) + { + w.WriteProperty("message", ctx.Message); + } + + if (ctx.StackTrace != null) + { + w.WriteProperty("stackTrace", ctx.StackTrace); + } }); } diff --git a/src/Squidex.Infrastructure/Plugins/IWebPlugin.cs b/src/Squidex.Infrastructure/Plugins/IWebPlugin.cs index 2baddf066..d8cab06d5 100644 --- a/src/Squidex.Infrastructure/Plugins/IWebPlugin.cs +++ b/src/Squidex.Infrastructure/Plugins/IWebPlugin.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Builder; namespace Squidex.Infrastructure.Plugins { - public interface IWebPlugin + public interface IWebPlugin : I { void Configure(IApplicationBuilder app); } diff --git a/src/Squidex.Infrastructure/Plugins/PluginManager.cs b/src/Squidex.Infrastructure/Plugins/PluginManager.cs index 08e2381ce..aa9fa477d 100644 --- a/src/Squidex.Infrastructure/Plugins/PluginManager.cs +++ b/src/Squidex.Infrastructure/Plugins/PluginManager.cs @@ -12,35 +12,59 @@ using System.Reflection; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Squidex.Infrastructure.Log; namespace Squidex.Infrastructure.Plugins { public sealed class PluginManager { - private readonly HashSet plugins = new HashSet(); + private readonly HashSet loadedPlugins = new HashSet(); + private readonly List<(string Plugin, string Action, Exception Exception)> exceptions = new List<(string, string, Exception)>(); - public void Add(Assembly assembly) + public IReadOnlyCollection Plugins + { + get { return loadedPlugins; } + } + + public void Add(string name, Assembly assembly) { Guard.NotNull(assembly, nameof(assembly)); var pluginTypes = assembly.GetTypes() - .Where(t => typeof(IPlugin).IsAssignableFrom(t) && !t.IsAbstract); + .Where(t => typeof(IPlugin).IsAssignableFrom(t)) + .Where(t => !t.IsAbstract); foreach (var pluginType in pluginTypes) { - var plugin = (IPlugin)Activator.CreateInstance(pluginType); + try + { + var plugin = (IPlugin)Activator.CreateInstance(pluginType); - plugins.Add(plugin); + loadedPlugins.Add(plugin); + } + catch (Exception ex) + { + LogException(name, "Instantiating", ex); + } } } + public void LogException(string plugin, string action, Exception exception) + { + Guard.NotNull(plugin, nameof(plugin)); + Guard.NotNull(action, nameof(action)); + Guard.NotNull(exception, nameof(exception)); + + exceptions.Add((plugin, action, exception)); + } + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { Guard.NotNull(services, nameof(services)); Guard.NotNull(configuration, nameof(configuration)); - foreach (var plugin in plugins) + foreach (var plugin in loadedPlugins) { plugin.ConfigureServices(services, configuration); } @@ -50,10 +74,41 @@ namespace Squidex.Infrastructure.Plugins { Guard.NotNull(app, nameof(app)); - foreach (var plugin in plugins.OfType()) + foreach (var plugin in loadedPlugins.OfType()) { plugin.Configure(app); } } + + public void Log(ISemanticLog log) + { + Guard.NotNull(log, nameof(log)); + + if (loadedPlugins.Count > 0 || exceptions.Count > 0) + { + var status = exceptions.Count > 0 ? "CompletedWithErrors" : "Completed"; + + log.LogInformation(w => w + .WriteProperty("action", "pluginsLoaded") + .WriteProperty("status", status) + .WriteArray("errors", e => + { + foreach (var error in exceptions) + { + e.WriteObject(x => x + .WriteProperty("plugin", error.Plugin) + .WriteProperty("action", error.Action) + .WriteException(error.Exception)); + } + }) + .WriteArray("plugins", a => + { + foreach (var plugin in loadedPlugins) + { + a.WriteValue(plugin.GetType().ToString()); + } + })); + } + } } } diff --git a/src/Squidex/Areas/Api/Controllers/Rules/TwitterController.cs b/src/Squidex/Areas/Api/Controllers/Rules/TwitterController.cs deleted file mode 100644 index 54e9e1566..000000000 --- a/src/Squidex/Areas/Api/Controllers/Rules/TwitterController.cs +++ /dev/null @@ -1,69 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System.Threading.Tasks; -using CoreTweet; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Options; -using Squidex.Extensions.Actions.Twitter; - -namespace Squidex.Areas.Api.Controllers.Rules -{ - public sealed class TwitterController : Controller - { - private readonly TwitterOptions twitterOptions; - - public TwitterController(IOptions twitterOptions) - { - this.twitterOptions = twitterOptions.Value; - } - - public sealed class TokenRequest - { - public string PinCode { get; set; } - - public string RequestToken { get; set; } - - public string RequestTokenSecret { get; set; } - } - - [HttpGet] - [Route("rules/twitter/auth")] - public async Task Auth() - { - var session = await OAuth.AuthorizeAsync(twitterOptions.ClientId, twitterOptions.ClientSecret); - - return Ok(new - { - session.AuthorizeUri, - session.RequestToken, - session.RequestTokenSecret - }); - } - - [HttpPost] - [Route("rules/twitter/token")] - public async Task AuthComplete([FromBody] TokenRequest request) - { - var session = new OAuth.OAuthSession - { - ConsumerKey = twitterOptions.ClientId, - ConsumerSecret = twitterOptions.ClientSecret, - RequestToken = request.RequestToken, - RequestTokenSecret = request.RequestTokenSecret - }; - - var tokens = await session.GetTokensAsync(request.PinCode); - - return Ok(new - { - tokens.AccessToken, - tokens.AccessTokenSecret - }); - } - } -} diff --git a/src/Squidex/Areas/Api/Controllers/UI/UIController.cs b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs index 18a7eeb7e..635f620ac 100644 --- a/src/Squidex/Areas/Api/Controllers/UI/UIController.cs +++ b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs @@ -12,7 +12,6 @@ using Orleans; using Squidex.Areas.Api.Controllers.UI.Models; using Squidex.Config; using Squidex.Domain.Apps.Entities.Apps; -using Squidex.Extensions.Actions.Twitter; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Orleans; using Squidex.Pipeline; @@ -22,18 +21,16 @@ namespace Squidex.Areas.Api.Controllers.UI public sealed class UIController : ApiController { private readonly MyUIOptions uiOptions; - private readonly TwitterOptions twitterOptions; private readonly IGrainFactory grainFactory; public UIController(ICommandBus commandBus, IOptions uiOptions, - IOptions twitterOptions, IGrainFactory grainFactory) : base(commandBus) { this.uiOptions = uiOptions.Value; + this.grainFactory = grainFactory; - this.twitterOptions = twitterOptions.Value; } /// @@ -55,8 +52,6 @@ namespace Squidex.Areas.Api.Controllers.UI result.Value.Add("mapType", uiOptions.Map?.Type ?? "OSM"); result.Value.Add("mapKey", uiOptions.Map?.GoogleMaps?.Key); - result.Value.Add("supportTwitterAction", twitterOptions.IsConfigured()); - return Ok(result.Value); } diff --git a/src/Squidex/Config/Domain/AssetServices.cs b/src/Squidex/Config/Domain/AssetServices.cs index d1edf5d54..d23731ed3 100644 --- a/src/Squidex/Config/Domain/AssetServices.cs +++ b/src/Squidex/Config/Domain/AssetServices.cs @@ -29,14 +29,14 @@ namespace Squidex.Config.Domain var path = config.GetRequiredValue("assetStore:folder:path"); services.AddSingletonAs(c => new FolderAssetStore(path, c.GetRequiredService())) - .As(); + .AsOptional(); }, ["GoogleCloud"] = () => { var bucketName = config.GetRequiredValue("assetStore:googleCloud:bucket"); services.AddSingletonAs(c => new GoogleCloudAssetStore(bucketName)) - .As(); + .AsOptional(); }, ["AzureBlob"] = () => { @@ -44,7 +44,7 @@ namespace Squidex.Config.Domain var containerName = config.GetRequiredValue("assetStore:azureBlob:containerName"); services.AddSingletonAs(c => new AzureBlobAssetStore(connectionString, containerName)) - .As(); + .AsOptional(); }, ["MongoDb"] = () => { @@ -64,7 +64,7 @@ namespace Squidex.Config.Domain return new MongoGridFsAssetStore(gridFsbucket); }) - .As(); + .AsOptional(); } }); diff --git a/src/Squidex/Config/Domain/EntitiesServices.cs b/src/Squidex/Config/Domain/EntitiesServices.cs index 8cd35728e..3bf99f5a2 100644 --- a/src/Squidex/Config/Domain/EntitiesServices.cs +++ b/src/Squidex/Config/Domain/EntitiesServices.cs @@ -114,7 +114,7 @@ namespace Squidex.Config.Domain .As>(); services.AddSingletonAs() - .As(); + .AsOptional(); services.AddCommandPipeline(); services.AddBackupHandlers(); diff --git a/src/Squidex/Config/Domain/EventStoreServices.cs b/src/Squidex/Config/Domain/EventStoreServices.cs index 03cb235e2..94bebf145 100644 --- a/src/Squidex/Config/Domain/EventStoreServices.cs +++ b/src/Squidex/Config/Domain/EventStoreServices.cs @@ -39,7 +39,7 @@ namespace Squidex.Config.Domain return new MongoEventStore(mongDatabase, c.GetRequiredService()); }) - .As(); + .AsOptional(); }, ["GetEventStore"] = () => { @@ -53,7 +53,7 @@ namespace Squidex.Config.Domain .As(); services.AddSingletonAs(c => new GetEventStore(connection, c.GetRequiredService(), eventStorePrefix, eventStoreProjectionHost)) - .As(); + .AsOptional(); services.AddHealthChecks() .AddCheck("EventStore", tags: new[] { "node" }); diff --git a/src/Squidex/Config/Domain/InfrastructureServices.cs b/src/Squidex/Config/Domain/InfrastructureServices.cs index a623e3650..9ae8bf331 100644 --- a/src/Squidex/Config/Domain/InfrastructureServices.cs +++ b/src/Squidex/Config/Domain/InfrastructureServices.cs @@ -62,10 +62,10 @@ namespace Squidex.Config.Domain .As(); services.AddSingletonAs() - .As(); + .AsOptional(); services.AddSingletonAs() - .As(); + .AsOptional(); services.AddSingletonAs() .As(); diff --git a/src/Squidex/Config/Domain/LoggingServices.cs b/src/Squidex/Config/Domain/LoggingServices.cs index 92885e424..dfc45d04c 100644 --- a/src/Squidex/Config/Domain/LoggingServices.cs +++ b/src/Squidex/Config/Domain/LoggingServices.cs @@ -62,7 +62,7 @@ namespace Squidex.Config.Domain .As(); services.AddSingletonAs() - .As(); + .AsOptional(); } } } diff --git a/src/Squidex/Config/Domain/StoreServices.cs b/src/Squidex/Config/Domain/StoreServices.cs index 8d79f0ec5..bf077d755 100644 --- a/src/Squidex/Config/Domain/StoreServices.cs +++ b/src/Squidex/Config/Domain/StoreServices.cs @@ -78,32 +78,32 @@ namespace Squidex.Config.Domain .As(); services.AddSingletonAs() - .As(); + .AsOptional(); services.AddSingletonAs() - .As(); + .AsOptional(); services.AddSingletonAs() - .As(); + .AsOptional(); services.AddSingletonAs() - .As(); + .AsOptional(); services.AddSingletonAs() - .As>(); + .AsOptional>(); services.AddSingletonAs() - .As>() - .As(); + .AsOptional>() + .AsOptional(); services.AddSingletonAs() - .As() - .As>(); + .AsOptional() + .AsOptional>(); services.AddSingletonAs(c => new MongoContentRepository(mongoContentDatabase, c.GetRequiredService(), c.GetRequiredService())) - .As() - .As>() - .As(); + .AsOptional() + .AsOptional>() + .AsOptional(); } }); diff --git a/src/Squidex/Config/Domain/SubscriptionServices.cs b/src/Squidex/Config/Domain/SubscriptionServices.cs index f9d6ca1a1..2d2a0e706 100644 --- a/src/Squidex/Config/Domain/SubscriptionServices.cs +++ b/src/Squidex/Config/Domain/SubscriptionServices.cs @@ -23,13 +23,13 @@ namespace Squidex.Config.Domain services.AddSingletonAs(c => c.GetRequiredService>()?.Value?.Plans.OrEmpty()); services.AddSingletonAs() - .As(); + .AsOptional(); services.AddSingletonAs() - .As(); + .AsOptional(); services.AddSingletonAs() - .As(); + .AsOptional(); } } } diff --git a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs index f2397b7ed..f89cf24cc 100644 --- a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs +++ b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs @@ -6,13 +6,15 @@ // ========================================================================== using System; +using System.Collections.Generic; +using System.IO; using System.Reflection; using McMaster.NETCore.Plugins; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Mvc.ApplicationParts; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Extensions; +using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Plugins; namespace Squidex.Pipeline.Plugins @@ -29,50 +31,94 @@ namespace Squidex.Pipeline.Plugins if (options.Plugins != null) { - foreach (var pluginPath in options.Plugins) + foreach (var path in options.Plugins) { - PluginLoader plugin = null; - - if (pluginPath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) - { - plugin = PluginLoader.CreateFromAssemblyFile(pluginPath, SharedTypes); - } - else - { - plugin = PluginLoader.CreateFromConfigFile(pluginPath, SharedTypes); - } + var plugin = LoadPlugin(path); if (plugin != null) { - var pluginAssembly = plugin.LoadDefaultAssembly(); + try + { + var pluginAssembly = plugin.LoadDefaultAssembly(); - AddParts(mvcBuilder, pluginAssembly); + AddParts(mvcBuilder, pluginAssembly); - var relatedAssemblies = pluginAssembly.GetCustomAttributes(); + foreach (var relatedAssembly in RelatedAssemblyAttribute.GetRelatedAssemblies(pluginAssembly, false)) + { + AddParts(mvcBuilder, relatedAssembly); + } - foreach (var relatedAssembly in relatedAssemblies) + pluginManager.Add(path, pluginAssembly); + } + catch (Exception ex) { - var assembly = plugin.LoadAssembly(relatedAssembly.AssemblyFileName); - - AddParts(mvcBuilder, assembly); + pluginManager.LogException(path, "LoadingAssembly", ex); } - - pluginManager.Add(pluginAssembly); + } + else + { + pluginManager.LogException(path, "LoadingPlugin", new FileNotFoundException($"Cannot find plugin at {path}")); } } } - pluginManager.Add(SquidexExtensions.Assembly); pluginManager.ConfigureServices(mvcBuilder.Services, configuration); mvcBuilder.Services.AddSingleton(pluginManager); } + private static PluginLoader LoadPlugin(string pluginPath) + { + var fullPath = GetPaths(pluginPath); + + foreach (var candidate in GetPaths(pluginPath)) + { + if (candidate.Extension.Equals(".dll", StringComparison.OrdinalIgnoreCase)) + { + return PluginLoader.CreateFromAssemblyFile(candidate.FullName, SharedTypes); + } + + if (candidate.Extension.Equals(".json", StringComparison.OrdinalIgnoreCase)) + { + return PluginLoader.CreateFromConfigFile(candidate.FullName, SharedTypes); + } + } + + return null; + } + + private static IEnumerable GetPaths(string pluginPath) + { + var candidate = new FileInfo(Path.GetFullPath(pluginPath)); + + if (candidate.Exists) + { + yield return candidate; + } + + if (!Path.IsPathRooted(pluginPath)) + { + candidate = new FileInfo(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), pluginPath)); + + if (candidate.Exists) + { + yield return candidate; + } + } + } + public static void UsePlugins(this IApplicationBuilder app) { var pluginManager = app.ApplicationServices.GetRequiredService(); pluginManager.Configure(app); + + var log = app.ApplicationServices.GetService(); + + if (log != null) + { + pluginManager.Log(log); + } } private static void AddParts(IMvcBuilder mvcBuilder, Assembly assembly) diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index 0cab6d9a6..39b41835a 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -61,9 +61,7 @@ - - @@ -96,7 +94,6 @@ - diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs index 486c5ea25..a1088d534 100644 --- a/src/Squidex/WebStartup.cs +++ b/src/Squidex/WebStartup.cs @@ -78,8 +78,6 @@ namespace Squidex config.GetSection("translations:deepL")); services.Configure( config.GetSection("mode")); - services.Configure( - config.GetSection("twitter")); services.Configure( config.GetSection("robots")); services.Configure( @@ -100,9 +98,10 @@ namespace Squidex services.Configure( config.GetSection("news")); + services.AddHostedService(); + var provider = services.AddAndBuildOrleans(configuration, afterServices => { - afterServices.AddHostedService(); afterServices.AddHostedService(); }); diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json index 8ed70e2bc..8a642f33c 100644 --- a/src/Squidex/appsettings.json +++ b/src/Squidex/appsettings.json @@ -12,18 +12,25 @@ */ "baseUrl": "http://localhost:5000", - /*7 + /* * Set it to true to redirect the user from http to https permanently. */ "enforceHttps": false }, + /* + * Define optional paths to plugins. + */ + "plugins": [ + "Squidex.Extensions.dll" + ], + "etags": { /* * Set to true, to use strong etags. */ - "strong": false - }, + "strong": false +}, "ui": { /* @@ -313,17 +320,6 @@ "privacyUrl": "https://squidex.io/privacy" }, - "twitter": { - /* - * The client id for twitter. - */ - "clientId": "QZhb3HQcGCvE6G8yNNP9ksNet", - /* - * The client secret for twitter. - */ - "clientSecret": "Pdu9wdN72T33KJRFdFy1w4urBKDRzIyuKpc0OItQC2E616DuZD" - }, - "news": { /* * The app name where the news are stored. From de88cc82dbafd93fa34bdde28e75fe690a8e3467 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Wed, 20 Feb 2019 21:50:06 +0100 Subject: [PATCH 05/55] Small bugfixes. --- .../SquidexCoreOperations.cs | 16 +++++++++++++++ .../Plugins/IWebPlugin.cs | 2 +- .../Converters/RuleTriggerDtoFactory.cs | 2 +- src/Squidex/Config/Web/WebServices.cs | 6 +++--- .../Pipeline/Plugins/PluginExtensions.cs | 20 ++++++++++++++++--- src/Squidex/WebStartup.cs | 3 ++- .../angular/forms/control-errors.component.ts | 6 +++++- 7 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 src/Squidex.Domain.Apps.Core.Operations/SquidexCoreOperations.cs diff --git a/src/Squidex.Domain.Apps.Core.Operations/SquidexCoreOperations.cs b/src/Squidex.Domain.Apps.Core.Operations/SquidexCoreOperations.cs new file mode 100644 index 000000000..51c11b47d --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Operations/SquidexCoreOperations.cs @@ -0,0 +1,16 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Reflection; + +namespace Squidex.Domain.Apps.Core +{ + public static class SquidexCoreOperations + { + public static readonly Assembly Assembly = typeof(SquidexCoreOperations).Assembly; + } +} diff --git a/src/Squidex.Infrastructure/Plugins/IWebPlugin.cs b/src/Squidex.Infrastructure/Plugins/IWebPlugin.cs index d8cab06d5..f93e3eadb 100644 --- a/src/Squidex.Infrastructure/Plugins/IWebPlugin.cs +++ b/src/Squidex.Infrastructure/Plugins/IWebPlugin.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Builder; namespace Squidex.Infrastructure.Plugins { - public interface IWebPlugin : I + public interface IWebPlugin : IPlugin { void Configure(IApplicationBuilder app); } diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/Converters/RuleTriggerDtoFactory.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/Converters/RuleTriggerDtoFactory.cs index 2b9bd6328..e0d44e0e4 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/Converters/RuleTriggerDtoFactory.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/Converters/RuleTriggerDtoFactory.cs @@ -33,7 +33,7 @@ namespace Squidex.Areas.Api.Controllers.Rules.Models.Converters public RuleTriggerDto Visit(SchemaChangedTrigger trigger) { - return SimpleMapper.Map(trigger, new AssetChangedRuleTriggerDto()); + return SimpleMapper.Map(trigger, new SchemaChangedRuleTriggerDto()); } public RuleTriggerDto Visit(UsageTrigger trigger) diff --git a/src/Squidex/Config/Web/WebServices.cs b/src/Squidex/Config/Web/WebServices.cs index 315f01547..3bafa44be 100644 --- a/src/Squidex/Config/Web/WebServices.cs +++ b/src/Squidex/Config/Web/WebServices.cs @@ -18,7 +18,7 @@ namespace Squidex.Config.Web { public static class WebServices { - public static void AddMyMvc(this IServiceCollection services, IConfiguration config) + public static void AddMyMvcWithPlugins(this IServiceCollection services, IConfiguration config) { services.AddSingletonAs() .AsSelf(); @@ -50,8 +50,8 @@ namespace Squidex.Config.Web options.Filters.Add(); options.Filters.Add(); }) - .AddMySerializers() - .AddMyPlugins(config); + .AddMyPlugins(config) + .AddMySerializers(); services.AddCors(); services.AddRouting(); diff --git a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs index f89cf24cc..507d285af 100644 --- a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs +++ b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs @@ -14,6 +14,10 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Mvc.ApplicationParts; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Squidex.Domain.Apps.Core; +using Squidex.Domain.Apps.Entities; +using Squidex.Domain.Apps.Events; +using Squidex.Infrastructure; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Plugins; @@ -21,9 +25,17 @@ namespace Squidex.Pipeline.Plugins { public static class PluginExtensions { - private static readonly Type[] SharedTypes = { typeof(IPlugin) }; - - public static void AddMyPlugins(this IMvcBuilder mvcBuilder, IConfiguration configuration) + private static readonly Type[] SharedTypes = + { + typeof(IPlugin), + typeof(SquidexCoreModel), + typeof(SquidexCoreOperations), + typeof(SquidexEntities), + typeof(SquidexEvents), + typeof(SquidexInfrastructure) + }; + + public static IMvcBuilder AddMyPlugins(this IMvcBuilder mvcBuilder, IConfiguration configuration) { var pluginManager = new PluginManager(); @@ -65,6 +77,8 @@ namespace Squidex.Pipeline.Plugins pluginManager.ConfigureServices(mvcBuilder.Services, configuration); mvcBuilder.Services.AddSingleton(pluginManager); + + return mvcBuilder; } private static PluginLoader LoadPlugin(string pluginPath) diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs index a1088d534..0c29f400d 100644 --- a/src/Squidex/WebStartup.cs +++ b/src/Squidex/WebStartup.cs @@ -54,6 +54,8 @@ namespace Squidex services.AddMemoryCache(); services.AddOptions(); + services.AddMyMvcWithPlugins(config); + services.AddMyAssetServices(config); services.AddMyAuthentication(config); services.AddMyEntitiesServices(config); @@ -63,7 +65,6 @@ namespace Squidex services.AddMyInfrastructureServices(config); services.AddMyLoggingServices(config); services.AddMyMigrationServices(); - services.AddMyMvc(config); services.AddMyRuleServices(); services.AddMySerializers(); services.AddMyStoreServices(config); diff --git a/src/Squidex/app/framework/angular/forms/control-errors.component.ts b/src/Squidex/app/framework/angular/forms/control-errors.component.ts index 3a347ad06..0f8533abb 100644 --- a/src/Squidex/app/framework/angular/forms/control-errors.component.ts +++ b/src/Squidex/app/framework/angular/forms/control-errors.component.ts @@ -61,6 +61,10 @@ export class ControlErrorsComponent extends StatefulComponent implements public ngOnDestroy() { super.ngOnDestroy(); + this.unsubscribe(); + } + + private unsubscribe() { if (this.control && this.originalMarkAsTouched) { this.control['markAsTouched'] = this.originalMarkAsTouched; } @@ -86,7 +90,7 @@ export class ControlErrorsComponent extends StatefulComponent implements } if (this.control !== control) { - this.ngOnDestroy(); + this.unsubscribe(); this.control = control; From 50d919aec51143d60bdeccd4dbc40eaae24d8da5 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Thu, 21 Feb 2019 17:39:24 +0100 Subject: [PATCH 06/55] Less hacks. --- .../Actions/Algolia/AlgoliaAction.cs | 1 - .../Actions/Algolia/AlgoliaPlugin.cs | 3 +- .../Actions/AzureQueue/AzureQueueAction.cs | 1 - .../Actions/AzureQueue/AzureQueuePlugin.cs | 3 +- .../Actions/Discourse/DiscourseAction.cs | 1 - .../Actions/Discourse/DiscoursePlugin.cs | 3 +- .../ElasticSearch/ElasticSearchAction.cs | 1 - .../ElasticSearch/ElasticSearchPlugin.cs | 3 +- .../Actions/Email/EmailAction.cs | 1 - .../Actions/Email/EmailPlugin.cs | 3 +- .../Actions/Fastly/FastlyAction.cs | 1 - .../Actions/Fastly/FastlyPlugin.cs | 3 +- .../Actions/Medium/MediumAction.cs | 1 - .../Actions/Medium/MediumPlugin.cs | 3 +- .../Actions/Prerender/PrerenderAction.cs | 1 - .../Actions/Prerender/PrerenderPlugin.cs | 3 +- .../Actions/Slack/SlackAction.cs | 1 - .../Actions/Slack/SlackPlugin.cs | 3 +- .../Actions/Twitter/TweetAction.cs | 1 - .../Actions/Twitter/TwitterPlugin.cs | 3 +- .../Actions/Webhook/WebhookAction.cs | 1 - .../Actions/Webhook/WebhookPlugin.cs | 3 +- .../Schemas/FieldRegistry.cs | 6 +- .../SquidexCoreModel.cs | 2 +- .../DependencyInjectionExtensions.cs | 25 +++ .../HandleRules/RuleActionHandlerAttribute.cs | 30 --- .../HandleRules/RuleActionRegistration.cs | 24 +++ .../HandleRules/RuleActionRegistry.cs | 175 ------------------ .../HandleRules/RuleRegistry.cs | 140 +++++++++++++- .../SquidexEvents.cs | 2 +- .../States/MongoSnapshotStore.cs | 9 +- .../AutoAssembyTypeProvider.cs | 17 ++ .../Configuration/ConfigurationExtensions.cs | 4 +- .../Configuration/Options.cs | 2 +- .../DependencyInjectionExtensions.cs | 4 +- src/Squidex.Infrastructure/ITypeProvider.cs | 14 ++ .../Log/ApplicationInfoLogAppender.cs | 2 +- .../Reflection/ReflectionExtensions.cs | 2 +- .../SquidexInfrastructure.cs | 2 +- .../TypeNameRegistry.cs | 22 ++- .../Api/Config/Swagger/SwaggerServices.cs | 1 - .../Api/Config/Swagger/XmlTagProcessor.cs | 2 +- .../Rules/Models/RuleActionConverter.cs | 4 +- .../Rules/Models/RuleActionProcessor.cs | 16 +- .../Api/Controllers/Rules/RulesController.cs | 11 +- .../Api/Controllers/Users/UsersController.cs | 3 +- .../Config/IdentityServerServices.cs | 3 +- src/Squidex/Config/Domain/AssetServices.cs | 2 - src/Squidex/Config/Domain/EntitiesServices.cs | 2 - .../Config/Domain/EventPublishersServices.cs | 1 - .../Config/Domain/EventStoreServices.cs | 12 +- .../Config/Domain/InfrastructureServices.cs | 1 - src/Squidex/Config/Domain/LoggingServices.cs | 1 - src/Squidex/Config/Domain/RuleServices.cs | 10 +- .../Config/Domain/SerializationInitializer.cs | 41 ++++ .../Config/Domain/SerializationServices.cs | 68 ++++--- src/Squidex/Config/Domain/StoreServices.cs | 27 ++- .../Config/Domain/SubscriptionServices.cs | 1 - src/Squidex/Config/Orleans/OrleansServices.cs | 1 - src/Squidex/Config/Web/WebServices.cs | 1 - src/Squidex/Pipeline/Squid/SquidMiddleware.cs | 3 +- src/Squidex/Pipeline/Swagger/NSwagHelper.cs | 3 +- src/Squidex/WebStartup.cs | 1 - ...egistry.cs => RuleElementRegistryTests.cs} | 13 +- .../TestUtils.cs | 8 +- .../TypeNameRegistryTests.cs | 41 +++- tools/Migrate_01/SquidexMigrations.cs | 2 +- 67 files changed, 449 insertions(+), 356 deletions(-) create mode 100644 src/Squidex.Domain.Apps.Core.Operations/HandleRules/DependencyInjectionExtensions.cs delete mode 100644 src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionHandlerAttribute.cs create mode 100644 src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistration.cs delete mode 100644 src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistry.cs create mode 100644 src/Squidex.Infrastructure/AutoAssembyTypeProvider.cs create mode 100644 src/Squidex.Infrastructure/ITypeProvider.cs create mode 100644 src/Squidex/Config/Domain/SerializationInitializer.cs rename tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/{RuleElementRegistry.cs => RuleElementRegistryTests.cs} (93%) diff --git a/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaAction.cs b/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaAction.cs index c6952b152..eb6c041a4 100644 --- a/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaAction.cs +++ b/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaAction.cs @@ -11,7 +11,6 @@ using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Extensions.Actions.Algolia { - [RuleActionHandler(typeof(AlgoliaActionHandler))] [RuleAction( IconImage = "", IconColor = "#0d9bf9", diff --git a/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaPlugin.cs b/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaPlugin.cs index 71d0f4c08..9ef4538c9 100644 --- a/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaPlugin.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Infrastructure.Plugins; namespace Squidex.Extensions.Actions.Algolia @@ -16,7 +15,7 @@ namespace Squidex.Extensions.Actions.Algolia { public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { - RuleActionRegistry.Add(); + services.AddRuleAction(); } } } diff --git a/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs index 45f176d9f..41c5be7a9 100644 --- a/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs +++ b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs @@ -14,7 +14,6 @@ using Squidex.Infrastructure; namespace Squidex.Extensions.Actions.AzureQueue { - [RuleActionHandler(typeof(AzureQueueActionHandler))] [RuleAction( IconImage = "", IconColor = "#0d9bf9", diff --git a/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueuePlugin.cs b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueuePlugin.cs index e069c08d2..43c84e857 100644 --- a/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueuePlugin.cs +++ b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueuePlugin.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Infrastructure.Plugins; namespace Squidex.Extensions.Actions.AzureQueue @@ -16,7 +15,7 @@ namespace Squidex.Extensions.Actions.AzureQueue { public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { - RuleActionRegistry.Add(); + services.AddRuleAction(); } } } diff --git a/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs b/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs index 97f6b6538..295c7f683 100644 --- a/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs +++ b/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs @@ -13,7 +13,6 @@ using Squidex.Infrastructure; namespace Squidex.Extensions.Actions.Discourse { - [RuleActionHandler(typeof(DiscourseActionHandler))] [RuleAction( IconImage = "", IconColor = "#eB6121", diff --git a/extensions/Squidex.Extensions/Actions/Discourse/DiscoursePlugin.cs b/extensions/Squidex.Extensions/Actions/Discourse/DiscoursePlugin.cs index 2d7d9f6d7..fb1105657 100644 --- a/extensions/Squidex.Extensions/Actions/Discourse/DiscoursePlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Discourse/DiscoursePlugin.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Infrastructure.Plugins; namespace Squidex.Extensions.Actions.Discourse @@ -16,7 +15,7 @@ namespace Squidex.Extensions.Actions.Discourse { public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { - RuleActionRegistry.Add(); + services.AddRuleAction(); } } } diff --git a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs index 00b4a74db..298e4ad66 100644 --- a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs +++ b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs @@ -13,7 +13,6 @@ using Squidex.Infrastructure; namespace Squidex.Extensions.Actions.ElasticSearch { - [RuleActionHandler(typeof(ElasticSearchActionHandler))] [RuleAction( IconImage = "", IconColor = "#1e5470", diff --git a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchPlugin.cs b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchPlugin.cs index 49cf06697..50bdf12d4 100644 --- a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchPlugin.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Infrastructure.Plugins; namespace Squidex.Extensions.Actions.ElasticSearch @@ -16,7 +15,7 @@ namespace Squidex.Extensions.Actions.ElasticSearch { public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { - RuleActionRegistry.Add(); + services.AddRuleAction(); } } } diff --git a/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs b/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs index be24d3166..c801e629b 100644 --- a/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs +++ b/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs @@ -11,7 +11,6 @@ using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Extensions.Actions.Email { - [RuleActionHandler(typeof(EmailActionHandler))] [RuleAction( IconImage = "", IconColor = "#333300", diff --git a/extensions/Squidex.Extensions/Actions/Email/EmailPlugin.cs b/extensions/Squidex.Extensions/Actions/Email/EmailPlugin.cs index 34a5c88ce..aeed28445 100644 --- a/extensions/Squidex.Extensions/Actions/Email/EmailPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Email/EmailPlugin.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Infrastructure.Plugins; namespace Squidex.Extensions.Actions.Email @@ -16,7 +15,7 @@ namespace Squidex.Extensions.Actions.Email { public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { - RuleActionRegistry.Add(); + services.AddRuleAction(); } } } diff --git a/extensions/Squidex.Extensions/Actions/Fastly/FastlyAction.cs b/extensions/Squidex.Extensions/Actions/Fastly/FastlyAction.cs index e4e056ba7..d227e8ce1 100644 --- a/extensions/Squidex.Extensions/Actions/Fastly/FastlyAction.cs +++ b/extensions/Squidex.Extensions/Actions/Fastly/FastlyAction.cs @@ -11,7 +11,6 @@ using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Extensions.Actions.Fastly { - [RuleActionHandler(typeof(FastlyActionHandler))] [RuleAction( IconImage = "", IconColor = "#e23335", diff --git a/extensions/Squidex.Extensions/Actions/Fastly/FastlyPlugin.cs b/extensions/Squidex.Extensions/Actions/Fastly/FastlyPlugin.cs index 8268d912a..f6802dde3 100644 --- a/extensions/Squidex.Extensions/Actions/Fastly/FastlyPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Fastly/FastlyPlugin.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Infrastructure.Plugins; namespace Squidex.Extensions.Actions.Fastly @@ -16,7 +15,7 @@ namespace Squidex.Extensions.Actions.Fastly { public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { - RuleActionRegistry.Add(); + services.AddRuleAction(); } } } diff --git a/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs b/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs index 65eddcefd..3c6ce25e2 100644 --- a/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs +++ b/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs @@ -11,7 +11,6 @@ using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Extensions.Actions.Medium { - [RuleActionHandler(typeof(MediumActionHandler))] [RuleAction( IconImage = "", IconColor = "#00ab6c", diff --git a/extensions/Squidex.Extensions/Actions/Medium/MediumPlugin.cs b/extensions/Squidex.Extensions/Actions/Medium/MediumPlugin.cs index 8a1090672..b2664ac3b 100644 --- a/extensions/Squidex.Extensions/Actions/Medium/MediumPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Medium/MediumPlugin.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Infrastructure.Plugins; namespace Squidex.Extensions.Actions.Medium @@ -16,7 +15,7 @@ namespace Squidex.Extensions.Actions.Medium { public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { - RuleActionRegistry.Add(); + services.AddRuleAction(); } } } diff --git a/extensions/Squidex.Extensions/Actions/Prerender/PrerenderAction.cs b/extensions/Squidex.Extensions/Actions/Prerender/PrerenderAction.cs index 0978a79a4..44285379f 100644 --- a/extensions/Squidex.Extensions/Actions/Prerender/PrerenderAction.cs +++ b/extensions/Squidex.Extensions/Actions/Prerender/PrerenderAction.cs @@ -11,7 +11,6 @@ using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Extensions.Actions.Prerender { - [RuleActionHandler(typeof(PrerenderActionHandler))] [RuleAction( IconImage = "", IconColor = "#2c3e50", diff --git a/extensions/Squidex.Extensions/Actions/Prerender/PrerenderPlugin.cs b/extensions/Squidex.Extensions/Actions/Prerender/PrerenderPlugin.cs index 89e1a6c9b..fcf623e3f 100644 --- a/extensions/Squidex.Extensions/Actions/Prerender/PrerenderPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Prerender/PrerenderPlugin.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Infrastructure.Plugins; namespace Squidex.Extensions.Actions.Prerender @@ -16,7 +15,7 @@ namespace Squidex.Extensions.Actions.Prerender { public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { - RuleActionRegistry.Add(); + services.AddRuleAction(); } } } diff --git a/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs b/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs index 47e1dddc7..9b1382530 100644 --- a/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs +++ b/extensions/Squidex.Extensions/Actions/Slack/SlackAction.cs @@ -13,7 +13,6 @@ using Squidex.Infrastructure; namespace Squidex.Extensions.Actions.Slack { - [RuleActionHandler(typeof(SlackActionHandler))] [RuleAction( IconImage = "", IconColor = "#5c3a58", diff --git a/extensions/Squidex.Extensions/Actions/Slack/SlackPlugin.cs b/extensions/Squidex.Extensions/Actions/Slack/SlackPlugin.cs index 1149a5875..f0463c87e 100644 --- a/extensions/Squidex.Extensions/Actions/Slack/SlackPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Slack/SlackPlugin.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Infrastructure.Plugins; namespace Squidex.Extensions.Actions.Slack @@ -16,7 +15,7 @@ namespace Squidex.Extensions.Actions.Slack { public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { - RuleActionRegistry.Add(); + services.AddRuleAction(); } } } diff --git a/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs b/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs index c23b3dd98..5f68d9fd4 100644 --- a/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs +++ b/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs @@ -11,7 +11,6 @@ using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Extensions.Actions.Twitter { - [RuleActionHandler(typeof(TweetActionHandler))] [RuleAction( IconImage = "", IconColor = "#1da1f2", diff --git a/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs b/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs index 911db17d3..fd59ec980 100644 --- a/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Infrastructure.Plugins; namespace Squidex.Extensions.Actions.Twitter @@ -19,7 +18,7 @@ namespace Squidex.Extensions.Actions.Twitter services.Configure( configuration.GetSection("twitter")); - RuleActionRegistry.Add(); + services.AddRuleAction(); } } } diff --git a/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs b/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs index cdd50c429..2cf8e339a 100644 --- a/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs +++ b/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs @@ -13,7 +13,6 @@ using Squidex.Infrastructure; namespace Squidex.Extensions.Actions.Webhook { - [RuleActionHandler(typeof(WebhookActionHandler))] [RuleAction( IconImage = "", IconColor = "#4bb958", diff --git a/extensions/Squidex.Extensions/Actions/Webhook/WebhookPlugin.cs b/extensions/Squidex.Extensions/Actions/Webhook/WebhookPlugin.cs index c9786cdf0..d729f1b5e 100644 --- a/extensions/Squidex.Extensions/Actions/Webhook/WebhookPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Webhook/WebhookPlugin.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Infrastructure.Plugins; namespace Squidex.Extensions.Actions.Webhook @@ -16,7 +15,7 @@ namespace Squidex.Extensions.Actions.Webhook { public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { - RuleActionRegistry.Add(); + services.AddRuleAction(); } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldRegistry.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldRegistry.cs index f4049da06..6154cff13 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldRegistry.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldRegistry.cs @@ -12,12 +12,12 @@ using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Core.Schemas { - public static class FieldRegistry + public class FieldRegistry : ITypeProvider { private const string Suffix = "Properties"; private const string SuffixOld = "FieldProperties"; - public static TypeNameRegistry MapFields(this TypeNameRegistry typeNameRegistry) + public void Map(TypeNameRegistry typeNameRegistry) { var types = typeof(FieldRegistry).Assembly.GetTypes().Where(x => typeof(FieldProperties).IsAssignableFrom(x) && !x.IsAbstract); @@ -32,8 +32,6 @@ namespace Squidex.Domain.Apps.Core.Schemas typeNameRegistry.MapObsolete(type, type.TypeName(false, SuffixOld)); } } - - return typeNameRegistry; } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/SquidexCoreModel.cs b/src/Squidex.Domain.Apps.Core.Model/SquidexCoreModel.cs index 6f4f99495..860a9421a 100644 --- a/src/Squidex.Domain.Apps.Core.Model/SquidexCoreModel.cs +++ b/src/Squidex.Domain.Apps.Core.Model/SquidexCoreModel.cs @@ -9,7 +9,7 @@ using System.Reflection; namespace Squidex.Domain.Apps.Core { - public static class SquidexCoreModel + public sealed class SquidexCoreModel { public static readonly Assembly Assembly = typeof(SquidexCoreModel).Assembly; } diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/DependencyInjectionExtensions.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/DependencyInjectionExtensions.cs new file mode 100644 index 000000000..1113bcfbb --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/DependencyInjectionExtensions.cs @@ -0,0 +1,25 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Domain.Apps.Core.Rules; + +namespace Microsoft.Extensions.DependencyInjection +{ + public static class DependencyInjectionExtensions + { + public static IServiceCollection AddRuleAction(this IServiceCollection services) where THandler : class, IRuleActionHandler where TAction : RuleAction + { + services.AddSingletonAs() + .As(); + + services.AddSingleton(new RuleActionRegistration(typeof(TAction))); + + return services; + } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionHandlerAttribute.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionHandlerAttribute.cs deleted file mode 100644 index 24d29ccea..000000000 --- a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionHandlerAttribute.cs +++ /dev/null @@ -1,30 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using Squidex.Infrastructure; - -namespace Squidex.Domain.Apps.Core.HandleRules -{ - [AttributeUsage(AttributeTargets.Class, Inherited = false)] - public sealed class RuleActionHandlerAttribute : Attribute - { - public Type HandlerType { get; } - - public RuleActionHandlerAttribute(Type handlerType) - { - Guard.NotNull(handlerType, nameof(handlerType)); - - HandlerType = handlerType; - - if (!typeof(IRuleActionHandler).IsAssignableFrom(handlerType)) - { - throw new ArgumentException($"Handler type must implement {typeof(IRuleActionHandler)}.", nameof(handlerType)); - } - } - } -} diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistration.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistration.cs new file mode 100644 index 000000000..2d0477228 --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistration.cs @@ -0,0 +1,24 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Core.HandleRules +{ + public sealed class RuleActionRegistration + { + public Type ActionType { get; } + + internal RuleActionRegistration(Type actionType) + { + Guard.NotNull(actionType, nameof(actionType)); + + ActionType = actionType; + } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistry.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistry.cs deleted file mode 100644 index c1eebfb1e..000000000 --- a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleActionRegistry.cs +++ /dev/null @@ -1,175 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Reflection; -using Squidex.Domain.Apps.Core.Rules; -using Squidex.Infrastructure; - -namespace Squidex.Domain.Apps.Core.HandleRules -{ - public static class RuleActionRegistry - { - private const string ActionSuffix = "Action"; - private const string ActionSuffixV2 = "ActionV2"; - private static readonly HashSet ActionHandlerTypes = new HashSet(); - private static readonly Dictionary ActionTypes = new Dictionary(); - - public static IReadOnlyDictionary Actions - { - get { return ActionTypes; } - } - - public static IReadOnlyCollection ActionHandlers - { - get { return ActionHandlerTypes; } - } - - static RuleActionRegistry() - { - var actionTypes = - typeof(RuleActionRegistry).Assembly - .GetTypes() - .Where(x => typeof(RuleAction).IsAssignableFrom(x)) - .Where(x => x.GetCustomAttribute() != null) - .Where(x => x.GetCustomAttribute() != null) - .ToList(); - - foreach (var actionType in actionTypes) - { - Add(actionType); - } - } - - public static void Add() where T : RuleAction - { - Add(typeof(T)); - } - - private static void Add(Type actionType) - { - var metadata = actionType.GetCustomAttribute(); - - if (metadata == null) - { - return; - } - - var handlerAttribute = actionType.GetCustomAttribute(); - - if (handlerAttribute == null) - { - return; - } - - var name = GetActionName(actionType); - - var definition = - new RuleActionDefinition - { - Type = actionType, - Display = metadata.Display, - Description = metadata.Description, - IconColor = metadata.IconColor, - IconImage = metadata.IconImage, - ReadMore = metadata.ReadMore - }; - - foreach (var property in actionType.GetProperties()) - { - if (property.CanRead && property.CanWrite) - { - var actionProperty = new RuleActionProperty { Name = property.Name.ToCamelCase(), Display = property.Name }; - - var display = property.GetCustomAttribute(); - - if (!string.IsNullOrWhiteSpace(display?.Name)) - { - actionProperty.Display = display.Name; - } - - if (!string.IsNullOrWhiteSpace(display?.Description)) - { - actionProperty.Description = display.Description; - } - - var type = property.PropertyType; - - if ((property.GetCustomAttribute() != null || (type.IsValueType && !IsNullable(type))) && type != typeof(bool) && type != typeof(bool?)) - { - actionProperty.IsRequired = true; - } - - if (property.GetCustomAttribute() != null) - { - actionProperty.IsFormattable = true; - } - - var dataType = property.GetCustomAttribute()?.DataType; - - if (type == typeof(bool) || type == typeof(bool?)) - { - actionProperty.Editor = RuleActionPropertyEditor.Checkbox; - } - else if (type == typeof(int) || type == typeof(int?)) - { - actionProperty.Editor = RuleActionPropertyEditor.Number; - } - else if (dataType == DataType.Url) - { - actionProperty.Editor = RuleActionPropertyEditor.Url; - } - else if (dataType == DataType.Password) - { - actionProperty.Editor = RuleActionPropertyEditor.Password; - } - else if (dataType == DataType.EmailAddress) - { - actionProperty.Editor = RuleActionPropertyEditor.Email; - } - else if (dataType == DataType.MultilineText) - { - actionProperty.Editor = RuleActionPropertyEditor.TextArea; - } - else - { - actionProperty.Editor = RuleActionPropertyEditor.Text; - } - - definition.Properties.Add(actionProperty); - } - } - - ActionTypes[name] = definition; - - ActionHandlerTypes.Add(actionType.GetCustomAttribute().HandlerType); - } - - private static bool IsNullable(Type type) - { - return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>); - } - - public static TypeNameRegistry MapRuleActions(this TypeNameRegistry typeNameRegistry) - { - foreach (var actionType in ActionTypes.Values) - { - typeNameRegistry.Map(actionType.Type, actionType.Type.Name); - } - - return typeNameRegistry; - } - - private static string GetActionName(Type type) - { - return type.TypeName(false, ActionSuffix, ActionSuffixV2); - } - } -} diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleRegistry.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleRegistry.cs index 31228cadd..ac9789a9f 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleRegistry.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleRegistry.cs @@ -7,17 +7,151 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Reflection; using Squidex.Domain.Apps.Core.HandleRules.EnrichedEvents; using Squidex.Domain.Apps.Core.Rules; using Squidex.Infrastructure; +#pragma warning disable RECS0033 // Convert 'if' to '||' expression + namespace Squidex.Domain.Apps.Core.HandleRules { - public static class RuleRegistry + public sealed class RuleRegistry : ITypeProvider { - public static TypeNameRegistry MapRules(this TypeNameRegistry typeNameRegistry) + private const string ActionSuffix = "Action"; + private const string ActionSuffixV2 = "ActionV2"; + private readonly Dictionary actionTypes = new Dictionary(); + + public IReadOnlyDictionary Actions { + get { return actionTypes; } + } + + public RuleRegistry(IEnumerable registrations = null) + { + if (registrations != null) + { + foreach (var registration in registrations) + { + Add(registration.ActionType); + } + } + } + + public void Add() where T : RuleAction + { + Add(typeof(T)); + } + + private void Add(Type actionType) + { + var metadata = actionType.GetCustomAttribute(); + + if (metadata == null) + { + return; + } + + var name = GetActionName(actionType); + + var definition = + new RuleActionDefinition + { + Type = actionType, + Display = metadata.Display, + Description = metadata.Description, + IconColor = metadata.IconColor, + IconImage = metadata.IconImage, + ReadMore = metadata.ReadMore + }; + + foreach (var property in actionType.GetProperties()) + { + if (property.CanRead && property.CanWrite) + { + var actionProperty = new RuleActionProperty { Name = property.Name.ToCamelCase(), Display = property.Name }; + + var display = property.GetCustomAttribute(); + + if (!string.IsNullOrWhiteSpace(display?.Name)) + { + actionProperty.Display = display.Name; + } + + if (!string.IsNullOrWhiteSpace(display?.Description)) + { + actionProperty.Description = display.Description; + } + + var type = property.PropertyType; + + if ((property.GetCustomAttribute() != null || (type.IsValueType && !IsNullable(type))) && type != typeof(bool) && type != typeof(bool?)) + { + actionProperty.IsRequired = true; + } + + if (property.GetCustomAttribute() != null) + { + actionProperty.IsFormattable = true; + } + + var dataType = property.GetCustomAttribute()?.DataType; + + if (type == typeof(bool) || type == typeof(bool?)) + { + actionProperty.Editor = RuleActionPropertyEditor.Checkbox; + } + else if (type == typeof(int) || type == typeof(int?)) + { + actionProperty.Editor = RuleActionPropertyEditor.Number; + } + else if (dataType == DataType.Url) + { + actionProperty.Editor = RuleActionPropertyEditor.Url; + } + else if (dataType == DataType.Password) + { + actionProperty.Editor = RuleActionPropertyEditor.Password; + } + else if (dataType == DataType.EmailAddress) + { + actionProperty.Editor = RuleActionPropertyEditor.Email; + } + else if (dataType == DataType.MultilineText) + { + actionProperty.Editor = RuleActionPropertyEditor.TextArea; + } + else + { + actionProperty.Editor = RuleActionPropertyEditor.Text; + } + + definition.Properties.Add(actionProperty); + } + } + + actionTypes[name] = definition; + } + + private static bool IsNullable(Type type) + { + return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>); + } + + private static string GetActionName(Type type) + { + return type.TypeName(false, ActionSuffix, ActionSuffixV2); + } + + public void Map(TypeNameRegistry typeNameRegistry) + { + foreach (var actionType in actionTypes.Values) + { + typeNameRegistry.Map(actionType.Type, actionType.Type.Name); + } + var eventTypes = typeof(EnrichedEvent).Assembly.GetTypes().Where(x => typeof(EnrichedEvent).IsAssignableFrom(x) && !x.IsAbstract); var addedTypes = new HashSet(); @@ -39,8 +173,6 @@ namespace Squidex.Domain.Apps.Core.HandleRules typeNameRegistry.Map(type, type.Name); } } - - return typeNameRegistry; } } } diff --git a/src/Squidex.Domain.Apps.Events/SquidexEvents.cs b/src/Squidex.Domain.Apps.Events/SquidexEvents.cs index d49cb8921..7f85deb57 100644 --- a/src/Squidex.Domain.Apps.Events/SquidexEvents.cs +++ b/src/Squidex.Domain.Apps.Events/SquidexEvents.cs @@ -9,7 +9,7 @@ using System.Reflection; namespace Squidex.Domain.Apps.Events { - public static class SquidexEvents + public sealed class SquidexEvents { public static readonly Assembly Assembly = typeof(SquidexEvents).Assembly; } diff --git a/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs b/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs index 3f0a356b1..2b6cd2643 100644 --- a/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs +++ b/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs @@ -5,10 +5,12 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; using System.Linq; using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; +using Newtonsoft.Json; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.MongoDb; @@ -16,9 +18,12 @@ namespace Squidex.Infrastructure.States { public class MongoSnapshotStore : MongoRepositoryBase>, ISnapshotStore { - public MongoSnapshotStore(IMongoDatabase database) + public MongoSnapshotStore(IMongoDatabase database, JsonSerializer jsonSerializer) : base(database) { + Guard.NotNull(jsonSerializer, nameof(jsonSerializer)); + + BsonJsonConvention.Register(jsonSerializer); } protected override string CollectionName() @@ -55,7 +60,7 @@ namespace Squidex.Infrastructure.States } } - public async Task ReadAllAsync(System.Func callback) + public async Task ReadAllAsync(Func callback) { using (Profiler.TraceMethod>()) { diff --git a/src/Squidex.Infrastructure/AutoAssembyTypeProvider.cs b/src/Squidex.Infrastructure/AutoAssembyTypeProvider.cs new file mode 100644 index 000000000..1cb4f5ee5 --- /dev/null +++ b/src/Squidex.Infrastructure/AutoAssembyTypeProvider.cs @@ -0,0 +1,17 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Infrastructure +{ + public sealed class AutoAssembyTypeProvider : ITypeProvider + { + public void Map(TypeNameRegistry typeNameRegistry) + { + typeNameRegistry.MapUnmapped(typeof(T).Assembly); + } + } +} diff --git a/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs b/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs index 2194f753b..62d0521a4 100644 --- a/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs +++ b/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs @@ -7,9 +7,9 @@ using System.Globalization; using System.Linq; -using Microsoft.Extensions.Configuration; +using Squidex.Infrastructure; -namespace Squidex.Infrastructure.Configuration +namespace Microsoft.Extensions.Configuration { public static class ConfigurationExtensions { diff --git a/src/Squidex.Infrastructure/Configuration/Options.cs b/src/Squidex.Infrastructure/Configuration/Options.cs index 79a3cdfae..89cb9f596 100644 --- a/src/Squidex.Infrastructure/Configuration/Options.cs +++ b/src/Squidex.Infrastructure/Configuration/Options.cs @@ -8,7 +8,7 @@ using System; using System.Collections.Generic; -namespace Squidex.Infrastructure.Configuration +namespace Microsoft.Extensions.Configuration { public sealed class Options : Dictionary { diff --git a/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs b/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs index 5b39ad14b..da40d75eb 100644 --- a/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs +++ b/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs @@ -7,10 +7,10 @@ using System; using System.Linq; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using Squidex.Infrastructure; -namespace Squidex.Infrastructure.DependencyInjection +namespace Microsoft.Extensions.DependencyInjection { public static class DependencyInjectionExtensions { diff --git a/src/Squidex.Infrastructure/ITypeProvider.cs b/src/Squidex.Infrastructure/ITypeProvider.cs new file mode 100644 index 000000000..63ee58238 --- /dev/null +++ b/src/Squidex.Infrastructure/ITypeProvider.cs @@ -0,0 +1,14 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Infrastructure +{ + public interface ITypeProvider + { + void Map(TypeNameRegistry typeNameRegistry); + } +} diff --git a/src/Squidex.Infrastructure/Log/ApplicationInfoLogAppender.cs b/src/Squidex.Infrastructure/Log/ApplicationInfoLogAppender.cs index 9763aabf8..9d13c43b8 100644 --- a/src/Squidex.Infrastructure/Log/ApplicationInfoLogAppender.cs +++ b/src/Squidex.Infrastructure/Log/ApplicationInfoLogAppender.cs @@ -17,7 +17,7 @@ namespace Squidex.Infrastructure.Log private readonly string applicationSessionId; public ApplicationInfoLogAppender(Type type, Guid applicationSession) - : this(type?.GetTypeInfo().Assembly, applicationSession) + : this(type?.Assembly, applicationSession) { } diff --git a/src/Squidex.Infrastructure/Reflection/ReflectionExtensions.cs b/src/Squidex.Infrastructure/Reflection/ReflectionExtensions.cs index 474f55355..55354eb13 100644 --- a/src/Squidex.Infrastructure/Reflection/ReflectionExtensions.cs +++ b/src/Squidex.Infrastructure/Reflection/ReflectionExtensions.cs @@ -21,7 +21,7 @@ namespace Squidex.Infrastructure.Reflection BindingFlags.Public | BindingFlags.Instance; - if (!type.GetTypeInfo().IsInterface) + if (!type.IsInterface) { return type.GetProperties(bindingFlags); } diff --git a/src/Squidex.Infrastructure/SquidexInfrastructure.cs b/src/Squidex.Infrastructure/SquidexInfrastructure.cs index 8dac58f91..20444d138 100644 --- a/src/Squidex.Infrastructure/SquidexInfrastructure.cs +++ b/src/Squidex.Infrastructure/SquidexInfrastructure.cs @@ -9,7 +9,7 @@ using System.Reflection; namespace Squidex.Infrastructure { - public static class SquidexInfrastructure + public sealed class SquidexInfrastructure { public static readonly Assembly Assembly = typeof(SquidexInfrastructure).Assembly; } diff --git a/src/Squidex.Infrastructure/TypeNameRegistry.cs b/src/Squidex.Infrastructure/TypeNameRegistry.cs index 233f5ee28..5df5f9f00 100644 --- a/src/Squidex.Infrastructure/TypeNameRegistry.cs +++ b/src/Squidex.Infrastructure/TypeNameRegistry.cs @@ -16,6 +16,17 @@ namespace Squidex.Infrastructure private readonly Dictionary namesByType = new Dictionary(); private readonly Dictionary typesByName = new Dictionary(StringComparer.OrdinalIgnoreCase); + public TypeNameRegistry(IEnumerable providers = null) + { + if (providers != null) + { + foreach (var provider in providers) + { + Map(provider); + } + } + } + public TypeNameRegistry MapObsolete(Type type, string name) { Guard.NotNull(type, nameof(type)); @@ -36,11 +47,20 @@ namespace Squidex.Infrastructure return this; } + public TypeNameRegistry Map(ITypeProvider provider) + { + Guard.NotNull(provider, nameof(provider)); + + provider.Map(this); + + return this; + } + public TypeNameRegistry Map(Type type) { Guard.NotNull(type, nameof(type)); - var typeNameAttribute = type.GetTypeInfo().GetCustomAttribute(); + var typeNameAttribute = type.GetCustomAttribute(); if (!string.IsNullOrWhiteSpace(typeNameAttribute?.TypeName)) { diff --git a/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs b/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs index 07a973ea4..ddccd616c 100644 --- a/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs @@ -15,7 +15,6 @@ using NSwag.SwaggerGeneration.Processors; using Squidex.Areas.Api.Controllers.Contents.Generator; using Squidex.Areas.Api.Controllers.Rules.Models; using Squidex.Infrastructure; -using Squidex.Infrastructure.DependencyInjection; namespace Squidex.Areas.Api.Config.Swagger { diff --git a/src/Squidex/Areas/Api/Config/Swagger/XmlTagProcessor.cs b/src/Squidex/Areas/Api/Config/Swagger/XmlTagProcessor.cs index 01dc1c73b..b0ecdf36d 100644 --- a/src/Squidex/Areas/Api/Config/Swagger/XmlTagProcessor.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/XmlTagProcessor.cs @@ -22,7 +22,7 @@ namespace Squidex.Areas.Api.Config.Swagger { foreach (var controllerType in context.ControllerTypes) { - var attribute = controllerType.GetTypeInfo().GetCustomAttribute(); + var attribute = controllerType.GetCustomAttribute(); if (attribute != null) { diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs index b36243b4f..50b4446e0 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs @@ -7,15 +7,13 @@ using System; using System.Collections.Generic; -using System.Linq; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Areas.Api.Controllers.Rules.Models { public sealed class RuleActionConverter : MyJsonInheritanceConverter { - private static readonly Dictionary Mapping = RuleActionRegistry.Actions.ToDictionary(x => x.Key, x => x.Value.Type); + public static IReadOnlyDictionary Mapping { get; set; } public RuleActionConverter() : base("actionType", Mapping) diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs index b2abd5b91..b0337ed42 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs @@ -13,11 +13,21 @@ using NSwag.SwaggerGeneration.Processors; using NSwag.SwaggerGeneration.Processors.Contexts; using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; +using Squidex.Infrastructure; namespace Squidex.Areas.Api.Controllers.Rules.Models { public sealed class RuleActionProcessor : IDocumentProcessor { + private readonly RuleRegistry ruleRegistry; + + public RuleActionProcessor(RuleRegistry ruleRegistry) + { + Guard.NotNull(ruleRegistry, nameof(ruleRegistry)); + + this.ruleRegistry = ruleRegistry; + } + public async Task ProcessAsync(DocumentProcessorContext context) { try @@ -36,16 +46,16 @@ namespace Squidex.Areas.Api.Controllers.Rules.Models Type = JsonObjectType.String, IsRequired = true }; - foreach (var derived in RuleActionRegistry.Actions) + foreach (var action in ruleRegistry.Actions) { - var derivedSchema = await context.SchemaGenerator.GenerateAsync(derived.Value.Type, context.SchemaResolver); + var derivedSchema = await context.SchemaGenerator.GenerateAsync(action.Value.Type, context.SchemaResolver); var oldName = context.Document.Definitions.FirstOrDefault(x => x.Value == derivedSchema).Key; if (oldName != null) { context.Document.Definitions.Remove(oldName); - context.Document.Definitions.Add(derived.Key, derivedSchema); + context.Document.Definitions.Add(action.Key, derivedSchema); } } diff --git a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs index d3d7edd1b..edecc7b6f 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs @@ -30,17 +30,18 @@ namespace Squidex.Areas.Api.Controllers.Rules [ApiExplorerSettings(GroupName = nameof(Rules))] public sealed class RulesController : ApiController { - private static readonly string RuleActionsEtag = string.Join(";", RuleActionRegistry.Actions.Select(x => x.Key)).Sha256Base64(); private readonly IAppProvider appProvider; private readonly IRuleEventRepository ruleEventsRepository; + private readonly RuleRegistry ruleRegistry; public RulesController(ICommandBus commandBus, IAppProvider appProvider, - IRuleEventRepository ruleEventsRepository) + IRuleEventRepository ruleEventsRepository, RuleRegistry ruleRegistry) : base(commandBus) { this.appProvider = appProvider; this.ruleEventsRepository = ruleEventsRepository; + this.ruleRegistry = ruleRegistry; } /// @@ -56,9 +57,11 @@ namespace Squidex.Areas.Api.Controllers.Rules [ApiCosts(0)] public IActionResult GetActions() { - var response = RuleActionRegistry.Actions.ToDictionary(x => x.Key, x => RuleElementDto.FromDefinition(x.Value)); + var etag = string.Join(";", ruleRegistry.Actions.Select(x => x.Key)).Sha256Base64(); - Response.Headers[HeaderNames.ETag] = RuleActionsEtag; + var response = ruleRegistry.Actions.ToDictionary(x => x.Key, x => RuleElementDto.FromDefinition(x.Value)); + + Response.Headers[HeaderNames.ETag] = etag; return Ok(response); } diff --git a/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs b/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs index 3aef01d84..ea9cc4de7 100644 --- a/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs +++ b/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs @@ -9,7 +9,6 @@ using System; using System.IO; using System.Linq; using System.Net.Http; -using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Squidex.Areas.Api.Controllers.Users.Models; @@ -34,7 +33,7 @@ namespace Squidex.Areas.Api.Controllers.Users static UsersController() { - var assembly = typeof(UsersController).GetTypeInfo().Assembly; + var assembly = typeof(UsersController).Assembly; using (var avatarStream = assembly.GetManifestResourceStream("Squidex.Areas.Api.Controllers.Users.Assets.Avatar.png")) { diff --git a/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs b/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs index f5025efd6..ef07a13b6 100644 --- a/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs +++ b/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs @@ -6,7 +6,6 @@ // ========================================================================== using System.Collections.Generic; -using System.Reflection; using System.Security.Cryptography.X509Certificates; using IdentityModel; using IdentityServer4.Models; @@ -29,7 +28,7 @@ namespace Squidex.Areas.IdentityServer.Config { X509Certificate2 certificate; - var assembly = typeof(IdentityServerServices).GetTypeInfo().Assembly; + var assembly = typeof(IdentityServerServices).Assembly; using (var certStream = assembly.GetManifestResourceStream("Squidex.Areas.IdentityServer.Config.Cert.IdentityCert.pfx")) { diff --git a/src/Squidex/Config/Domain/AssetServices.cs b/src/Squidex/Config/Domain/AssetServices.cs index d23731ed3..617c8ff8c 100644 --- a/src/Squidex/Config/Domain/AssetServices.cs +++ b/src/Squidex/Config/Domain/AssetServices.cs @@ -12,8 +12,6 @@ using MongoDB.Driver.GridFS; using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Assets.ImageSharp; -using Squidex.Infrastructure.Configuration; -using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.Log; namespace Squidex.Config.Domain diff --git a/src/Squidex/Config/Domain/EntitiesServices.cs b/src/Squidex/Config/Domain/EntitiesServices.cs index 3bf99f5a2..c7a215257 100644 --- a/src/Squidex/Config/Domain/EntitiesServices.cs +++ b/src/Squidex/Config/Domain/EntitiesServices.cs @@ -42,8 +42,6 @@ using Squidex.Domain.Apps.Entities.Schemas.Indexes; using Squidex.Domain.Apps.Entities.Tags; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; -using Squidex.Infrastructure.Configuration; -using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Migrations; using Squidex.Pipeline; diff --git a/src/Squidex/Config/Domain/EventPublishersServices.cs b/src/Squidex/Config/Domain/EventPublishersServices.cs index 82004c1db..dad6cd6ec 100644 --- a/src/Squidex/Config/Domain/EventPublishersServices.cs +++ b/src/Squidex/Config/Domain/EventPublishersServices.cs @@ -10,7 +10,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Infrastructure; using Squidex.Infrastructure.CQRS.Events; -using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Json; diff --git a/src/Squidex/Config/Domain/EventStoreServices.cs b/src/Squidex/Config/Domain/EventStoreServices.cs index 94bebf145..abd77f817 100644 --- a/src/Squidex/Config/Domain/EventStoreServices.cs +++ b/src/Squidex/Config/Domain/EventStoreServices.cs @@ -11,8 +11,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using MongoDB.Driver; using Squidex.Infrastructure; -using Squidex.Infrastructure.Configuration; -using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.Diagnostics; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.EventSourcing.Grains; @@ -47,12 +45,14 @@ namespace Squidex.Config.Domain var eventStoreProjectionHost = config.GetRequiredValue("eventStore:getEventStore:projectionHost"); var eventStorePrefix = config.GetValue("eventStore:getEventStore:prefix"); - var connection = EventStoreConnection.Create(eventStoreConfiguration); - - services.AddSingletonAs(connection) + services.AddSingletonAs(_ => EventStoreConnection.Create(eventStoreConfiguration)) .As(); - services.AddSingletonAs(c => new GetEventStore(connection, c.GetRequiredService(), eventStorePrefix, eventStoreProjectionHost)) + services.AddSingletonAs(c => new GetEventStore( + c.GetRequiredService(), + c.GetRequiredService(), + eventStorePrefix, + eventStoreProjectionHost)) .AsOptional(); services.AddHealthChecks() diff --git a/src/Squidex/Config/Domain/InfrastructureServices.cs b/src/Squidex/Config/Domain/InfrastructureServices.cs index 9ae8bf331..8e1b2e042 100644 --- a/src/Squidex/Config/Domain/InfrastructureServices.cs +++ b/src/Squidex/Config/Domain/InfrastructureServices.cs @@ -18,7 +18,6 @@ using Squidex.Domain.Apps.Entities.Apps.Diagnostics; using Squidex.Domain.Users; using Squidex.Infrastructure; using Squidex.Infrastructure.Caching; -using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.Diagnostics; using Squidex.Infrastructure.Translations; using Squidex.Infrastructure.UsageTracking; diff --git a/src/Squidex/Config/Domain/LoggingServices.cs b/src/Squidex/Config/Domain/LoggingServices.cs index dfc45d04c..59e7932e3 100644 --- a/src/Squidex/Config/Domain/LoggingServices.cs +++ b/src/Squidex/Config/Domain/LoggingServices.cs @@ -9,7 +9,6 @@ using System; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Domain.Apps.Entities.Apps; -using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.Log; using Squidex.Pipeline; diff --git a/src/Squidex/Config/Domain/RuleServices.cs b/src/Squidex/Config/Domain/RuleServices.cs index 685bc2077..eb8ad2cca 100644 --- a/src/Squidex/Config/Domain/RuleServices.cs +++ b/src/Squidex/Config/Domain/RuleServices.cs @@ -12,7 +12,7 @@ using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Rules; using Squidex.Domain.Apps.Entities.Rules.UsageTracking; using Squidex.Domain.Apps.Entities.Schemas; -using Squidex.Infrastructure.DependencyInjection; +using Squidex.Infrastructure; using Squidex.Infrastructure.EventSourcing; namespace Squidex.Config.Domain @@ -39,16 +39,14 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .As(); + services.AddSingletonAs() + .As().AsSelf(); + services.AddSingletonAs() .AsSelf(); services.AddSingletonAs() .AsSelf(); - - foreach (var actionHandler in RuleActionRegistry.ActionHandlers) - { - services.AddSingleton(typeof(IRuleActionHandler), actionHandler); - } } } } diff --git a/src/Squidex/Config/Domain/SerializationInitializer.cs b/src/Squidex/Config/Domain/SerializationInitializer.cs new file mode 100644 index 000000000..bdec8c549 --- /dev/null +++ b/src/Squidex/Config/Domain/SerializationInitializer.cs @@ -0,0 +1,41 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using Newtonsoft.Json; +using Squidex.Areas.Api.Controllers.Rules.Models; +using Squidex.Domain.Apps.Core.HandleRules; +using Squidex.Infrastructure; +using Squidex.Infrastructure.MongoDb; +using Squidex.Infrastructure.Tasks; + +namespace Squidex.Config.Domain +{ + public sealed class SerializationInitializer : IInitializable + { + private readonly JsonSerializer jsonSerializer; + private readonly RuleRegistry ruleRegistry; + + public SerializationInitializer(JsonSerializer jsonSerializer, RuleRegistry ruleRegistry) + { + this.jsonSerializer = jsonSerializer; + + this.ruleRegistry = ruleRegistry; + } + + public Task InitializeAsync(CancellationToken ct = default) + { + BsonJsonConvention.Register(jsonSerializer); + + RuleActionConverter.Mapping = ruleRegistry.Actions.ToDictionary(x => x.Key, x => x.Value.Type); + + return TaskHelper.Done; + } + } +} diff --git a/src/Squidex/Config/Domain/SerializationServices.cs b/src/Squidex/Config/Domain/SerializationServices.cs index 4ef371ba4..30f1b27bf 100644 --- a/src/Squidex/Config/Domain/SerializationServices.cs +++ b/src/Squidex/Config/Domain/SerializationServices.cs @@ -11,7 +11,6 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.Apps.Json; -using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules.Json; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Schemas.Json; @@ -24,23 +23,8 @@ namespace Squidex.Config.Domain { public static class SerializationServices { - private static readonly TypeNameRegistry TypeNameRegistry = - new TypeNameRegistry() - .MapFields() - .MapRules() - .MapRuleActions() - .MapUnmapped(SquidexCoreModel.Assembly) - .MapUnmapped(SquidexEvents.Assembly) - .MapUnmapped(SquidexInfrastructure.Assembly) - .MapUnmapped(SquidexMigrations.Assembly); - - public static readonly JsonSerializerSettings DefaultJsonSettings = new JsonSerializerSettings(); - public static readonly JsonSerializer DefaultJsonSerializer; - - private static void ConfigureJson(JsonSerializerSettings settings, TypeNameHandling typeNameHandling) + private static JsonSerializerSettings ConfigureJson(JsonSerializerSettings settings, TypeNameHandling typeNameHandling) { - settings.SerializationBinder = new TypeNameSerializationBinder(TypeNameRegistry); - settings.ContractResolver = new ConverterContractResolver( new AppClientsConverter(), new AppContributorsConverter(), @@ -66,22 +50,52 @@ namespace Squidex.Config.Domain settings.DateParseHandling = DateParseHandling.None; settings.TypeNameHandling = typeNameHandling; - } - - static SerializationServices() - { - ConfigureJson(DefaultJsonSettings, TypeNameHandling.Auto); - DefaultJsonSerializer = JsonSerializer.Create(DefaultJsonSettings); + return settings; } public static IServiceCollection AddMySerializers(this IServiceCollection services) { - services.AddSingleton(DefaultJsonSettings); - services.AddSingleton(DefaultJsonSerializer); - services.AddSingleton(TypeNameRegistry); + services.AddSingletonAs>() + .As(); + + services.AddSingletonAs>() + .As(); + + services.AddSingletonAs>() + .As(); + + services.AddSingletonAs>() + .As(); + + services.AddSingletonAs() + .As(); + + services.AddSingletonAs() + .As(); + + services.AddSingletonAs() + .AsSelf(); + + services.AddSingletonAs() + .AsSelf(); + + services.AddSingletonAs(c => JsonSerializer.Create(c.GetRequiredService())) + .AsSelf(); + + services.AddSingletonAs(c => + { + var serializerSettings = ConfigureJson(new JsonSerializerSettings(), TypeNameHandling.Auto); + + var typeNameRegistry = c.GetService(); + + if (typeNameRegistry != null) + { + serializerSettings.SerializationBinder = new TypeNameSerializationBinder(typeNameRegistry); + } - services.AddSingleton(new NewtonsoftJsonSerializer(DefaultJsonSettings)); + return serializerSettings; + }).As(); return services; } diff --git a/src/Squidex/Config/Domain/StoreServices.cs b/src/Squidex/Config/Domain/StoreServices.cs index bf077d755..a980bafc6 100644 --- a/src/Squidex/Config/Domain/StoreServices.cs +++ b/src/Squidex/Config/Domain/StoreServices.cs @@ -27,13 +27,10 @@ using Squidex.Domain.Users; using Squidex.Domain.Users.MongoDb; using Squidex.Domain.Users.MongoDb.Infrastructure; using Squidex.Infrastructure; -using Squidex.Infrastructure.Configuration; -using Squidex.Infrastructure.DependencyInjection; using Squidex.Infrastructure.Diagnostics; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Json; using Squidex.Infrastructure.Migrations; -using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.States; using Squidex.Infrastructure.UsageTracking; @@ -47,23 +44,20 @@ namespace Squidex.Config.Domain { ["MongoDB"] = () => { - BsonJsonConvention.Register(SerializationServices.DefaultJsonSerializer); - var mongoConfiguration = config.GetRequiredValue("store:mongoDb:configuration"); var mongoDatabaseName = config.GetRequiredValue("store:mongoDb:database"); var mongoContentDatabaseName = config.GetOptionalValue("store:mongoDb:contentDatabase", mongoDatabaseName); - var mongoClient = Singletons.GetOrAdd(mongoConfiguration, s => new MongoClient(s)); - var mongoDatabase = mongoClient.GetDatabase(mongoDatabaseName); - var mongoContentDatabase = mongoClient.GetDatabase(mongoContentDatabaseName); - services.AddSingleton(typeof(ISnapshotStore<,>), typeof(MongoSnapshotStore<,>)); - services.AddSingletonAs(mongoDatabase) + services.AddSingletonAs(c => Singletons.GetOrAdd(mongoConfiguration, s => new MongoClient(s))) + .As(); + + services.AddSingletonAs(c => c.GetRequiredService().GetDatabase(mongoDatabaseName)) .As(); - services.AddHealthChecks() - .AddCheck("MongoDB", tags: new[] { "node" }); + services.AddTransientAs(c => new DeleteContentCollections(c.GetRequiredService().GetDatabase(mongoContentDatabaseName))) + .As(); services.AddSingletonAs() .As(); @@ -74,8 +68,8 @@ namespace Squidex.Config.Domain services.AddTransientAs() .As(); - services.AddTransientAs(c => new DeleteContentCollections(mongoContentDatabase)) - .As(); + services.AddHealthChecks() + .AddCheck("MongoDB", tags: new[] { "node" }); services.AddSingletonAs() .AsOptional(); @@ -100,7 +94,10 @@ namespace Squidex.Config.Domain .AsOptional() .AsOptional>(); - services.AddSingletonAs(c => new MongoContentRepository(mongoContentDatabase, c.GetRequiredService(), c.GetRequiredService())) + services.AddSingletonAs(c => new MongoContentRepository( + c.GetRequiredService().GetDatabase(mongoContentDatabaseName), + c.GetRequiredService(), + c.GetRequiredService())) .AsOptional() .AsOptional>() .AsOptional(); diff --git a/src/Squidex/Config/Domain/SubscriptionServices.cs b/src/Squidex/Config/Domain/SubscriptionServices.cs index 2d2a0e706..f5f8ad07b 100644 --- a/src/Squidex/Config/Domain/SubscriptionServices.cs +++ b/src/Squidex/Config/Domain/SubscriptionServices.cs @@ -12,7 +12,6 @@ using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Domain.Apps.Entities.Apps.Services.Implementations; using Squidex.Domain.Users; using Squidex.Infrastructure; -using Squidex.Infrastructure.DependencyInjection; namespace Squidex.Config.Domain { diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs index 957a3cda5..aed630ded 100644 --- a/src/Squidex/Config/Orleans/OrleansServices.cs +++ b/src/Squidex/Config/Orleans/OrleansServices.cs @@ -15,7 +15,6 @@ using Orleans.Hosting; using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Rules; using Squidex.Domain.Apps.Entities.Rules.UsageTracking; -using Squidex.Infrastructure.Configuration; using Squidex.Infrastructure.EventSourcing.Grains; using Squidex.Infrastructure.Orleans; diff --git a/src/Squidex/Config/Web/WebServices.cs b/src/Squidex/Config/Web/WebServices.cs index 3bafa44be..b94410f97 100644 --- a/src/Squidex/Config/Web/WebServices.cs +++ b/src/Squidex/Config/Web/WebServices.cs @@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Config.Domain; -using Squidex.Infrastructure.DependencyInjection; using Squidex.Pipeline; using Squidex.Pipeline.Plugins; using Squidex.Pipeline.Robots; diff --git a/src/Squidex/Pipeline/Squid/SquidMiddleware.cs b/src/Squidex/Pipeline/Squid/SquidMiddleware.cs index 157c3c381..8bf5d0fb7 100644 --- a/src/Squidex/Pipeline/Squid/SquidMiddleware.cs +++ b/src/Squidex/Pipeline/Squid/SquidMiddleware.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using System.IO; -using System.Reflection; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; @@ -128,7 +127,7 @@ namespace Squidex.Pipeline.Squid private static string LoadSvg(string name) { - var assembly = typeof(SquidMiddleware).GetTypeInfo().Assembly; + var assembly = typeof(SquidMiddleware).Assembly; using (var resourceStream = assembly.GetManifestResourceStream($"Squidex.Pipeline.Squid.icon-{name}.svg")) { diff --git a/src/Squidex/Pipeline/Swagger/NSwagHelper.cs b/src/Squidex/Pipeline/Swagger/NSwagHelper.cs index 6cdc3be8d..ccc236f1f 100644 --- a/src/Squidex/Pipeline/Swagger/NSwagHelper.cs +++ b/src/Squidex/Pipeline/Swagger/NSwagHelper.cs @@ -9,7 +9,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using NJsonSchema; @@ -23,7 +22,7 @@ namespace Squidex.Pipeline.Swagger { public static string LoadDocs(string name) { - var assembly = typeof(NSwagHelper).GetTypeInfo().Assembly; + var assembly = typeof(NSwagHelper).Assembly; using (var resourceStream = assembly.GetManifestResourceStream($"Squidex.Docs.{name}.md")) { diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs index 0c29f400d..a23db7df9 100644 --- a/src/Squidex/WebStartup.cs +++ b/src/Squidex/WebStartup.cs @@ -26,7 +26,6 @@ using Squidex.Config.Startup; using Squidex.Config.Web; using Squidex.Domain.Apps.Entities.Assets; using Squidex.Domain.Apps.Entities.Contents; -using Squidex.Extensions.Actions.Twitter; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Diagnostics; using Squidex.Infrastructure.Translations; diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleElementRegistry.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleElementRegistryTests.cs similarity index 93% rename from tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleElementRegistry.cs rename to tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleElementRegistryTests.cs index 3cef0cc4d..d7f647d61 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleElementRegistry.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleElementRegistryTests.cs @@ -15,8 +15,10 @@ using Xunit; namespace Squidex.Domain.Apps.Core.Operations.HandleRules { - public class RuleElementRegistry + public class RuleElementRegistryTests { + private readonly RuleRegistry sut = new RuleRegistry(); + private abstract class MyRuleActionHandler : RuleActionHandler { protected MyRuleActionHandler(RuleEventFormatter formatter) @@ -25,7 +27,6 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules } } - [RuleActionHandler(typeof(MyRuleActionHandler))] [RuleAction( IconImage = "", IconColor = "#1e5470", @@ -52,12 +53,16 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules [DataType(DataType.Password)] public string Password { get; set; } + [DataType(DataType.Custom)] public bool Boolean { get; set; } + [DataType(DataType.Custom)] public bool? BooleanOptional { get; set; } + [DataType(DataType.Custom)] public int Number { get; set; } + [DataType(DataType.Custom)] public int? NumberOptional { get; set; } } @@ -156,9 +161,9 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules IsRequired = false }); - RuleActionRegistry.Add(); + sut.Add(); - var currentDefinition = RuleActionRegistry.Actions.Values.First(); + var currentDefinition = sut.Actions.Values.First(); currentDefinition.Should().BeEquivalentTo(expected); } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/TestUtils.cs b/tests/Squidex.Domain.Apps.Core.Tests/TestUtils.cs index 6723ddeb2..64ee059ea 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/TestUtils.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/TestUtils.cs @@ -31,8 +31,8 @@ namespace Squidex.Domain.Apps.Core { var typeNameRegistry = new TypeNameRegistry() - .MapFields() - .MapRules() + .Map(new FieldRegistry()) + .Map(new RuleRegistry()) .MapUnmapped(typeof(TestUtils).Assembly); var serializerSettings = new JsonSerializerSettings @@ -123,7 +123,7 @@ namespace Squidex.Domain.Apps.Core foreach (var property in sut.GetType().GetRuntimeProperties().Where(x => x.Name != "IsFrozen")) { var value = - property.PropertyType.GetTypeInfo().IsValueType ? + property.PropertyType.IsValueType ? Activator.CreateInstance(property.PropertyType) : null; @@ -139,7 +139,7 @@ namespace Squidex.Domain.Apps.Core foreach (var property in sut.GetType().GetRuntimeProperties().Where(x => x.Name != "IsFrozen")) { var value = - property.PropertyType.GetTypeInfo().IsValueType ? + property.PropertyType.IsValueType ? Activator.CreateInstance(property.PropertyType) : null; diff --git a/tests/Squidex.Infrastructure.Tests/TypeNameRegistryTests.cs b/tests/Squidex.Infrastructure.Tests/TypeNameRegistryTests.cs index db90bc8d2..1b0ff3bfb 100644 --- a/tests/Squidex.Infrastructure.Tests/TypeNameRegistryTests.cs +++ b/tests/Squidex.Infrastructure.Tests/TypeNameRegistryTests.cs @@ -6,7 +6,8 @@ // ========================================================================== using System; -using System.Reflection; +using System.Linq; +using FakeItEasy; using Squidex.Infrastructure.EventSourcing; using Xunit; @@ -26,6 +27,28 @@ namespace Squidex.Infrastructure { } + [Fact] + public void Should_call_provider_from_constructor() + { + var provider = A.Fake(); + + var registry = new TypeNameRegistry(Enumerable.Repeat(provider, 1)); + + A.CallTo(() => provider.Map(registry)) + .MustHaveHappened(); + } + + [Fact] + public void Should_call_provider() + { + var provider = A.Fake(); + + sut.Map(provider); + + A.CallTo(() => provider.Map(sut)) + .MustHaveHappened(); + } + [Fact] public void Should_register_and_retrieve_types() { @@ -50,10 +73,22 @@ namespace Squidex.Infrastructure Assert.Equal(typeof(MyType), sut.GetType("My")); } + [Fact] + public void Should_register_with_provider_from_assembly() + { + sut.Map(new AutoAssembyTypeProvider()); + + Assert.Equal("my", sut.GetName()); + Assert.Equal("my", sut.GetName(typeof(MyType))); + + Assert.Equal(typeof(MyType), sut.GetType("my")); + Assert.Equal(typeof(MyType), sut.GetType("My")); + } + [Fact] public void Should_register_from_assembly() { - sut.MapUnmapped(typeof(TypeNameRegistryTests).GetTypeInfo().Assembly); + sut.MapUnmapped(typeof(TypeNameRegistryTests).Assembly); Assert.Equal("my", sut.GetName()); Assert.Equal("my", sut.GetName(typeof(MyType))); @@ -65,7 +100,7 @@ namespace Squidex.Infrastructure [Fact] public void Should_register_event_type_from_assembly() { - sut.MapUnmapped(typeof(TypeNameRegistryTests).GetTypeInfo().Assembly); + sut.MapUnmapped(typeof(TypeNameRegistryTests).Assembly); Assert.Equal("MyAddedEventV2", sut.GetName()); Assert.Equal("MyAddedEventV2", sut.GetName(typeof(MyAdded))); diff --git a/tools/Migrate_01/SquidexMigrations.cs b/tools/Migrate_01/SquidexMigrations.cs index 085bcf9dd..87fe65348 100644 --- a/tools/Migrate_01/SquidexMigrations.cs +++ b/tools/Migrate_01/SquidexMigrations.cs @@ -9,7 +9,7 @@ using System.Reflection; namespace Migrate_01 { - public static class SquidexMigrations + public sealed class SquidexMigrations { public static readonly Assembly Assembly = typeof(SquidexMigrations).Assembly; } From a5d170283d3ef37282dcaa0a3683f87d7740f817 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Thu, 21 Feb 2019 21:11:24 +0100 Subject: [PATCH 07/55] Lazy fixes. --- .../ValidateContent/JsonValueConverter.cs | 2 +- .../Apps/Indexes/AppsByNameIndexGrain.cs | 16 ++++-- .../Contents/ContentSchedulerGrain.cs | 18 ++++--- .../MongoDb/BsonJsonConvention.cs | 52 +++++++++++-------- .../MongoDb/InstantSerializer.cs | 16 +++--- .../MongoDb/MongoRepositoryBase.cs | 1 + .../MongoDb/RefTokenSerializer.cs | 16 +++--- .../RedisPubSub.cs | 19 ++++--- .../ImageSharpAssetThumbnailGenerator.cs | 4 +- .../DependencyInjectionExtensions.cs | 9 ---- src/Squidex.Infrastructure/Lazier.cs | 20 ------- src/Squidex.Infrastructure/Singletons.cs | 5 -- .../Translations/DeepLTranslator.cs | 2 +- .../Config/Domain/InfrastructureServices.cs | 12 ++--- src/Squidex/Config/Domain/LoggingServices.cs | 10 ++-- src/Squidex/Config/Domain/StoreServices.cs | 2 +- .../Pipeline/Plugins/PluginExtensions.cs | 2 - 17 files changed, 90 insertions(+), 116 deletions(-) delete mode 100644 src/Squidex.Infrastructure/Lazier.cs diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs index 2972cd648..fff4b75e7 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs @@ -179,7 +179,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent foreach (var item in array) { - if (item is JsonNull n) + if (item is JsonNull) { result.Add(null); } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Indexes/AppsByNameIndexGrain.cs b/src/Squidex.Domain.Apps.Entities/Apps/Indexes/AppsByNameIndexGrain.cs index ffd7d333a..29dab6b57 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Indexes/AppsByNameIndexGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Indexes/AppsByNameIndexGrain.cs @@ -40,11 +40,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Indexes public Task ReserveAppAsync(Guid appId, string name) { - var canReserve = - !State.Apps.ContainsKey(name) && - !State.Apps.Any(x => x.Value == appId) && - !reservedIds.Contains(appId) && - !reservedNames.Contains(name); + var canReserve = !IsInUse(appId, name) && !IsReserved(appId, name); if (canReserve) { @@ -55,6 +51,16 @@ namespace Squidex.Domain.Apps.Entities.Apps.Indexes return Task.FromResult(canReserve); } + private bool IsInUse(Guid appId, string name) + { + return State.Apps.ContainsKey(name) || State.Apps.All(x => x.Value == appId); + } + + private bool IsReserved(Guid appId, string name) + { + return reservedIds.Contains(appId) || reservedNames.Contains(name); + } + public Task RemoveReservationAsync(Guid appId, string name) { reservedIds.Remove(appId); diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs index d1885adcd..051f66a7a 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs @@ -22,15 +22,15 @@ namespace Squidex.Domain.Apps.Entities.Contents { public sealed class ContentSchedulerGrain : Grain, IContentSchedulerGrain, IRemindable { - private readonly Lazy contentRepository; - private readonly Lazy commandBus; + private readonly IContentRepository contentRepository; + private readonly ICommandBus commandBus; private readonly IClock clock; private readonly ISemanticLog log; private TaskScheduler scheduler; public ContentSchedulerGrain( - Lazy contentRepository, - Lazy commandBus, + IContentRepository contentRepository, + ICommandBus commandBus, IClock clock, ISemanticLog log) { @@ -39,9 +39,11 @@ namespace Squidex.Domain.Apps.Entities.Contents Guard.NotNull(clock, nameof(clock)); Guard.NotNull(log, nameof(log)); - this.contentRepository = contentRepository; - this.commandBus = commandBus; this.clock = clock; + + this.commandBus = commandBus; + this.contentRepository = contentRepository; + this.log = log; } @@ -66,7 +68,7 @@ namespace Squidex.Domain.Apps.Entities.Contents { var now = clock.GetCurrentInstant(); - return contentRepository.Value.QueryScheduledWithoutDataAsync(now, content => + return contentRepository.QueryScheduledWithoutDataAsync(now, content => { return Dispatch(async () => { @@ -78,7 +80,7 @@ namespace Squidex.Domain.Apps.Entities.Contents { var command = new ChangeContentStatus { ContentId = content.Id, Status = job.Status, Actor = job.ScheduledBy, JobId = job.Id }; - await commandBus.Value.PublishAsync(command); + await commandBus.PublishAsync(command); } } catch (Exception ex) diff --git a/src/Squidex.Infrastructure.MongoDb/MongoDb/BsonJsonConvention.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/BsonJsonConvention.cs index 77019a716..7fe870e3c 100644 --- a/src/Squidex.Infrastructure.MongoDb/MongoDb/BsonJsonConvention.cs +++ b/src/Squidex.Infrastructure.MongoDb/MongoDb/BsonJsonConvention.cs @@ -8,6 +8,7 @@ using System; using System.Linq; using System.Reflection; +using System.Threading; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Conventions; using Newtonsoft.Json; @@ -17,36 +18,41 @@ namespace Squidex.Infrastructure.MongoDb { public static class BsonJsonConvention { + private static volatile int isRegistered; + public static void Register(JsonSerializer serializer) { - var pack = new ConventionPack(); - - pack.AddMemberMapConvention("JsonBson", memberMap => + if (Interlocked.Increment(ref isRegistered) == 1) { - var attributes = memberMap.MemberInfo.GetCustomAttributes(); + var pack = new ConventionPack(); - if (attributes.OfType().Any()) + pack.AddMemberMapConvention("JsonBson", memberMap => { - var bsonSerializerType = typeof(BsonJsonSerializer<>).MakeGenericType(memberMap.MemberType); - var bsonSerializer = Activator.CreateInstance(bsonSerializerType, serializer); + var attributes = memberMap.MemberInfo.GetCustomAttributes(); - memberMap.SetSerializer((IBsonSerializer)bsonSerializer); - } - else if (memberMap.MemberType == typeof(JToken)) - { - memberMap.SetSerializer(JTokenSerializer.Instance); - } - else if (memberMap.MemberType == typeof(JObject)) - { - memberMap.SetSerializer(JTokenSerializer.Instance); - } - else if (memberMap.MemberType == typeof(JValue)) - { - memberMap.SetSerializer(JTokenSerializer.Instance); - } - }); + if (attributes.OfType().Any()) + { + var bsonSerializerType = typeof(BsonJsonSerializer<>).MakeGenericType(memberMap.MemberType); + var bsonSerializer = Activator.CreateInstance(bsonSerializerType, serializer); + + memberMap.SetSerializer((IBsonSerializer)bsonSerializer); + } + else if (memberMap.MemberType == typeof(JToken)) + { + memberMap.SetSerializer(JTokenSerializer.Instance); + } + else if (memberMap.MemberType == typeof(JObject)) + { + memberMap.SetSerializer(JTokenSerializer.Instance); + } + else if (memberMap.MemberType == typeof(JValue)) + { + memberMap.SetSerializer(JTokenSerializer.Instance); + } + }); - ConventionRegistry.Register("json", pack, t => true); + ConventionRegistry.Register("json", pack, t => true); + } } } } \ No newline at end of file diff --git a/src/Squidex.Infrastructure.MongoDb/MongoDb/InstantSerializer.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/InstantSerializer.cs index b4a5d5926..6979cafe3 100644 --- a/src/Squidex.Infrastructure.MongoDb/MongoDb/InstantSerializer.cs +++ b/src/Squidex.Infrastructure.MongoDb/MongoDb/InstantSerializer.cs @@ -5,7 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; +using System.Threading; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; using NodaTime; @@ -14,16 +14,14 @@ namespace Squidex.Infrastructure.MongoDb { public sealed class InstantSerializer : SerializerBase, IBsonPolymorphicSerializer { - private static readonly Lazy Registerer = new Lazy(() => - { - BsonSerializer.RegisterSerializer(new InstantSerializer()); - - return true; - }); + private static volatile int isRegistered; - public static bool Register() + public static void Register() { - return !Registerer.IsValueCreated && Registerer.Value; + if (Interlocked.Increment(ref isRegistered) == 1) + { + BsonSerializer.RegisterSerializer(new InstantSerializer()); + } } public bool IsDiscriminatorCompatibleWithObjectSerializer diff --git a/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs index 00237ee83..689bdfe8e 100644 --- a/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs +++ b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs @@ -44,6 +44,7 @@ namespace Squidex.Infrastructure.MongoDb static MongoRepositoryBase() { RefTokenSerializer.Register(); + InstantSerializer.Register(); } diff --git a/src/Squidex.Infrastructure.MongoDb/MongoDb/RefTokenSerializer.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/RefTokenSerializer.cs index 6f8761148..b4c45f945 100644 --- a/src/Squidex.Infrastructure.MongoDb/MongoDb/RefTokenSerializer.cs +++ b/src/Squidex.Infrastructure.MongoDb/MongoDb/RefTokenSerializer.cs @@ -5,7 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; +using System.Threading; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; @@ -13,16 +13,14 @@ namespace Squidex.Infrastructure.MongoDb { public class RefTokenSerializer : ClassSerializerBase { - private static readonly Lazy Registerer = new Lazy(() => - { - BsonSerializer.RegisterSerializer(new RefTokenSerializer()); - - return true; - }); + private static volatile int isRegistered; - public static bool Register() + public static void Register() { - return !Registerer.IsValueCreated && Registerer.Value; + if (Interlocked.Increment(ref isRegistered) == 1) + { + BsonSerializer.RegisterSerializer(new RefTokenSerializer()); + } } protected override RefToken DeserializeValue(BsonDeserializationContext context, BsonDeserializationArgs args) diff --git a/src/Squidex.Infrastructure.Redis/RedisPubSub.cs b/src/Squidex.Infrastructure.Redis/RedisPubSub.cs index 3feaf1510..74ef5c100 100644 --- a/src/Squidex.Infrastructure.Redis/RedisPubSub.cs +++ b/src/Squidex.Infrastructure.Redis/RedisPubSub.cs @@ -19,22 +19,19 @@ namespace Squidex.Infrastructure public sealed class RedisPubSub : IPubSub, IInitializable { private readonly ConcurrentDictionary subscriptions = new ConcurrentDictionary(); - private readonly Lazy redisClient; + private readonly IConnectionMultiplexer redis; private readonly IJsonSerializer serializer; - private readonly Lazy redisSubscriber; private readonly ISemanticLog log; + private ISubscriber redisSubscriber; - public RedisPubSub(Lazy redis, IJsonSerializer serializer, ISemanticLog log) + public RedisPubSub(IConnectionMultiplexer redis, IJsonSerializer serializer, ISemanticLog log) { Guard.NotNull(serializer, nameof(serializer)); Guard.NotNull(redis, nameof(redis)); Guard.NotNull(log, nameof(log)); this.log = log; - - redisClient = redis; - redisSubscriber = new Lazy(() => redis.Value.GetSubscriber()); - + this.redis = redis; this.serializer = serializer; } @@ -42,13 +39,15 @@ namespace Squidex.Infrastructure { try { - redisClient.Value.GetStatus(); + redisSubscriber = redis.GetSubscriber(); + + redis.GetStatus(); return TaskHelper.Done; } catch (Exception ex) { - throw new ConfigurationException($"Redis connection failed to connect to database {redisClient.Value.Configuration}", ex); + throw new ConfigurationException($"Redis connection failed to connect to database {redis.Configuration}", ex); } } @@ -66,7 +65,7 @@ namespace Squidex.Infrastructure { var typeName = typeof(T).FullName; - return (RedisSubscription)subscriptions.GetOrAdd(typeName, this, (k, c) => new RedisSubscription(c.redisSubscriber.Value, serializer, k, c.log)); + return (RedisSubscription)subscriptions.GetOrAdd(typeName, this, (k, c) => new RedisSubscription(c.redisSubscriber, serializer, k, c.log)); } } } diff --git a/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs b/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs index 82c4e2dc9..f36089eeb 100644 --- a/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs +++ b/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs @@ -19,8 +19,8 @@ namespace Squidex.Infrastructure.Assets.ImageSharp { public ImageSharpAssetThumbnailGenerator() { - SixLabors.ImageSharp.Configuration.Default.ImageFormatsManager.AddImageFormat(ImageFormats.Jpeg); - SixLabors.ImageSharp.Configuration.Default.ImageFormatsManager.AddImageFormat(ImageFormats.Png); + Configuration.Default.ImageFormatsManager.AddImageFormat(ImageFormats.Jpeg); + Configuration.Default.ImageFormatsManager.AddImageFormat(ImageFormats.Png); } public Task CreateThumbnailAsync(Stream source, Stream destination, int? width, int? height, string mode) diff --git a/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs b/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs index da40d75eb..13f245759 100644 --- a/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs +++ b/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs @@ -72,15 +72,6 @@ namespace Microsoft.Extensions.DependencyInjection return new InterfaceRegistrator(services); } - public static InterfaceRegistrator AddSingletonAs(this IServiceCollection services, T instance) where T : class - { - services.AddSingleton(typeof(T), instance); - - RegisterDefaults(services); - - return new InterfaceRegistrator(services); - } - public static InterfaceRegistrator AddSingletonAs(this IServiceCollection services) where T : class { services.AddSingleton(); diff --git a/src/Squidex.Infrastructure/Lazier.cs b/src/Squidex.Infrastructure/Lazier.cs deleted file mode 100644 index aae97240c..000000000 --- a/src/Squidex.Infrastructure/Lazier.cs +++ /dev/null @@ -1,20 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using Microsoft.Extensions.DependencyInjection; - -namespace Squidex.Infrastructure -{ - public sealed class Lazier : Lazy where T : class - { - public Lazier(IServiceProvider provider) - : base(provider.GetRequiredService) - { - } - } -} diff --git a/src/Squidex.Infrastructure/Singletons.cs b/src/Squidex.Infrastructure/Singletons.cs index 494157155..e0eb715ab 100644 --- a/src/Squidex.Infrastructure/Singletons.cs +++ b/src/Squidex.Infrastructure/Singletons.cs @@ -18,10 +18,5 @@ namespace Squidex.Infrastructure { return Instances.GetOrAdd(key, factory); } - - public static Lazy GetOrAddLazy(string key, Func factory) - { - return new Lazy(() => Instances.GetOrAdd(key, factory)); - } } } diff --git a/src/Squidex.Infrastructure/Translations/DeepLTranslator.cs b/src/Squidex.Infrastructure/Translations/DeepLTranslator.cs index 09920e6b6..5409faca1 100644 --- a/src/Squidex.Infrastructure/Translations/DeepLTranslator.cs +++ b/src/Squidex.Infrastructure/Translations/DeepLTranslator.cs @@ -87,7 +87,7 @@ namespace Squidex.Infrastructure.Translations return new Translation(TranslationResult.Failed, resultText: responseString); } - private string GetLanguageCode(Language language) + private static string GetLanguageCode(Language language) { return language.Iso2Code.Substring(0, 2).ToUpperInvariant(); } diff --git a/src/Squidex/Config/Domain/InfrastructureServices.cs b/src/Squidex/Config/Domain/InfrastructureServices.cs index 8e1b2e042..7b2e5d335 100644 --- a/src/Squidex/Config/Domain/InfrastructureServices.cs +++ b/src/Squidex/Config/Domain/InfrastructureServices.cs @@ -36,7 +36,12 @@ namespace Squidex.Config.Domain .AddCheck("Orleans", tags: new[] { "cluster" }) .AddCheck("Orleans App", tags: new[] { "cluster" }); - services.AddSingletonAs(SystemClock.Instance) + services.AddSingletonAs(c => new CachingUsageTracker( + c.GetRequiredService(), + c.GetRequiredService())) + .As(); + + services.AddSingletonAs(_ => SystemClock.Instance) .As(); services.AddSingletonAs() @@ -48,9 +53,6 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .As(); - services.AddSingletonAs(c => new CachingUsageTracker(c.GetRequiredService(), c.GetRequiredService())) - .As(); - services.AddSingletonAs() .As(); @@ -68,8 +70,6 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .As(); - - services.AddTransient(typeof(Lazy<>), typeof(Lazier<>)); } } } diff --git a/src/Squidex/Config/Domain/LoggingServices.cs b/src/Squidex/Config/Domain/LoggingServices.cs index 59e7932e3..60c4d6333 100644 --- a/src/Squidex/Config/Domain/LoggingServices.cs +++ b/src/Squidex/Config/Domain/LoggingServices.cs @@ -20,12 +20,12 @@ namespace Squidex.Config.Domain { if (config.GetValue("logging:human")) { - services.AddSingletonAs(JsonLogWriterFactory.Readable()) + services.AddSingletonAs(_ => JsonLogWriterFactory.Readable()) .As(); } else { - services.AddSingletonAs(JsonLogWriterFactory.Default()) + services.AddSingletonAs(_ => JsonLogWriterFactory.Default()) .As(); } @@ -33,16 +33,16 @@ namespace Squidex.Config.Domain if (!string.IsNullOrWhiteSpace(loggingFile)) { - services.AddSingletonAs(new FileChannel(loggingFile)) + services.AddSingletonAs(_ => new FileChannel(loggingFile)) .As(); } var useColors = config.GetValue("logging:colors"); - services.AddSingletonAs(new ConsoleLogChannel(useColors)) + services.AddSingletonAs(_ => new ConsoleLogChannel(useColors)) .As(); - services.AddSingletonAs(c => new ApplicationInfoLogAppender(typeof(Program).Assembly, Guid.NewGuid())) + services.AddSingletonAs(_ => new ApplicationInfoLogAppender(typeof(Program).Assembly, Guid.NewGuid())) .As(); services.AddSingletonAs() diff --git a/src/Squidex/Config/Domain/StoreServices.cs b/src/Squidex/Config/Domain/StoreServices.cs index a980bafc6..63559f3d4 100644 --- a/src/Squidex/Config/Domain/StoreServices.cs +++ b/src/Squidex/Config/Domain/StoreServices.cs @@ -50,7 +50,7 @@ namespace Squidex.Config.Domain services.AddSingleton(typeof(ISnapshotStore<,>), typeof(MongoSnapshotStore<,>)); - services.AddSingletonAs(c => Singletons.GetOrAdd(mongoConfiguration, s => new MongoClient(s))) + services.AddSingletonAs(_ => Singletons.GetOrAdd(mongoConfiguration, s => new MongoClient(s))) .As(); services.AddSingletonAs(c => c.GetRequiredService().GetDatabase(mongoDatabaseName)) diff --git a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs index 507d285af..0ba06a608 100644 --- a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs +++ b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs @@ -83,8 +83,6 @@ namespace Squidex.Pipeline.Plugins private static PluginLoader LoadPlugin(string pluginPath) { - var fullPath = GetPaths(pluginPath); - foreach (var candidate in GetPaths(pluginPath)) { if (candidate.Extension.Equals(".dll", StringComparison.OrdinalIgnoreCase)) From e037196e855eadfbf5f4f867c8e9f87f3f6ab04d Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Fri, 22 Feb 2019 20:23:05 +0100 Subject: [PATCH 08/55] Example plugin with in-memory asset store. --- .../Samples/MemoryAssetStorePlugin.cs | 29 +++++ .../Assets/MemoryAssetStore.cs | 119 ++++++++++++++++++ .../Assets/NoopAssetStore.cs | 52 ++++++++ .../Configuration/ConfigurationExtensions.cs | 4 + src/Squidex/Config/Domain/AssetServices.cs | 5 + .../Assets/MemoryAssetStoreTests.cs | 31 +++++ .../Assets/MongoGridFsAssetStoreTests.cs | 4 +- 7 files changed, 242 insertions(+), 2 deletions(-) create mode 100644 extensions/Squidex.Extensions/Samples/MemoryAssetStorePlugin.cs create mode 100644 src/Squidex.Infrastructure/Assets/MemoryAssetStore.cs create mode 100644 src/Squidex.Infrastructure/Assets/NoopAssetStore.cs create mode 100644 tests/Squidex.Infrastructure.Tests/Assets/MemoryAssetStoreTests.cs diff --git a/extensions/Squidex.Extensions/Samples/MemoryAssetStorePlugin.cs b/extensions/Squidex.Extensions/Samples/MemoryAssetStorePlugin.cs new file mode 100644 index 000000000..b4a018ed5 --- /dev/null +++ b/extensions/Squidex.Extensions/Samples/MemoryAssetStorePlugin.cs @@ -0,0 +1,29 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Squidex.Infrastructure.Assets; +using Squidex.Infrastructure.Plugins; + +namespace Squidex.Extensions.Samples +{ + public sealed class MemoryAssetStorePlugin : IPlugin + { + public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + { + var storeType = configuration.GetValue("assetStore:type"); + + if (string.Equals(storeType, "Memory", StringComparison.OrdinalIgnoreCase)) + { + services.AddSingletonAs() + .As(); + } + } + } +} diff --git a/src/Squidex.Infrastructure/Assets/MemoryAssetStore.cs b/src/Squidex.Infrastructure/Assets/MemoryAssetStore.cs new file mode 100644 index 000000000..7c00f9a85 --- /dev/null +++ b/src/Squidex.Infrastructure/Assets/MemoryAssetStore.cs @@ -0,0 +1,119 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Concurrent; +using System.IO; +using System.Threading; +using System.Threading.Tasks; +using Squidex.Infrastructure.Tasks; + +namespace Squidex.Infrastructure.Assets +{ + public sealed class MemoryAssetStore : IAssetStore + { + private readonly ConcurrentDictionary streams = new ConcurrentDictionary(); + private readonly AsyncLock readerLock = new AsyncLock(); + private readonly AsyncLock writerLock = new AsyncLock(); + + public string GeneratePublicUrl(string id, long version, string suffix) + { + return null; + } + + public async Task CopyAsync(string sourceFileName, string id, long version, string suffix, CancellationToken ct = default) + { + Guard.NotNullOrEmpty(sourceFileName, nameof(sourceFileName)); + Guard.NotNullOrEmpty(id, nameof(id)); + + if (!streams.TryGetValue(sourceFileName, out var sourceStream)) + { + throw new AssetNotFoundException(sourceFileName); + } + + using (await readerLock.LockAsync()) + { + await UploadAsync(id, version, suffix, sourceStream, ct); + } + } + + public async Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default) + { + Guard.NotNullOrEmpty(id, nameof(id)); + + var fileName = GetFileName(id, version, suffix); + + if (!streams.TryGetValue(fileName, out var sourceStream)) + { + throw new AssetNotFoundException(fileName); + } + + using (await readerLock.LockAsync()) + { + try + { + await sourceStream.CopyToAsync(stream, 81920, ct); + } + finally + { + sourceStream.Position = 0; + } + } + } + + public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default) + { + Guard.NotNullOrEmpty(id, nameof(id)); + + return UploadAsync(GetFileName(id, version, suffix), stream, ct); + } + + public async Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default) + { + var memoryStream = new MemoryStream(); + + if (streams.TryAdd(fileName, memoryStream)) + { + using (await writerLock.LockAsync()) + { + try + { + await stream.CopyToAsync(memoryStream, 81920, ct); + } + finally + { + memoryStream.Position = 0; + } + } + } + else + { + throw new AssetAlreadyExistsException(fileName); + } + } + + public Task DeleteAsync(string id, long version, string suffix) + { + Guard.NotNullOrEmpty(id, nameof(id)); + + return DeleteAsync(GetFileName(id, version, suffix)); + } + + public Task DeleteAsync(string fileName) + { + Guard.NotNullOrEmpty(fileName, nameof(fileName)); + + streams.TryRemove(fileName, out _); + + return TaskHelper.Done; + } + + private string GetFileName(string id, long version, string suffix) + { + return StringExtensions.JoinNonEmpty("_", id, version.ToString(), suffix); + } + } +} diff --git a/src/Squidex.Infrastructure/Assets/NoopAssetStore.cs b/src/Squidex.Infrastructure/Assets/NoopAssetStore.cs new file mode 100644 index 000000000..5c98cd77a --- /dev/null +++ b/src/Squidex.Infrastructure/Assets/NoopAssetStore.cs @@ -0,0 +1,52 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace Squidex.Infrastructure.Assets +{ + public sealed class NoopAssetStore : IAssetStore + { + public string GeneratePublicUrl(string id, long version, string suffix) + { + return null; + } + + public Task CopyAsync(string sourceFileName, string id, long version, string suffix, CancellationToken ct = default) + { + throw new NotSupportedException(); + } + + public Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default) + { + throw new NotSupportedException(); + } + + public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default) + { + throw new NotSupportedException(); + } + + public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default) + { + throw new NotSupportedException(); + } + + public Task DeleteAsync(string fileName) + { + throw new NotSupportedException(); + } + + public Task DeleteAsync(string id, long version, string suffix) + { + throw new NotSupportedException(); + } + } +} diff --git a/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs b/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs index 62d0521a4..fafb0ee84 100644 --- a/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs +++ b/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs @@ -54,6 +54,10 @@ namespace Microsoft.Extensions.Configuration { action(); } + else if (options.TryGetValue("default", out action)) + { + action(); + } else { throw new ConfigurationException($"Unsupported value '{value}' for '{path}', supported: {string.Join(" ", options.Keys)}."); diff --git a/src/Squidex/Config/Domain/AssetServices.cs b/src/Squidex/Config/Domain/AssetServices.cs index 617c8ff8c..5b8e36706 100644 --- a/src/Squidex/Config/Domain/AssetServices.cs +++ b/src/Squidex/Config/Domain/AssetServices.cs @@ -22,6 +22,11 @@ namespace Squidex.Config.Domain { config.ConfigureByOption("assetStore:type", new Options { + ["Default"] = () => + { + services.AddSingletonAs() + .AsOptional(); + }, ["Folder"] = () => { var path = config.GetRequiredValue("assetStore:folder:path"); diff --git a/tests/Squidex.Infrastructure.Tests/Assets/MemoryAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/MemoryAssetStoreTests.cs new file mode 100644 index 000000000..f11cb347d --- /dev/null +++ b/tests/Squidex.Infrastructure.Tests/Assets/MemoryAssetStoreTests.cs @@ -0,0 +1,31 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Xunit; + +namespace Squidex.Infrastructure.Assets +{ + public class MemoryAssetStoreTests : AssetStoreTests + { + public override MemoryAssetStore CreateStore() + { + return new MemoryAssetStore(); + } + + public override void Dispose() + { + } + + [Fact] + public void Should_not_calculate_source_url() + { + var url = Sut.GeneratePublicUrl(AssetId, 1, null); + + Assert.Null(url); + } + } +} \ No newline at end of file diff --git a/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFsAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFsAssetStoreTests.cs index 4fb5a6a66..e80d01ca9 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFsAssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFsAssetStoreTests.cs @@ -13,11 +13,11 @@ using Xunit; namespace Squidex.Infrastructure.Assets { - internal class MongoGridFSAssetStoreTests : AssetStoreTests + internal class MongoGridFsAssetStoreTests : AssetStoreTests { private static readonly IGridFSBucket GridFSBucket; - static MongoGridFSAssetStoreTests() + static MongoGridFsAssetStoreTests() { var mongoClient = new MongoClient("mongodb://localhost"); var mongoDatabase = mongoClient.GetDatabase("Test"); From a1c7a4287f4546f2c6fb9f2cb73a55edb485175a Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Fri, 22 Feb 2019 20:52:04 +0100 Subject: [PATCH 09/55] Metadata fixed and improvements in trigger UI. --- .../Actions/AzureQueue/AzureQueueAction.cs | 2 +- .../Actions/Discourse/DiscourseAction.cs | 4 +- .../Discourse/DiscourseActionHandler.cs | 3 +- .../ElasticSearch/ElasticSearchAction.cs | 2 +- .../ElasticSearchActionHandler.cs | 4 +- .../Actions/Email/EmailAction.cs | 27 +++--- .../Actions/Medium/MediumAction.cs | 9 +- .../Actions/Twitter/TweetAction.cs | 1 + .../Actions/Webhook/WebhookAction.cs | 2 - .../actions/generic-action.component.html | 4 +- .../actions/generic-action.component.scss | 6 +- .../pages/rules/rules-page.component.html | 96 +++++++++---------- .../pages/clients/clients-page.component.html | 2 +- .../patterns/patterns-page.component.html | 7 +- src/Squidex/app/theme/_forms.scss | 2 + 15 files changed, 91 insertions(+), 80 deletions(-) diff --git a/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs index 41c5be7a9..002da0d83 100644 --- a/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs +++ b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueueAction.cs @@ -23,7 +23,7 @@ namespace Squidex.Extensions.Actions.AzureQueue public sealed class AzureQueueAction : RuleAction { [Required] - [Display(Name = "Connection String", Description = "The connection string to the storage account.")] + [Display(Name = "Connection", Description = "The connection string to the storage account.")] [DataType(DataType.Text)] [Formattable] public string ConnectionString { get; set; } diff --git a/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs b/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs index 295c7f683..8e1c04011 100644 --- a/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs +++ b/extensions/Squidex.Extensions/Actions/Discourse/DiscourseAction.cs @@ -23,7 +23,7 @@ namespace Squidex.Extensions.Actions.Discourse { [AbsoluteUrl] [Required] - [Display(Name = "Url", Description = "The url to the discourse server.")] + [Display(Name = "Server Url", Description = "The url to the discourse server.")] [DataType(DataType.Url)] public Uri Url { get; set; } @@ -33,7 +33,7 @@ namespace Squidex.Extensions.Actions.Discourse public string ApiKey { get; set; } [Required] - [Display(Name = "Api Username", Description = "The api username to authenticate to your discourse server.")] + [Display(Name = "Api User", Description = "The api username to authenticate to your discourse server.")] [DataType(DataType.Text)] public string ApiUsername { get; set; } diff --git a/extensions/Squidex.Extensions/Actions/Discourse/DiscourseActionHandler.cs b/extensions/Squidex.Extensions/Actions/Discourse/DiscourseActionHandler.cs index b0811ba17..d408569df 100644 --- a/extensions/Squidex.Extensions/Actions/Discourse/DiscourseActionHandler.cs +++ b/extensions/Squidex.Extensions/Actions/Discourse/DiscourseActionHandler.cs @@ -34,7 +34,6 @@ namespace Squidex.Extensions.Actions.Discourse var json = new Dictionary { - ["raw"] = Format(action.Text, @event), ["title"] = Format(action.Title, @event) }; @@ -56,6 +55,8 @@ namespace Squidex.Extensions.Actions.Discourse RequestBody = requestBody }; + json["raw"] = Format(action.Text, @event); + var description = action.Topic.HasValue ? DescriptionCreateTopic : diff --git a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs index 298e4ad66..826f86f6d 100644 --- a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs +++ b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchAction.cs @@ -23,7 +23,7 @@ namespace Squidex.Extensions.Actions.ElasticSearch { [AbsoluteUrl] [Required] - [Display(Name = "Host", Description = "The hostname of the elastic search instance or cluster.")] + [Display(Name = "Server Url", Description = "The url to the elastic search instance or cluster.")] [DataType(DataType.Url)] public Uri Host { get; set; } diff --git a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchActionHandler.cs b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchActionHandler.cs index 991725964..10c3b0a79 100644 --- a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchActionHandler.cs +++ b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchActionHandler.cs @@ -45,9 +45,9 @@ namespace Squidex.Extensions.Actions.ElasticSearch var ruleJob = new ElasticSearchJob { Host = action.Host.ToString(), - ContentId = contentId, IndexName = Format(action.IndexName, @event), - IndexType = Format(action.IndexType, @event) + IndexType = Format(action.IndexType, @event), + ContentId = contentId }; if (contentEvent.Type == EnrichedContentEventType.Deleted || diff --git a/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs b/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs index c801e629b..e6ab737b7 100644 --- a/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs +++ b/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs @@ -20,50 +20,51 @@ namespace Squidex.Extensions.Actions.Email public sealed class EmailAction : RuleAction { [Required] - [Display(Name = "ServerHost", Description = "The IP address or host to the SMTP server.")] + [Display(Name = "Server Host", Description = "The IP address or host to the SMTP server.")] [DataType(DataType.Text)] public string ServerHost { get; set; } [Required] - [Display(Name = "ServerPort", Description = "The port to the SMTP server.")] + [Display(Name = "Server Port", Description = "The port to the SMTP server.")] [DataType(DataType.Custom)] public int ServerPort { get; set; } [Required] - [Display(Name = "ServerUseSsl", Description = "Specify whether the SMPT client uses Secure Sockets Layer (SSL) to encrypt the connection.")] + [Display(Name = "Use SSL", Description = "Specify whether the SMPT client uses Secure Sockets Layer (SSL) to encrypt the connection.")] [DataType(DataType.Custom)] public bool ServerUseSsl { get; set; } [Required] - [Display(Name = "ServerUsername", Description = "The username for the SMTP server.")] - [DataType(DataType.Text)] - public string ServerUsername { get; set; } - - [Required] - [Display(Name = "ServerPassword", Description = "The password for the SMTP server.")] + [Display(Name = "Password", Description = "The password for the SMTP server.")] [DataType(DataType.Password)] public string ServerPassword { get; set; } [Required] - [Display(Name = "MessageFrom", Description = "The email sending address.")] + [Display(Name = "Username", Description = "The username for the SMTP server.")] + [DataType(DataType.Text)] + [Formattable] + public string ServerUsername { get; set; } + + [Required] + [Display(Name = "From Address", Description = "The email sending address.")] [DataType(DataType.Text)] [Formattable] public string MessageFrom { get; set; } [Required] - [Display(Name = "MessageTo", Description = "The email message will be sent to.")] + [Display(Name = "To Address", Description = "The email message will be sent to.")] [DataType(DataType.Text)] [Formattable] public string MessageTo { get; set; } [Required] - [Display(Name = "MessageSubject", Description = "The subject line for this email message.")] + [Display(Name = "Subject", Description = "The subject line for this email message.")] [DataType(DataType.Text)] [Formattable] public string MessageSubject { get; set; } [Required] - [Display(Name = "MessageBody", Description = "The message body.")] + [Display(Name = "Body", Description = "The message body.")] [DataType(DataType.MultilineText)] [Formattable] public string MessageBody { get; set; } diff --git a/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs b/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs index 3c6ce25e2..3781eb9de 100644 --- a/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs +++ b/extensions/Squidex.Extensions/Actions/Medium/MediumAction.cs @@ -41,14 +41,15 @@ namespace Squidex.Extensions.Actions.Medium [Formattable] public string CanonicalUrl { get; set; } - [Display(Name = "PublicationId", Description = "Optional publication id.")] - [DataType(DataType.Text)] - public string PublicationId { get; set; } - [Display(Name = "Tags", Description = "The optional comma separated list of tags.")] [DataType(DataType.Text)] + [Formattable] public string Tags { get; set; } + [Display(Name = "Publication Id", Description = "Optional publication id.")] + [DataType(DataType.Text)] + public string PublicationId { get; set; } + [Display(Name = "Is Html", Description = "Indicates whether the content is markdown or html.")] [DataType(DataType.Custom)] public bool IsHtml { get; set; } diff --git a/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs b/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs index 5f68d9fd4..67bb45e63 100644 --- a/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs +++ b/extensions/Squidex.Extensions/Actions/Twitter/TweetAction.cs @@ -32,6 +32,7 @@ namespace Squidex.Extensions.Actions.Twitter [Required] [Display(Name = "Text", Description = "The text that is sent as tweet to twitter.")] [DataType(DataType.MultilineText)] + [Formattable] public string Text { get; set; } } } diff --git a/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs b/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs index 2cf8e339a..4c129531e 100644 --- a/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs +++ b/extensions/Squidex.Extensions/Actions/Webhook/WebhookAction.cs @@ -9,7 +9,6 @@ using System; using System.ComponentModel.DataAnnotations; using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules; -using Squidex.Infrastructure; namespace Squidex.Extensions.Actions.Webhook { @@ -21,7 +20,6 @@ namespace Squidex.Extensions.Actions.Webhook ReadMore = "https://en.wikipedia.org/wiki/Webhook")] public sealed class WebhookAction : RuleAction { - [AbsoluteUrl] [Required] [Display(Name = "Url", Description = "The url to the webhook.")] [DataType(DataType.Text)] diff --git a/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.html index 5c0438347..3ab92a516 100644 --- a/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.html +++ b/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.html @@ -1,6 +1,8 @@
- +
diff --git a/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.scss b/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.scss index 6f7a94e21..91941c2fc 100644 --- a/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.scss +++ b/src/Squidex/app/features/rules/pages/rules/actions/generic-action.component.scss @@ -2,5 +2,9 @@ @import '_mixins'; .form-check { - padding-top: .5rem; + margin-bottom: -.25rem; +} + +textarea { + height: 15rem; } \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html index 313951c46..3161d203c 100644 --- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html @@ -19,58 +19,56 @@ - - -
- No Rule created yet. + +
+ No rule created yet. - -
+ +
- - - - - - - - - - - - -
-

If

- 		- - - - -

then

- 		- - - - - - - -
+ + + + + + + + + + + + +
+

If

+ 		+ + + + +

then

+ 		+ + + + + + + +
- - - - + + + diff --git a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html index b0fff5866..5ef4d921b 100644 --- a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html +++ b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html @@ -14,7 +14,7 @@ - +
No client created yet.
diff --git a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html index b82d2553d..9d1dc860e 100644 --- a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html +++ b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html @@ -14,12 +14,15 @@ - +
No pattern created yet.
- + + + diff --git a/src/Squidex/app/theme/_forms.scss b/src/Squidex/app/theme/_forms.scss index b1ee1d822..ba6d680c4 100644 --- a/src/Squidex/app/theme/_forms.scss +++ b/src/Squidex/app/theme/_forms.scss @@ -6,6 +6,7 @@ // .form-control { &.ng-invalid { + &.ng-touched, &.ng-dirty { & { border-color: $color-theme-error; @@ -199,6 +200,7 @@ input { } &.ng-invalid { + &.ng-touched, &.ng-dirty { & { @include box-shadow-none; From 7eb980fc870db4907387701e840338019349d9aa Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Fri, 22 Feb 2019 22:10:57 +0100 Subject: [PATCH 10/55] Async pipe improvements. --- .../pages/restore/restore-page.component.html | 64 +++++----- .../pages/users/user-page.component.html | 12 +- .../pages/users/users-page.component.html | 16 +-- .../apps/pages/apps-page.component.html | 8 +- .../pages/assets-filters-page.component.html | 5 +- .../pages/content/content-page.component.html | 1 + .../contents-filters-page.component.html | 1 + .../shared/assets-editor.component.html | 4 +- .../shared/content-status.component.html | 14 +-- .../shared/content-status.component.ts | 10 +- .../shared/contents-selector.component.html | 4 +- .../shared/due-time-selector.component.html | 50 ++++---- .../pages/rules/rule-element.component.html | 1 + .../pages/rules/rules-page.component.html | 5 +- .../pages/schemas/schema-form.component.html | 1 + .../pages/backups/backups-page.component.html | 116 +++++++++--------- .../pages/clients/client.component.html | 6 +- .../languages/languages-page.component.html | 14 +-- .../pages/plans/plans-page.component.html | 100 ++++++++------- .../pages/roles/roles-page.component.html | 4 +- .../angular/forms/autocomplete.component.html | 1 + .../angular/forms/stars.component.html | 12 +- .../components/markdown-editor.component.html | 4 +- .../components/rich-editor.component.html | 4 +- 24 files changed, 238 insertions(+), 219 deletions(-) diff --git a/src/Squidex/app/features/administration/pages/restore/restore-page.component.html b/src/Squidex/app/features/administration/pages/restore/restore-page.component.html index f6d4adb6c..9097e9524 100644 --- a/src/Squidex/app/features/administration/pages/restore/restore-page.component.html +++ b/src/Squidex/app/features/administration/pages/restore/restore-page.component.html @@ -6,48 +6,46 @@ - -
-
-
-
-
- -
-
- -
-
- -
+
+
+
+
+
+
- -
-

Last Restore Operation

+
+
- -
- {{job.url}} +
+
-
-
-
- {{row}} + +
+

Last Restore Operation

+
+ +
+ {{job.url}}
-
-
-
- Started: {{job.started | sqxISODate}} -
-
- Stopped: {{job.stopped | sqxISODate}} -
+
+
+
+ {{row}} +
+
+
+
+
+ Started: {{job.started | sqxISODate}} +
+
+ Stopped: {{job.stopped | sqxISODate}}
- +
diff --git a/src/Squidex/app/features/administration/pages/users/user-page.component.html b/src/Squidex/app/features/administration/pages/users/user-page.component.html index 0c19b2998..3f8918635 100644 --- a/src/Squidex/app/features/administration/pages/users/user-page.component.html +++ b/src/Squidex/app/features/administration/pages/users/user-page.component.html @@ -16,13 +16,11 @@ - - - - - + + + diff --git a/src/Squidex/app/features/administration/pages/users/users-page.component.html b/src/Squidex/app/features/administration/pages/users/users-page.component.html index dde3ab83c..a65cdab0e 100644 --- a/src/Squidex/app/features/administration/pages/users/users-page.component.html +++ b/src/Squidex/app/features/administration/pages/users/users-page.component.html @@ -47,8 +47,8 @@
- - +
+ diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.html b/src/Squidex/app/features/apps/pages/apps-page.component.html index 6bfb9fa97..3a9d658e9 100644 --- a/src/Squidex/app/features/apps/pages/apps-page.component.html +++ b/src/Squidex/app/features/apps/pages/apps-page.component.html @@ -100,9 +100,13 @@ - + + - + + \ No newline at end of file diff --git a/src/Squidex/app/features/assets/pages/assets-filters-page.component.html b/src/Squidex/app/features/assets/pages/assets-filters-page.component.html index 0a32d5244..f6c48e822 100644 --- a/src/Squidex/app/features/assets/pages/assets-filters-page.component.html +++ b/src/Squidex/app/features/assets/pages/assets-filters-page.component.html @@ -31,7 +31,10 @@

Saved queries

+ [class.active]="isSelectedQuery(query.filter)"> + + {{query.name}} + diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.html b/src/Squidex/app/features/content/pages/content/content-page.component.html index fd527a854..d27447adc 100644 --- a/src/Squidex/app/features/content/pages/content/content-page.component.html +++ b/src/Squidex/app/features/content/pages/content/content-page.component.html @@ -30,6 +30,7 @@ +
diff --git a/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html index cba1e9f8f..d25caf88e 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html +++ b/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html @@ -16,6 +16,7 @@ + {{query.name}} diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.html b/src/Squidex/app/features/content/shared/assets-editor.component.html index c6b7f33a1..030114620 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.html +++ b/src/Squidex/app/features/content/shared/assets-editor.component.html @@ -55,5 +55,7 @@
- + + \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/content-status.component.html b/src/Squidex/app/features/content/shared/content-status.component.html index 22de0d0b8..b03f43a5b 100644 --- a/src/Squidex/app/features/content/shared/content-status.component.html +++ b/src/Squidex/app/features/content/shared/content-status.component.html @@ -1,13 +1,13 @@ - - - + + + - - - + + + - +{{displayStatus}} \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/content-status.component.ts b/src/Squidex/app/features/content/shared/content-status.component.ts index 527002671..85011a079 100644 --- a/src/Squidex/app/features/content/shared/content-status.component.ts +++ b/src/Squidex/app/features/content/shared/content-status.component.ts @@ -34,10 +34,16 @@ export class ContentStatusComponent { @Input() public alignMiddle = true; - public get displayStatus() { + public get tooltipText() { if (this.scheduledAt) { return `Will be set to '${this.scheduledTo}' at ${this.scheduledAt.toStringFormat('LLLL')}`; - } else if (this.isPending) { + } else { + return this.status; + } + } + + public get displayStatus() { + if (this.isPending) { return 'Pending'; } else { return this.status; diff --git a/src/Squidex/app/features/content/shared/contents-selector.component.html b/src/Squidex/app/features/content/shared/contents-selector.component.html index a174dd63f..6b57c596f 100644 --- a/src/Squidex/app/features/content/shared/contents-selector.component.html +++ b/src/Squidex/app/features/content/shared/contents-selector.component.html @@ -48,8 +48,8 @@
-
@@ -60,7 +60,7 @@ {{userInfo.user.email}} - + @@ -68,10 +68,12 @@ - - + + + +
- +
+ - - - {{dueTimeAction}} content item(s) - + + + {{dueTimeAction}} content item(s) + - -
- - -
+ +
+ + +
-
- - -
+
+ + +
- - + + - - - - - - + + + + + diff --git a/src/Squidex/app/features/rules/pages/rules/rule-element.component.html b/src/Squidex/app/features/rules/pages/rules/rule-element.component.html index 695bdea88..efcc0fb23 100644 --- a/src/Squidex/app/features/rules/pages/rules/rule-element.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rule-element.component.html @@ -12,6 +12,7 @@ +
diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html index 3161d203c..ba7e7a540 100644 --- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html @@ -64,9 +64,12 @@
- diff --git a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html index 509579d6e..13c866d67 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html +++ b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html @@ -4,6 +4,7 @@ Clone Schema + Create Schema diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html index 8a04729f8..2254f8730 100644 --- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html +++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html @@ -18,77 +18,75 @@ - +
Your have reached the maximum number of backups: 10.
- -
- No backups created yet. +
+ No backups created yet. - -
- -
-
-
-
- -
-
- -
-
- -
+ +
+ +
+
+
+
+
-
-
- Started: -
-
- Duration: -
+
+
-
-
- {{backup.started | sqxFromNow}} -
-
- {{backup | sqxBackupDuration}} -
+
+
-
-
- - Events: {{backup.handledEvents | sqxKNumber}} - , - - Assets: {{backup.handledAssets | sqxKNumber}} - -
-
- Download: - - - Ready - -
+
+
+
+ Started: +
+
+ Duration: +
+
+
+
+ {{backup.started | sqxFromNow}}
-
- +
+ {{backup | sqxBackupDuration}}
+
+
+ + Events: {{backup.handledEvents | sqxKNumber}} + , + + Assets: {{backup.handledAssets | sqxKNumber}} + +
+ +
+
+ +
- +
diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.html b/src/Squidex/app/features/settings/pages/clients/client.component.html index 654781be9..476038fd9 100644 --- a/src/Squidex/app/features/settings/pages/clients/client.component.html +++ b/src/Squidex/app/features/settings/pages/clients/client.component.html @@ -2,7 +2,7 @@
- +
@@ -16,13 +16,13 @@ - +

{{client.name}}

- +
diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.html b/src/Squidex/app/features/settings/pages/languages/languages-page.component.html index ae44142e4..989801c71 100644 --- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.html +++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.html @@ -14,14 +14,12 @@ - - - - - + + +
diff --git a/src/Squidex/app/features/settings/pages/plans/plans-page.component.html b/src/Squidex/app/features/settings/pages/plans/plans-page.component.html index c1118dc6c..f8f9720cd 100644 --- a/src/Squidex/app/features/settings/pages/plans/plans-page.component.html +++ b/src/Squidex/app/features/settings/pages/plans/plans-page.component.html @@ -14,67 +14,65 @@ - - -
- You have not created the subscription. Therefore you cannot change the plan. -
+ +
+ You have not created the subscription. Therefore you cannot change the plan. +
-
- No plan configured, this app has unlimited usage. -
+
+ No plan configured, this app has unlimited usage. +
-
-
-
-

{{planInfo.plan.name}}

-
{{planInfo.plan.costs}}
+
+
+
+

{{planInfo.plan.name}}

+
{{planInfo.plan.costs}}
- Per Month -
-
-
-
- {{planInfo.plan.maxApiCalls | sqxKNumber}} API Calls -
-
- {{planInfo.plan.maxAssetSize | sqxFileSize}} Storage -
-
- {{planInfo.plan.maxContributors}} Contributors -
+ Per Month +
+
+
+
+ {{planInfo.plan.maxApiCalls | sqxKNumber}} API Calls
- - - - -
-
-
-
{{planInfo.plan.yearlyCosts}}
- - Per Year +
+ {{planInfo.plan.maxAssetSize | sqxFileSize}} Storage
+
+ {{planInfo.plan.maxContributors}} Contributors +
+
+ + + + +
+
+
+
{{planInfo.plan.yearlyCosts}}
- - - + Per Year
+ + + +
+
-
- Go to Billing Portal for payment history and subscription overview. -
- +
+ Go to Billing Portal for payment history and subscription overview. +
diff --git a/src/Squidex/app/features/settings/pages/roles/roles-page.component.html b/src/Squidex/app/features/settings/pages/roles/roles-page.component.html index 4d756d031..a6fab661b 100644 --- a/src/Squidex/app/features/settings/pages/roles/roles-page.component.html +++ b/src/Squidex/app/features/settings/pages/roles/roles-page.component.html @@ -14,8 +14,8 @@ - - + +
diff --git a/src/Squidex/app/framework/angular/forms/autocomplete.component.html b/src/Squidex/app/framework/angular/forms/autocomplete.component.html index 326206e1d..a861ccfdd 100644 --- a/src/Squidex/app/framework/angular/forms/autocomplete.component.html +++ b/src/Squidex/app/framework/angular/forms/autocomplete.component.html @@ -12,6 +12,7 @@ (mousedown)="selectItem(item)" (mouseover)="selectIndex(i)" [sqxScrollActive]="i === snapshot.suggestedIndex"> + {{item}} diff --git a/src/Squidex/app/framework/angular/forms/stars.component.html b/src/Squidex/app/framework/angular/forms/stars.component.html index af4d6d7c9..de372853f 100644 --- a/src/Squidex/app/framework/angular/forms/stars.component.html +++ b/src/Squidex/app/framework/angular/forms/stars.component.html @@ -1,13 +1,15 @@
-
- Must not have more more than 15 stars -
- - + + + +
+ Must not have more more than 15 stars +
+
\ No newline at end of file diff --git a/src/Squidex/app/shared/components/markdown-editor.component.html b/src/Squidex/app/shared/components/markdown-editor.component.html index fee67d1f6..9fe76c972 100644 --- a/src/Squidex/app/shared/components/markdown-editor.component.html +++ b/src/Squidex/app/shared/components/markdown-editor.component.html @@ -5,5 +5,7 @@
- + + \ No newline at end of file diff --git a/src/Squidex/app/shared/components/rich-editor.component.html b/src/Squidex/app/shared/components/rich-editor.component.html index 8e4c1e999..1fe5b907e 100644 --- a/src/Squidex/app/shared/components/rich-editor.component.html +++ b/src/Squidex/app/shared/components/rich-editor.component.html @@ -3,5 +3,7 @@
- + + \ No newline at end of file From 4234d5be88f0a2142d8af82463c13db5aa229f23 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sat, 23 Feb 2019 16:12:43 +0100 Subject: [PATCH 11/55] App reserveration fixed. --- .../Squidex.Domain.Apps.Core.Operations.csproj | 2 +- .../Apps/Indexes/AppsByNameIndexGrain.cs | 2 +- src/Squidex.Infrastructure/Squidex.Infrastructure.csproj | 2 +- src/Squidex/Squidex.csproj | 4 ++-- tests/RunCoverage.ps1 | 2 +- tests/Squidex.Tests/Squidex.Tests.csproj | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj b/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj index 52e1d0d86..4e12cdabd 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj +++ b/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Indexes/AppsByNameIndexGrain.cs b/src/Squidex.Domain.Apps.Entities/Apps/Indexes/AppsByNameIndexGrain.cs index 29dab6b57..3d281b676 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Indexes/AppsByNameIndexGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Indexes/AppsByNameIndexGrain.cs @@ -53,7 +53,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Indexes private bool IsInUse(Guid appId, string name) { - return State.Apps.ContainsKey(name) || State.Apps.All(x => x.Value == appId); + return State.Apps.ContainsKey(name) || State.Apps.Any(x => x.Value == appId); } private bool IsReserved(Guid appId, string name) diff --git a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj index f411a7f4c..5e50220ae 100644 --- a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj +++ b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index 39b41835a..f0d7e5424 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -86,13 +86,13 @@ - + - + diff --git a/tests/RunCoverage.ps1 b/tests/RunCoverage.ps1 index 6546501c4..a5e002b35 100644 --- a/tests/RunCoverage.ps1 +++ b/tests/RunCoverage.ps1 @@ -76,6 +76,6 @@ if ($all -Or $web) { -oldStyle } -&"$folderHome\.nuget\packages\ReportGenerator\4.0.9\tools\net47\ReportGenerator.exe" ` +&"$folderHome\.nuget\packages\ReportGenerator\4.0.13.1\tools\net47\ReportGenerator.exe" ` -reports:"$folderWorking\$folderReports\*.xml" ` -targetdir:"$folderWorking\$folderReports\Output" \ No newline at end of file diff --git a/tests/Squidex.Tests/Squidex.Tests.csproj b/tests/Squidex.Tests/Squidex.Tests.csproj index 3e59ed21e..a3b850682 100644 --- a/tests/Squidex.Tests/Squidex.Tests.csproj +++ b/tests/Squidex.Tests/Squidex.Tests.csproj @@ -16,7 +16,7 @@ - + From e7c831afe4790c2eb18b428dc73fbb371efacffb Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sat, 23 Feb 2019 17:49:58 +0100 Subject: [PATCH 12/55] Fix test coverage. --- .../Log/LockingLogStore.cs | 9 +++++++- tests/RunCoverage.ps1 | 4 ++-- .../Model/Apps/LanguagesConfigTests.cs | 18 +++++++++++++++ .../Model/Rules/RuleTests.cs | 23 +++++++++++++++++++ .../Log/LockingLogStoreTests.cs | 2 +- 5 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/Squidex.Infrastructure/Log/LockingLogStore.cs b/src/Squidex.Infrastructure/Log/LockingLogStore.cs index bafce0bd2..ee463090d 100644 --- a/src/Squidex.Infrastructure/Log/LockingLogStore.cs +++ b/src/Squidex.Infrastructure/Log/LockingLogStore.cs @@ -52,7 +52,14 @@ namespace Squidex.Infrastructure.Log break; } - await Task.Delay(2000, cts.Token); + try + { + await Task.Delay(2000, cts.Token); + } + catch (OperationCanceledException) + { + break; + } } if (!cts.IsCancellationRequested) diff --git a/tests/RunCoverage.ps1 b/tests/RunCoverage.ps1 index a5e002b35..bc2f198f1 100644 --- a/tests/RunCoverage.ps1 +++ b/tests/RunCoverage.ps1 @@ -26,7 +26,7 @@ if ($all -Or $infrastructure) { -register:user ` -target:"C:\Program Files\dotnet\dotnet.exe" ` -targetargs:"test $folderWorking\Squidex.Infrastructure.Tests\Squidex.Infrastructure.Tests.csproj" ` - -filter:"+[Squidex.*]* -[Squidex.Infrastructure*]*CodeGen*" ` + -filter:"+[Squidex.*]* -[Squidex.Infrastructure*]*CodeGen* -[Squidex.Infrastructure*]*OrleansGeneratedCode*" ` -skipautoprops ` -output:"$folderWorking\$folderReports\Infrastructure.xml" ` -oldStyle @@ -48,7 +48,7 @@ if ($all -Or $appsEntities) { -register:user ` -target:"C:\Program Files\dotnet\dotnet.exe" ` -targetargs:"test $folderWorking\Squidex.Domain.Apps.Entities.Tests\Squidex.Domain.Apps.Entities.Tests.csproj" ` - -filter:"+[Squidex.*]* -[Squidex.Domain.Apps.Entities*]*CodeGen*" ` + -filter:"+[Squidex.*]* -[Squidex.Domain.Apps.Entities*]*CodeGen* -[Squidex.Domain.Apps.Entities*]*OrleansGeneratedCode*" ` -skipautoprops ` -output:"$folderWorking\$folderReports\Entities.xml" ` -oldStyle diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/LanguagesConfigTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/LanguagesConfigTests.cs index abc43e080..3c7867ee7 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/LanguagesConfigTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/LanguagesConfigTests.cs @@ -216,5 +216,23 @@ namespace Squidex.Domain.Apps.Core.Model.Apps Assert.NotNull(((IEnumerable)config_0).GetEnumerator()); Assert.NotNull(((IEnumerable)config_0).GetEnumerator()); } + + [Fact] + public void Should_resolve_language_by_string() + { + var config_0 = LanguagesConfig.Build(Language.DE); + + Assert.True(config_0.TryGetItem("de", out var item)); + Assert.NotNull(item); + } + + [Fact] + public void Should_not_resolve_language_fór_invalid_language() + { + var config_0 = LanguagesConfig.Build(Language.DE); + + Assert.False(config_0.TryGetItem("invalid", out var item)); + Assert.Null(item); + } } } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Model/Rules/RuleTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Model/Rules/RuleTests.cs index e368cca59..cdbc1a5bf 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Model/Rules/RuleTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Model/Rules/RuleTests.cs @@ -37,6 +37,19 @@ namespace Squidex.Domain.Apps.Core.Model.Rules } } + public sealed class MigratedTrigger : RuleTrigger, IMigrated + { + public override T Accept(IRuleTriggerVisitor visitor) + { + throw new NotSupportedException(); + } + + public RuleTrigger Migrate() + { + return new OtherTrigger(); + } + } + [TypeName(nameof(TestAction1))] public sealed class TestAction1 : RuleAction { @@ -127,6 +140,16 @@ namespace Squidex.Domain.Apps.Core.Model.Rules serialized.Should().BeEquivalentTo(rule_1); } + [Fact] + public void Should_serialize_and_deserialize_and_migrate_trigger() + { + var rule_X = new Rule(new MigratedTrigger(), new TestAction1()); + + var serialized = rule_X.SerializeAndDeserialize(); + + Assert.IsType(serialized.Trigger); + } + [Theory] [MemberData(nameof(Triggers))] public void Should_freeze_triggers(RuleTrigger trigger) diff --git a/tests/Squidex.Infrastructure.Tests/Log/LockingLogStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Log/LockingLogStoreTests.cs index ae3f73854..f33a19c3e 100644 --- a/tests/Squidex.Infrastructure.Tests/Log/LockingLogStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Log/LockingLogStoreTests.cs @@ -70,7 +70,7 @@ namespace Squidex.Infrastructure.Log A.CallTo(() => lockGrain.AcquireLockAsync(key)) .Returns(Task.FromResult(null)); - await sut.ReadLogAsync(key, dateFrom, dateTo, stream, TimeSpan.FromSeconds(2)); + await sut.ReadLogAsync(key, dateFrom, dateTo, stream, TimeSpan.FromSeconds(1)); A.CallTo(() => lockGrain.AcquireLockAsync(key)) .MustHaveHappened(); From 97002fe130b72fd58cbdd7d56dff8a22ce8328b3 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Feb 2019 14:01:10 +0100 Subject: [PATCH 13/55] Improved tests for event stores and asset stores. --- .../EventSourcing/GetEventStore.cs | 5 - .../EventSourcing/MongoEventStore.cs | 1 + .../EventSourcing/MongoEventStore_Reader.cs | 66 +++-- .../EventSourcing/MongoEventStore_Writer.cs | 7 +- .../EventSourcing/IEventStore.cs | 2 - .../Assets/AssetStoreTests.cs | 19 +- .../Assets/AzureBlobAssetStoreFixture.cs | 20 ++ .../Assets/AzureBlobAssetStoreTests.cs | 14 +- .../Assets/FolderAssetStoreFixture.cs | 35 +++ .../Assets/FolderAssetStoreTests.cs | 17 +- .../Assets/GoogleCloudAssetStoreFixture.cs | 25 ++ .../Assets/GoogleCloudAssetStoreTests.cs | 14 +- .../Assets/MemoryAssetStoreTests.cs | 4 - .../Assets/MongoGridFSAssetStoreFixture.cs | 40 +++ .../Assets/MongoGridFsAssetStoreTests.cs | 25 +- .../EventSourcing/EventStoreTests.cs | 265 ++++++++++++++++++ .../EventSourcing/MongoEventStoreFixture.cs | 42 +++ .../EventSourcing/MongoEventStoreTests.cs | 29 ++ .../TestHelpers/JsonHelper.cs | 11 +- 19 files changed, 547 insertions(+), 94 deletions(-) create mode 100644 tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreFixture.cs create mode 100644 tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreFixture.cs create mode 100644 tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreFixture.cs create mode 100644 tests/Squidex.Infrastructure.Tests/Assets/MongoGridFSAssetStoreFixture.cs create mode 100644 tests/Squidex.Infrastructure.Tests/EventSourcing/EventStoreTests.cs create mode 100644 tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreFixture.cs create mode 100644 tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreTests.cs diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs index 83f81fb92..7f7020fd5 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs @@ -189,11 +189,6 @@ namespace Squidex.Infrastructure.EventSourcing } } - public Task DeleteManyAsync(string property, object value) - { - throw new NotSupportedException(); - } - private string GetStreamName(string streamName) { return $"{prefix}-{streamName}"; diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs index c33c11f40..fe20956ed 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs @@ -15,6 +15,7 @@ namespace Squidex.Infrastructure.EventSourcing { public partial class MongoEventStore : MongoRepositoryBase, IEventStore { + private const int MaxCommitSize = 10; private static readonly FieldDefinition TimestampField = Fields.Build(x => x.Timestamp); private static readonly FieldDefinition EventsCountField = Fields.Build(x => x.EventsCount); private static readonly FieldDefinition EventStreamOffsetField = Fields.Build(x => x.EventStreamOffset); diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs index b9bdcbf10..314304445 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs @@ -10,11 +10,15 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; +using Squidex.Infrastructure.Json.Objects; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.MongoDb; +using EventFilter = MongoDB.Driver.FilterDefinition; namespace Squidex.Infrastructure.EventSourcing { + public delegate bool EventPredicate(EventData data); + public partial class MongoEventStore : MongoRepositoryBase, IEventStore { public Task CreateIndexAsync(string property) @@ -39,7 +43,7 @@ namespace Squidex.Infrastructure.EventSourcing await Collection.Find( Filter.And( Filter.Eq(EventStreamField, streamName), - Filter.Gte(EventStreamOffsetField, streamPosition - 1))) + Filter.Gte(EventStreamOffsetField, streamPosition - MaxCommitSize))) .Sort(Sort.Ascending(TimestampField)).ToListAsync(); var result = new List(); @@ -75,9 +79,10 @@ namespace Squidex.Infrastructure.EventSourcing StreamPosition lastPosition = position; - var filter = CreateFilter(property, value, lastPosition); + var filterDefinition = CreateFilter(property, value, lastPosition); + var filterExpression = CreateFilterExpression(property, value); - return QueryAsync(callback, lastPosition, filter, ct); + return QueryAsync(callback, lastPosition, filterDefinition, filterExpression, ct); } public Task QueryAsync(Func callback, string streamFilter = null, string position = null, CancellationToken ct = default) @@ -86,16 +91,17 @@ namespace Squidex.Infrastructure.EventSourcing StreamPosition lastPosition = position; - var filter = CreateFilter(streamFilter, lastPosition); + var filterDefinition = CreateFilter(streamFilter, lastPosition); + var filterExpression = CreateFilterExpression(null, null); - return QueryAsync(callback, lastPosition, filter, ct); + return QueryAsync(callback, lastPosition, filterDefinition, filterExpression, ct); } - private async Task QueryAsync(Func callback, StreamPosition lastPosition, FilterDefinition filter, CancellationToken ct = default) + private async Task QueryAsync(Func callback, StreamPosition lastPosition, EventFilter filterDefinition, EventPredicate filterExpression, CancellationToken ct = default) { using (Profiler.TraceMethod()) { - await Collection.Find(filter).Sort(Sort.Ascending(TimestampField)).ForEachPipelineAsync(async commit => + await Collection.Find(filterDefinition).Sort(Sort.Ascending(TimestampField)).ForEachPipelineAsync(async commit => { var eventStreamOffset = (int)commit.EventStreamOffset; @@ -109,43 +115,47 @@ namespace Squidex.Infrastructure.EventSourcing if (commitOffset > lastPosition.CommitOffset || commitTimestamp > lastPosition.Timestamp) { var eventData = e.ToEventData(); - var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); - await callback(new StoredEvent(commit.EventStream, eventToken, eventStreamOffset, eventData)); + if (filterExpression(eventData)) + { + var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); - commitOffset++; + await callback(new StoredEvent(commit.EventStream, eventToken, eventStreamOffset, eventData)); + } } + + commitOffset++; } }, ct); } } - private static FilterDefinition CreateFilter(string property, object value, StreamPosition streamPosition) + private static EventFilter CreateFilter(string property, object value, StreamPosition streamPosition) { - var filters = new List>(); + var filters = new List(); - FilterByPosition(streamPosition, filters); - FilterByProperty(property, value, filters); + AppendByPosition(streamPosition, filters); + AppendByProperty(property, value, filters); return Filter.And(filters); } - private static FilterDefinition CreateFilter(string streamFilter, StreamPosition streamPosition) + private static EventFilter CreateFilter(string streamFilter, StreamPosition streamPosition) { - var filters = new List>(); + var filters = new List(); - FilterByPosition(streamPosition, filters); - FilterByStream(streamFilter, filters); + AppendByPosition(streamPosition, filters); + AppendByStream(streamFilter, filters); return Filter.And(filters); } - private static void FilterByProperty(string property, object value, List> filters) + private static void AppendByProperty(string property, object value, List filters) { filters.Add(Filter.Eq(CreateIndexPath(property), value)); } - private static void FilterByStream(string streamFilter, List> filters) + private static void AppendByStream(string streamFilter, List filters) { if (!string.IsNullOrWhiteSpace(streamFilter) && !string.Equals(streamFilter, ".*", StringComparison.OrdinalIgnoreCase)) { @@ -160,7 +170,7 @@ namespace Squidex.Infrastructure.EventSourcing } } - private static void FilterByPosition(StreamPosition streamPosition, List> filters) + private static void AppendByPosition(StreamPosition streamPosition, List filters) { if (streamPosition.IsEndOfCommit) { @@ -172,6 +182,20 @@ namespace Squidex.Infrastructure.EventSourcing } } + private static EventPredicate CreateFilterExpression(string property, object value) + { + if (!string.IsNullOrWhiteSpace(property)) + { + var jsonValue = JsonValue.Create(value); + + return x => x.Headers.TryGetValue(property, out var p) && p.Equals(jsonValue); + } + else + { + return x => true; + } + } + private static string CreateIndexPath(string property) { return $"Events.Metadata.{property}"; diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs index 4e77f4991..aa0707f2e 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs @@ -24,11 +24,6 @@ namespace Squidex.Infrastructure.EventSourcing return Collection.DeleteManyAsync(x => x.EventStream == streamName); } - public Task DeleteManyAsync(string property, object value) - { - return Collection.DeleteManyAsync(Filter.Eq(CreateIndexPath(property), value)); - } - public Task AppendAsync(Guid commitId, string streamName, ICollection events) { return AppendAsync(commitId, streamName, EtagVersion.Any, events); @@ -36,6 +31,8 @@ namespace Squidex.Infrastructure.EventSourcing public async Task AppendAsync(Guid commitId, string streamName, long expectedVersion, ICollection events) { + Guard.LessThan(events.Count, MaxCommitSize, "events.Count"); + using (Profiler.TraceMethod()) { Guard.GreaterEquals(expectedVersion, EtagVersion.Any, nameof(expectedVersion)); diff --git a/src/Squidex.Infrastructure/EventSourcing/IEventStore.cs b/src/Squidex.Infrastructure/EventSourcing/IEventStore.cs index 5e0ed5067..46765b666 100644 --- a/src/Squidex.Infrastructure/EventSourcing/IEventStore.cs +++ b/src/Squidex.Infrastructure/EventSourcing/IEventStore.cs @@ -28,8 +28,6 @@ namespace Squidex.Infrastructure.EventSourcing Task DeleteStreamAsync(string streamName); - Task DeleteManyAsync(string property, object value); - IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null); } } diff --git a/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs index 13c37a6a9..40202902e 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs @@ -12,23 +12,13 @@ using Xunit; namespace Squidex.Infrastructure.Assets { - public abstract class AssetStoreTests : IDisposable where T : IAssetStore + public abstract class AssetStoreTests where T : IAssetStore { private readonly MemoryStream assetData = new MemoryStream(new byte[] { 0x1, 0x2, 0x3, 0x4 }); private readonly string assetId = Guid.NewGuid().ToString(); private readonly string tempId = Guid.NewGuid().ToString(); private readonly Lazy sut; - protected AssetStoreTests() - { - sut = new Lazy(CreateStore); - - if (Sut is IInitializable initializable) - { - initializable.InitializeAsync().Wait(); - } - } - protected T Sut { get { return sut.Value; } @@ -39,9 +29,12 @@ namespace Squidex.Infrastructure.Assets get { return assetId; } } - public abstract T CreateStore(); + protected AssetStoreTests() + { + sut = new Lazy(CreateStore); + } - public abstract void Dispose(); + public abstract T CreateStore(); [Fact] public virtual Task Should_throw_exception_if_asset_to_download_is_not_found() diff --git a/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreFixture.cs b/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreFixture.cs new file mode 100644 index 000000000..ee6ad82f4 --- /dev/null +++ b/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreFixture.cs @@ -0,0 +1,20 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Infrastructure.Assets +{ + public sealed class AzureBlobAssetStoreFixture + { + public AzureBlobAssetStore AssetStore { get; } + + public AzureBlobAssetStoreFixture() + { + AssetStore = new AzureBlobAssetStore("UseDevelopmentStorage=true", "squidex-test-container"); + AssetStore.InitializeAsync().Wait(); + } + } +} diff --git a/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreTests.cs index 46ac46cf5..fffed1488 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreTests.cs @@ -7,19 +7,21 @@ using Xunit; -#pragma warning disable xUnit1000 // Test classes must be public - namespace Squidex.Infrastructure.Assets { - internal class AzureBlobAssetStoreTests : AssetStoreTests + [Trait("Dependency", "Azure")] + public class AzureBlobAssetStoreTests : AssetStoreTests, IClassFixture { - public override AzureBlobAssetStore CreateStore() + private readonly AzureBlobAssetStoreFixture fixture; + + public AzureBlobAssetStoreTests(AzureBlobAssetStoreFixture fixture) { - return new AzureBlobAssetStore("UseDevelopmentStorage=true", "squidex-test-container"); + this.fixture = fixture; } - public override void Dispose() + public override AzureBlobAssetStore CreateStore() { + return fixture.AssetStore; } [Fact] diff --git a/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreFixture.cs b/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreFixture.cs new file mode 100644 index 000000000..c6a58ae56 --- /dev/null +++ b/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreFixture.cs @@ -0,0 +1,35 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.IO; +using FakeItEasy; +using Squidex.Infrastructure.Log; + +namespace Squidex.Infrastructure.Assets +{ + public sealed class FolderAssetStoreFixture : IDisposable + { + public string TestFolder { get; } = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); + + public FolderAssetStore AssetStore { get; } + + public FolderAssetStoreFixture() + { + AssetStore = new FolderAssetStore(TestFolder, A.Dummy()); + AssetStore.InitializeAsync().Wait(); + } + + public void Dispose() + { + if (Directory.Exists(TestFolder)) + { + Directory.Delete(TestFolder, true); + } + } + } +} diff --git a/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreTests.cs index 8b89a6420..0ec26d0c4 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreTests.cs @@ -13,21 +13,18 @@ using Xunit; namespace Squidex.Infrastructure.Assets { - public class FolderAssetStoreTests : AssetStoreTests + public class FolderAssetStoreTests : AssetStoreTests, IClassFixture { - private readonly string testFolder = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); + private readonly FolderAssetStoreFixture fixture; - public override FolderAssetStore CreateStore() + public FolderAssetStoreTests(FolderAssetStoreFixture fixture) { - return new FolderAssetStore(testFolder, A.Dummy()); + this.fixture = fixture; } - public override void Dispose() + public override FolderAssetStore CreateStore() { - if (Directory.Exists(testFolder)) - { - Directory.Delete(testFolder, true); - } + return fixture.AssetStore; } [Fact] @@ -39,7 +36,7 @@ namespace Squidex.Infrastructure.Assets [Fact] public void Should_create_directory_when_connecting() { - Assert.True(Directory.Exists(testFolder)); + Assert.True(Directory.Exists(fixture.TestFolder)); } [Fact] diff --git a/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreFixture.cs b/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreFixture.cs new file mode 100644 index 000000000..a43197886 --- /dev/null +++ b/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreFixture.cs @@ -0,0 +1,25 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; + +namespace Squidex.Infrastructure.Assets +{ + public sealed class GoogleCloudAssetStoreFixture : IDisposable + { + public GoogleCloudAssetStore AssetStore { get; } + + public GoogleCloudAssetStoreFixture() + { + AssetStore = new GoogleCloudAssetStore("squidex-test"); + } + + public void Dispose() + { + } + } +} diff --git a/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreTests.cs index 17c6e2bd1..77b8f7c46 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreTests.cs @@ -7,19 +7,21 @@ using Xunit; -#pragma warning disable xUnit1000 // Test classes must be public - namespace Squidex.Infrastructure.Assets { - internal class GoogleCloudAssetStoreTests : AssetStoreTests + [Trait("Dependency", "GC")] + public class GoogleCloudAssetStoreTests : AssetStoreTests, IClassFixture { - public override GoogleCloudAssetStore CreateStore() + private readonly GoogleCloudAssetStoreFixture fixture; + + public GoogleCloudAssetStoreTests(GoogleCloudAssetStoreFixture fixture) { - return new GoogleCloudAssetStore("squidex-test"); + this.fixture = fixture; } - public override void Dispose() + public override GoogleCloudAssetStore CreateStore() { + return fixture.AssetStore; } [Fact] diff --git a/tests/Squidex.Infrastructure.Tests/Assets/MemoryAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/MemoryAssetStoreTests.cs index f11cb347d..7c193ca86 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/MemoryAssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/MemoryAssetStoreTests.cs @@ -16,10 +16,6 @@ namespace Squidex.Infrastructure.Assets return new MemoryAssetStore(); } - public override void Dispose() - { - } - [Fact] public void Should_not_calculate_source_url() { diff --git a/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFSAssetStoreFixture.cs b/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFSAssetStoreFixture.cs new file mode 100644 index 000000000..8e407be3b --- /dev/null +++ b/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFSAssetStoreFixture.cs @@ -0,0 +1,40 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using MongoDB.Driver; +using MongoDB.Driver.GridFS; + +namespace Squidex.Infrastructure.Assets +{ + public sealed class MongoGridFSAssetStoreFixture : IDisposable + { + public MongoGridFsAssetStore AssetStore { get; } + + public IMongoClient MongoClient { get; } = new MongoClient("mongodb://localhost"); + + public IMongoDatabase MongoDatabase { get; } + + public MongoGridFSAssetStoreFixture() + { + MongoDatabase = MongoClient.GetDatabase("GridFSTest"); + + var gridFSBucket = new GridFSBucket(MongoDatabase, new GridFSBucketOptions + { + BucketName = "fs" + }); + + AssetStore = new MongoGridFsAssetStore(gridFSBucket); + AssetStore.InitializeAsync().Wait(); + } + + public void Dispose() + { + MongoClient.DropDatabase("GridFSTest"); + } + } +} diff --git a/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFsAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFsAssetStoreTests.cs index e80d01ca9..0be3552ee 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFsAssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFsAssetStoreTests.cs @@ -5,36 +5,23 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using MongoDB.Driver; -using MongoDB.Driver.GridFS; using Xunit; -#pragma warning disable xUnit1000 // Test classes must be public - namespace Squidex.Infrastructure.Assets { - internal class MongoGridFsAssetStoreTests : AssetStoreTests + [Trait("Dependency", "MongoDB")] + public class MongoGridFsAssetStoreTests : AssetStoreTests, IClassFixture { - private static readonly IGridFSBucket GridFSBucket; + private readonly MongoGridFSAssetStoreFixture fixture; - static MongoGridFsAssetStoreTests() + public MongoGridFsAssetStoreTests(MongoGridFSAssetStoreFixture fixture) { - var mongoClient = new MongoClient("mongodb://localhost"); - var mongoDatabase = mongoClient.GetDatabase("Test"); - - GridFSBucket = new GridFSBucket(mongoDatabase, new GridFSBucketOptions - { - BucketName = "fs" - }); + this.fixture = fixture; } public override MongoGridFsAssetStore CreateStore() { - return new MongoGridFsAssetStore(GridFSBucket); - } - - public override void Dispose() - { + return fixture.AssetStore; } [Fact] diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/EventStoreTests.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/EventStoreTests.cs new file mode 100644 index 000000000..f4f3f24e7 --- /dev/null +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/EventStoreTests.cs @@ -0,0 +1,265 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using FluentAssertions; +using Squidex.Infrastructure.Tasks; +using Xunit; + +namespace Squidex.Infrastructure.EventSourcing +{ + public abstract class EventStoreTests where T : IEventStore + { + private readonly Lazy sut; + + public sealed class EventSubscriber : IEventSubscriber + { + public List Events { get; } = new List(); + + public Task OnErrorAsync(IEventSubscription subscription, Exception exception) + { + throw new NotSupportedException(); + } + + public Task OnEventAsync(IEventSubscription subscription, StoredEvent storedEvent) + { + Events.Add(storedEvent); + + return TaskHelper.Done; + } + } + + protected T Sut + { + get { return sut.Value; } + } + + protected abstract int SubscriptionDelayInMs { get; } + + protected EventStoreTests() + { + sut = new Lazy(CreateStore); + } + + public abstract T CreateStore(); + + [Fact] + public async Task Should_throw_exception_for_version_mismatch() + { + var streamName = $"test-{Guid.NewGuid()}"; + + var events = new EventData[] + { + new EventData("Type1", new EnvelopeHeaders(), "1"), + new EventData("Type2", new EnvelopeHeaders(), "2"), + }; + + await Assert.ThrowsAsync(() => Sut.AppendAsync(Guid.NewGuid(), streamName, 0, events)); + } + + [Fact] + public async Task Should_throw_exception_for_version_mismatch_and_update() + { + var streamName = $"test-{Guid.NewGuid()}"; + + var events = new EventData[] + { + new EventData("Type1", new EnvelopeHeaders(), "1"), + new EventData("Type2", new EnvelopeHeaders(), "2"), + }; + + await Sut.AppendAsync(Guid.NewGuid(), streamName, events); + + await Assert.ThrowsAsync(() => Sut.AppendAsync(Guid.NewGuid(), streamName, 0, events)); + } + + [Fact] + public async Task Should_append_events() + { + var streamName = $"test-{Guid.NewGuid()}"; + + var events = new EventData[] + { + new EventData("Type1", new EnvelopeHeaders(), "1"), + new EventData("Type2", new EnvelopeHeaders(), "2"), + }; + + await Sut.AppendAsync(Guid.NewGuid(), streamName, events); + + var readEvents1 = await QueryAsync(streamName); + var readEvents2 = await QueryWithCallbackAsync(streamName); + + var expected = new StoredEvent[] + { + new StoredEvent(streamName, "Position", 0, events[0]), + new StoredEvent(streamName, "Position", 1, events[1]) + }; + + ShouldBeEquivalentTo(readEvents1, expected); + ShouldBeEquivalentTo(readEvents2, expected); + } + + [Fact] + public async Task Should_subscribe_to_events() + { + var streamName = $"test-{Guid.NewGuid()}"; + + var events = new EventData[] + { + new EventData("Type1", new EnvelopeHeaders(), "1"), + new EventData("Type2", new EnvelopeHeaders(), "2"), + }; + + var subscriber = new EventSubscriber(); + + IEventSubscription subscription = null; + try + { + subscription = Sut.CreateSubscription(subscriber, streamName); + + await Sut.AppendAsync(Guid.NewGuid(), streamName, events); + + subscription.WakeUp(); + + await Task.Delay(SubscriptionDelayInMs); + + var expected = new StoredEvent[] + { + new StoredEvent(streamName, "Position", 0, events[0]), + new StoredEvent(streamName, "Position", 1, events[1]) + }; + + ShouldBeEquivalentTo(subscriber.Events, expected); + } + finally + { + await subscription.StopAsync(); + } + } + + [Fact] + public async Task Should_read_events_from_offset() + { + var streamName = $"test-{Guid.NewGuid()}"; + + var events = new EventData[] + { + new EventData("Type1", new EnvelopeHeaders(), "1"), + new EventData("Type2", new EnvelopeHeaders(), "2"), + }; + + await Sut.AppendAsync(Guid.NewGuid(), streamName, events); + + var firstRead = await QueryAsync(streamName); + + var readEvents1 = await QueryAsync(streamName, 1); + var readEvents2 = await QueryWithCallbackAsync(streamName, firstRead[0].EventPosition); + + var expected = new StoredEvent[] + { + new StoredEvent(streamName, "Position", 1, events[1]) + }; + + ShouldBeEquivalentTo(readEvents1, expected); + ShouldBeEquivalentTo(readEvents2, expected); + } + + [Fact] + public async Task Should_delete_stream() + { + var streamName = $"test-{Guid.NewGuid()}"; + + var events = new EventData[] + { + new EventData("Type1", new EnvelopeHeaders(), "1"), + new EventData("Type2", new EnvelopeHeaders(), "2"), + }; + + await Sut.AppendAsync(Guid.NewGuid(), streamName, events); + await Sut.DeleteStreamAsync(streamName); + + var readEvents1 = await QueryAsync(streamName); + var readEvents2 = await QueryWithCallbackAsync(streamName); + + Assert.Empty(readEvents1); + Assert.Empty(readEvents2); + } + + [Fact] + public async Task Should_query_events_by_property() + { + var keyed1 = new EnvelopeHeaders(); + var keyed2 = new EnvelopeHeaders(); + + keyed1.Add("key", "1"); + keyed2.Add("key", "2"); + + var streamName1 = $"test-{Guid.NewGuid()}"; + var streamName2 = $"test-{Guid.NewGuid()}"; + + var events1 = new EventData[] + { + new EventData("Type1", keyed1, "1"), + new EventData("Type2", keyed2, "2"), + }; + + var events2 = new EventData[] + { + new EventData("Type3", keyed2, "3"), + new EventData("Type4", keyed1, "4"), + }; + + await Sut.CreateIndexAsync("key"); + + await Sut.AppendAsync(Guid.NewGuid(), streamName1, events1); + await Sut.AppendAsync(Guid.NewGuid(), streamName2, events2); + + var readEvents = await QueryWithFilterAsync("key", "2"); + + var expected = new StoredEvent[] + { + new StoredEvent(streamName1, "Position", 1, events1[1]), + new StoredEvent(streamName2, "Position", 0, events2[0]) + }; + + ShouldBeEquivalentTo(readEvents, expected); + } + + private Task> QueryAsync(string streamName, long position = EtagVersion.Any) + { + return Sut.QueryAsync(streamName, position); + } + + private async Task> QueryWithFilterAsync(string property, object value) + { + var readEvents = new List(); + + await Sut.QueryAsync(x => { readEvents.Add(x); return TaskHelper.Done; }, property, value); + + return readEvents; + } + + private async Task> QueryWithCallbackAsync(string streamFilter = null, string position = null) + { + var readEvents = new List(); + + await Sut.QueryAsync(x => { readEvents.Add(x); return TaskHelper.Done; }, streamFilter, position); + + return readEvents; + } + + private void ShouldBeEquivalentTo(IEnumerable actual, params StoredEvent[] expected) + { + var actualArray = actual.Select(x => new StoredEvent(x.StreamName, "Position", x.EventStreamNumber, x.Data)).ToArray(); + + actualArray.Should().BeEquivalentTo(expected); + } + } +} diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreFixture.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreFixture.cs new file mode 100644 index 000000000..b000e1258 --- /dev/null +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreFixture.cs @@ -0,0 +1,42 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using FakeItEasy; +using MongoDB.Driver; +using Newtonsoft.Json; +using Squidex.Infrastructure.MongoDb; +using Squidex.Infrastructure.TestHelpers; + +namespace Squidex.Infrastructure.EventSourcing +{ + public sealed class MongoEventStoreFixture : IDisposable + { + public MongoEventStore EventStore { get; } + + public IMongoClient MongoClient { get; } = new MongoClient("mongodb://localhost"); + + public IMongoDatabase MongoDatabase { get; } + + public IEventNotifier Notifier { get; } = A.Fake(); + + public MongoEventStoreFixture() + { + MongoDatabase = MongoClient.GetDatabase("EventStoreTest"); + + BsonJsonConvention.Register(JsonSerializer.Create(JsonHelper.DefaultSettings())); + + EventStore = new MongoEventStore(MongoDatabase, Notifier); + EventStore.InitializeAsync().Wait(); + } + + public void Dispose() + { + MongoClient.DropDatabase("EventStoreTest"); + } + } +} diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreTests.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreTests.cs new file mode 100644 index 000000000..615fe0790 --- /dev/null +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreTests.cs @@ -0,0 +1,29 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Xunit; + +namespace Squidex.Infrastructure.EventSourcing +{ + [Trait("Dependency", "MongoDB")] + public class MongoEventStoreTests : EventStoreTests, IClassFixture + { + private readonly MongoEventStoreFixture fixture; + + protected override int SubscriptionDelayInMs { get; } = 1000; + + public MongoEventStoreTests(MongoEventStoreFixture fixture) + { + this.fixture = fixture; + } + + public override MongoEventStore CreateStore() + { + return fixture.EventStore; + } + } +} diff --git a/tests/Squidex.Infrastructure.Tests/TestHelpers/JsonHelper.cs b/tests/Squidex.Infrastructure.Tests/TestHelpers/JsonHelper.cs index c3b088571..bef611a12 100644 --- a/tests/Squidex.Infrastructure.Tests/TestHelpers/JsonHelper.cs +++ b/tests/Squidex.Infrastructure.Tests/TestHelpers/JsonHelper.cs @@ -19,7 +19,14 @@ namespace Squidex.Infrastructure.TestHelpers public static IJsonSerializer CreateSerializer(TypeNameRegistry typeNameRegistry = null) { - var serializerSettings = new JsonSerializerSettings + var serializerSettings = DefaultSettings(typeNameRegistry); + + return new NewtonsoftJsonSerializer(serializerSettings); + } + + public static JsonSerializerSettings DefaultSettings(TypeNameRegistry typeNameRegistry = null) + { + return new JsonSerializerSettings { SerializationBinder = new TypeNameSerializationBinder(typeNameRegistry ?? new TypeNameRegistry()), @@ -37,8 +44,6 @@ namespace Squidex.Infrastructure.TestHelpers TypeNameHandling = TypeNameHandling.Auto }; - - return new NewtonsoftJsonSerializer(serializerSettings); } public static T SerializeAndDeserialize(this T value) From eff21ef772357f257861af98c7b82dda53d62fef Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Feb 2019 15:52:38 +0100 Subject: [PATCH 14/55] Tests for event store and asset store finalized. --- .../EventSourcing/Formatter.cs | 44 ++++++- .../EventSourcing/GetEventStore.cs | 51 +++++--- .../GetEventStoreSubscription.cs | 5 +- .../EventSourcing/ProjectionClient.cs | 2 +- .../Assets/AzureBlobAssetStoreTests.cs | 2 +- .../Assets/GoogleCloudAssetStoreFixture.cs | 1 + .../Assets/GoogleCloudAssetStoreTests.cs | 2 +- .../Assets/MongoGridFSAssetStoreFixture.cs | 13 +- .../Assets/MongoGridFsAssetStoreTests.cs | 2 +- .../EventSourcing/EventStoreTests.cs | 123 +++++++++++++----- .../EventSourcing/GetEventStoreFixture.cs | 62 +++++++++ .../EventSourcing/GetEventStoreTests.cs | 29 +++++ .../EventSourcing/MongoEventStoreFixture.cs | 16 +-- .../EventSourcing/MongoEventStoreTests.cs | 2 +- .../Squidex.Infrastructure.Tests.csproj | 1 + 15 files changed, 273 insertions(+), 82 deletions(-) create mode 100644 tests/Squidex.Infrastructure.Tests/EventSourcing/GetEventStoreFixture.cs create mode 100644 tests/Squidex.Infrastructure.Tests/EventSourcing/GetEventStoreTests.cs diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/Formatter.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/Formatter.cs index 8a2dd111f..cc05285d8 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/Formatter.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/Formatter.cs @@ -6,6 +6,8 @@ // ========================================================================== using System; +using System.Collections.Generic; +using System.Linq; using System.Text; using EventStore.ClientAPI; using Squidex.Infrastructure.Json; @@ -15,24 +17,54 @@ namespace Squidex.Infrastructure.EventSourcing { public static class Formatter { - public static StoredEvent Read(ResolvedEvent resolvedEvent, IJsonSerializer serializer) + private static readonly HashSet PrivateHeaders = new HashSet { "$v", "$p", "$c", "$causedBy" }; + + public static StoredEvent Read(ResolvedEvent resolvedEvent, string prefix, IJsonSerializer serializer) { var @event = resolvedEvent.Event; - var metadata = Encoding.UTF8.GetString(@event.Data); + var eventPayload = Encoding.UTF8.GetString(@event.Data); + var eventHeaders = GetHeaders(serializer, @event); - var headersJson = Encoding.UTF8.GetString(@event.Metadata); - var headers = serializer.Deserialize(headersJson); + var eventData = new EventData(@event.EventType, eventHeaders, eventPayload); - var eventData = new EventData(@event.EventType, headers, metadata); + var streamName = GetStreamName(prefix, @event); return new StoredEvent( - @event.EventStreamId, + streamName, resolvedEvent.OriginalEventNumber.ToString(), resolvedEvent.Event.EventNumber, eventData); } + private static string GetStreamName(string prefix, RecordedEvent @event) + { + var streamName = @event.EventStreamId; + + if (streamName.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) + { + streamName = streamName.Substring(prefix.Length + 1); + } + + return streamName; + } + + private static EnvelopeHeaders GetHeaders(IJsonSerializer serializer, RecordedEvent @event) + { + var headersJson = Encoding.UTF8.GetString(@event.Metadata); + var headers = serializer.Deserialize(headersJson); + + foreach (var key in headers.Keys.ToList()) + { + if (PrivateHeaders.Contains(key)) + { + headers.Remove(key); + } + } + + return headers; + } + public static EventStoreData Write(EventData eventData, IJsonSerializer serializer) { var payload = Encoding.UTF8.GetBytes(eventData.Payload); diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs index 7f7020fd5..1f2dfcecb 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using EventStore.ClientAPI; +using EventStore.ClientAPI.Exceptions; using Squidex.Infrastructure.Json; using Squidex.Infrastructure.Log; @@ -54,7 +55,7 @@ namespace Squidex.Infrastructure.EventSourcing public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null) { - return new GetEventStoreSubscription(connection, subscriber, serializer, projectionClient, position, streamFilter); + return new GetEventStoreSubscription(connection, subscriber, serializer, projectionClient, position, prefix, streamFilter); } public Task CreateIndexAsync(string property) @@ -91,7 +92,7 @@ namespace Squidex.Infrastructure.EventSourcing StreamEventsSlice currentSlice; do { - currentSlice = await connection.ReadStreamEventsForwardAsync(streamName, sliceStart, ReadPageSize, false); + currentSlice = await connection.ReadStreamEventsForwardAsync(streamName, sliceStart, ReadPageSize, true); if (currentSlice.Status == SliceReadStatus.Success) { @@ -99,7 +100,7 @@ namespace Squidex.Infrastructure.EventSourcing foreach (var resolved in currentSlice.Events) { - var storedEvent = Formatter.Read(resolved, serializer); + var storedEvent = Formatter.Read(resolved, prefix, serializer); await callback(storedEvent); } @@ -114,12 +115,12 @@ namespace Squidex.Infrastructure.EventSourcing { var result = new List(); - var sliceStart = streamPosition; + var sliceStart = streamPosition >= 0 ? streamPosition : StreamPosition.Start; StreamEventsSlice currentSlice; do { - currentSlice = await connection.ReadStreamEventsForwardAsync(streamName, sliceStart, ReadPageSize, false); + currentSlice = await connection.ReadStreamEventsForwardAsync(GetStreamName(streamName), sliceStart, ReadPageSize, true); if (currentSlice.Status == SliceReadStatus.Success) { @@ -127,7 +128,7 @@ namespace Squidex.Infrastructure.EventSourcing foreach (var resolved in currentSlice.Events) { - var storedEvent = Formatter.Read(resolved, serializer); + var storedEvent = Formatter.Read(resolved, prefix, serializer); result.Add(storedEvent); } @@ -141,7 +142,7 @@ namespace Squidex.Infrastructure.EventSourcing public Task DeleteStreamAsync(string streamName) { - return connection.DeleteStreamAsync(streamName, ExpectedVersion.Any); + return connection.DeleteStreamAsync(GetStreamName(streamName), ExpectedVersion.Any); } public Task AppendAsync(Guid commitId, string streamName, ICollection events) @@ -168,27 +169,39 @@ namespace Squidex.Infrastructure.EventSourcing return; } - var eventsToSave = events.Select(x => Formatter.Write(x, serializer)).ToList(); - - if (eventsToSave.Count < WritePageSize) - { - await connection.AppendToStreamAsync(GetStreamName(streamName), expectedVersion, eventsToSave); - } - else + try { - using (var transaction = await connection.StartTransactionAsync(GetStreamName(streamName), expectedVersion)) + var eventsToSave = events.Select(x => Formatter.Write(x, serializer)).ToList(); + + if (eventsToSave.Count < WritePageSize) { - for (var p = 0; p < eventsToSave.Count; p += WritePageSize) + await connection.AppendToStreamAsync(GetStreamName(streamName), expectedVersion, eventsToSave); + } + else + { + using (var transaction = await connection.StartTransactionAsync(GetStreamName(streamName), expectedVersion)) { - await transaction.WriteAsync(eventsToSave.Skip(p).Take(WritePageSize)); - } + for (var p = 0; p < eventsToSave.Count; p += WritePageSize) + { + await transaction.WriteAsync(eventsToSave.Skip(p).Take(WritePageSize)); + } - await transaction.CommitAsync(); + await transaction.CommitAsync(); + } } } + catch (WrongExpectedVersionException ex) + { + throw new WrongEventVersionException(ParseVersion(ex.Message), expectedVersion); + } } } + private static int ParseVersion(string message) + { + return int.Parse(message.Substring(message.LastIndexOf(':') + 1)); + } + private string GetStreamName(string streamName) { return $"{prefix}-{streamName}"; diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStoreSubscription.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStoreSubscription.cs index a1d3faf01..a458bda5c 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStoreSubscription.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStoreSubscription.cs @@ -18,6 +18,7 @@ namespace Squidex.Infrastructure.EventSourcing private readonly IEventStoreConnection connection; private readonly IEventSubscriber subscriber; private readonly IJsonSerializer serializer; + private readonly string prefix; private readonly EventStoreCatchUpSubscription subscription; private readonly long? position; @@ -27,6 +28,7 @@ namespace Squidex.Infrastructure.EventSourcing IJsonSerializer serializer, ProjectionClient projectionClient, string position, + string prefix, string streamFilter) { Guard.NotNull(subscriber, nameof(subscriber)); @@ -34,6 +36,7 @@ namespace Squidex.Infrastructure.EventSourcing this.connection = connection; this.position = projectionClient.ParsePositionOrNull(position); + this.prefix = prefix; var streamName = projectionClient.CreateProjectionAsync(streamFilter).Result; @@ -61,7 +64,7 @@ namespace Squidex.Infrastructure.EventSourcing return connection.SubscribeToStreamFrom(streamName, position, settings, (s, e) => { - var storedEvent = Formatter.Read(e, serializer); + var storedEvent = Formatter.Read(e, prefix, serializer); subscriber.OnEventAsync(this, storedEvent).Wait(); }, null, diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionClient.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionClient.cs index 2873e8625..ca098bb1e 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionClient.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionClient.cs @@ -137,7 +137,7 @@ namespace Squidex.Infrastructure.EventSourcing public long ParsePosition(string position) { - return long.TryParse(position, out var parsedPosition) ? parsedPosition : 0; + return long.TryParse(position, out var parsedPosition) ? parsedPosition + 1 : StreamPosition.Start; } } } diff --git a/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreTests.cs index fffed1488..6177410e2 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreTests.cs @@ -9,7 +9,7 @@ using Xunit; namespace Squidex.Infrastructure.Assets { - [Trait("Dependency", "Azure")] + [Trait("Category", "Dependencies")] public class AzureBlobAssetStoreTests : AssetStoreTests, IClassFixture { private readonly AzureBlobAssetStoreFixture fixture; diff --git a/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreFixture.cs b/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreFixture.cs index a43197886..58519697f 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreFixture.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreFixture.cs @@ -16,6 +16,7 @@ namespace Squidex.Infrastructure.Assets public GoogleCloudAssetStoreFixture() { AssetStore = new GoogleCloudAssetStore("squidex-test"); + AssetStore.InitializeAsync().Wait(); } public void Dispose() diff --git a/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreTests.cs index 77b8f7c46..b288961e1 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreTests.cs @@ -9,7 +9,7 @@ using Xunit; namespace Squidex.Infrastructure.Assets { - [Trait("Dependency", "GC")] + [Trait("Category", "Dependencies")] public class GoogleCloudAssetStoreTests : AssetStoreTests, IClassFixture { private readonly GoogleCloudAssetStoreFixture fixture; diff --git a/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFSAssetStoreFixture.cs b/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFSAssetStoreFixture.cs index 8e407be3b..25f88a01b 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFSAssetStoreFixture.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFSAssetStoreFixture.cs @@ -13,17 +13,16 @@ namespace Squidex.Infrastructure.Assets { public sealed class MongoGridFSAssetStoreFixture : IDisposable { - public MongoGridFsAssetStore AssetStore { get; } - - public IMongoClient MongoClient { get; } = new MongoClient("mongodb://localhost"); + private readonly IMongoClient mongoClient = new MongoClient("mongodb://localhost"); + private readonly IMongoDatabase mongoDatabase; - public IMongoDatabase MongoDatabase { get; } + public MongoGridFsAssetStore AssetStore { get; } public MongoGridFSAssetStoreFixture() { - MongoDatabase = MongoClient.GetDatabase("GridFSTest"); + mongoDatabase = mongoClient.GetDatabase("GridFSTest"); - var gridFSBucket = new GridFSBucket(MongoDatabase, new GridFSBucketOptions + var gridFSBucket = new GridFSBucket(mongoDatabase, new GridFSBucketOptions { BucketName = "fs" }); @@ -34,7 +33,7 @@ namespace Squidex.Infrastructure.Assets public void Dispose() { - MongoClient.DropDatabase("GridFSTest"); + mongoClient.DropDatabase("GridFSTest"); } } } diff --git a/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFsAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFsAssetStoreTests.cs index 0be3552ee..2662803ab 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFsAssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/MongoGridFsAssetStoreTests.cs @@ -9,7 +9,7 @@ using Xunit; namespace Squidex.Infrastructure.Assets { - [Trait("Dependency", "MongoDB")] + [Trait("Category", "Dependencies")] public class MongoGridFsAssetStoreTests : AssetStoreTests, IClassFixture { private readonly MongoGridFSAssetStoreFixture fixture; diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/EventStoreTests.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/EventStoreTests.cs index f4f3f24e7..3f9f33b08 100644 --- a/tests/Squidex.Infrastructure.Tests/EventSourcing/EventStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/EventStoreTests.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Threading.Tasks; using FluentAssertions; using Squidex.Infrastructure.Tasks; @@ -88,7 +89,7 @@ namespace Squidex.Infrastructure.EventSourcing var events = new EventData[] { new EventData("Type1", new EnvelopeHeaders(), "1"), - new EventData("Type2", new EnvelopeHeaders(), "2"), + new EventData("Type2", new EnvelopeHeaders(), "2") }; await Sut.AppendAsync(Guid.NewGuid(), streamName, events); @@ -117,31 +118,18 @@ namespace Squidex.Infrastructure.EventSourcing new EventData("Type2", new EnvelopeHeaders(), "2"), }; - var subscriber = new EventSubscriber(); - - IEventSubscription subscription = null; - try + var readEvents = await QueryWithSubscriptionAsync(streamName, async () => { - subscription = Sut.CreateSubscription(subscriber, streamName); - await Sut.AppendAsync(Guid.NewGuid(), streamName, events); + }); - subscription.WakeUp(); - - await Task.Delay(SubscriptionDelayInMs); - - var expected = new StoredEvent[] - { - new StoredEvent(streamName, "Position", 0, events[0]), - new StoredEvent(streamName, "Position", 1, events[1]) - }; - - ShouldBeEquivalentTo(subscriber.Events, expected); - } - finally + var expected = new StoredEvent[] { - await subscription.StopAsync(); - } + new StoredEvent(streamName, "Position", 0, events[0]), + new StoredEvent(streamName, "Position", 1, events[1]) + }; + + ShouldBeEquivalentTo(readEvents, expected); } [Fact] @@ -183,13 +171,12 @@ namespace Squidex.Infrastructure.EventSourcing }; await Sut.AppendAsync(Guid.NewGuid(), streamName, events); + await Sut.DeleteStreamAsync(streamName); - var readEvents1 = await QueryAsync(streamName); - var readEvents2 = await QueryWithCallbackAsync(streamName); + var readEvents = await QueryAsync(streamName); - Assert.Empty(readEvents1); - Assert.Empty(readEvents2); + Assert.Empty(readEvents); } [Fact] @@ -198,8 +185,8 @@ namespace Squidex.Infrastructure.EventSourcing var keyed1 = new EnvelopeHeaders(); var keyed2 = new EnvelopeHeaders(); - keyed1.Add("key", "1"); - keyed2.Add("key", "2"); + keyed1.Add("key", Guid.NewGuid().ToString()); + keyed2.Add("key", Guid.NewGuid().ToString()); var streamName1 = $"test-{Guid.NewGuid()}"; var streamName2 = $"test-{Guid.NewGuid()}"; @@ -221,7 +208,7 @@ namespace Squidex.Infrastructure.EventSourcing await Sut.AppendAsync(Guid.NewGuid(), streamName1, events1); await Sut.AppendAsync(Guid.NewGuid(), streamName2, events2); - var readEvents = await QueryWithFilterAsync("key", "2"); + var readEvents = await QueryWithFilterAsync("key", keyed2["key"].ToString()); var expected = new StoredEvent[] { @@ -239,20 +226,86 @@ namespace Squidex.Infrastructure.EventSourcing private async Task> QueryWithFilterAsync(string property, object value) { - var readEvents = new List(); + using (var cts = new CancellationTokenSource(30000)) + { + while (!cts.IsCancellationRequested) + { + var readEvents = new List(); + + await Sut.QueryAsync(x => { readEvents.Add(x); return TaskHelper.Done; }, property, value, null, cts.Token); + + await Task.Delay(500, cts.Token); + + if (readEvents.Count > 0) + { + return readEvents; + } + } - await Sut.QueryAsync(x => { readEvents.Add(x); return TaskHelper.Done; }, property, value); + cts.Token.ThrowIfCancellationRequested(); - return readEvents; + return null; + } } private async Task> QueryWithCallbackAsync(string streamFilter = null, string position = null) { - var readEvents = new List(); + using (var cts = new CancellationTokenSource(30000)) + { + while (!cts.IsCancellationRequested) + { + var readEvents = new List(); + + await Sut.QueryAsync(x => { readEvents.Add(x); return TaskHelper.Done; }, streamFilter, position, cts.Token); + + await Task.Delay(500, cts.Token); + + if (readEvents.Count > 0) + { + return readEvents; + } + } + + cts.Token.ThrowIfCancellationRequested(); - await Sut.QueryAsync(x => { readEvents.Add(x); return TaskHelper.Done; }, streamFilter, position); + return null; + } + } - return readEvents; + private async Task> QueryWithSubscriptionAsync(string streamFilter, Func action) + { + var subscriber = new EventSubscriber(); + + IEventSubscription subscription = null; + try + { + subscription = Sut.CreateSubscription(subscriber, streamFilter); + + await action(); + + using (var cts = new CancellationTokenSource(30000)) + { + while (!cts.IsCancellationRequested) + { + subscription.WakeUp(); + + await Task.Delay(500, cts.Token); + + if (subscriber.Events.Count > 0) + { + return subscriber.Events; + } + } + + cts.Token.ThrowIfCancellationRequested(); + + return null; + } + } + finally + { + await subscription.StopAsync(); + } } private void ShouldBeEquivalentTo(IEnumerable actual, params StoredEvent[] expected) diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/GetEventStoreFixture.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/GetEventStoreFixture.cs new file mode 100644 index 000000000..56720b447 --- /dev/null +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/GetEventStoreFixture.cs @@ -0,0 +1,62 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Linq; +using System.Net; +using System.Net.Sockets; +using System.Threading.Tasks; +using EventStore.ClientAPI; +using EventStore.ClientAPI.Projections; +using Squidex.Infrastructure.TestHelpers; + +namespace Squidex.Infrastructure.EventSourcing +{ + public sealed class GetEventStoreFixture : IDisposable + { + private readonly IEventStoreConnection connection; + + public GetEventStore EventStore { get; } + + public GetEventStoreFixture() + { + connection = EventStoreConnection.Create("ConnectTo=tcp://admin:changeit@localhost:1113; HeartBeatTimeout=500; MaxReconnections=-1"); + + EventStore = new GetEventStore(connection, JsonHelper.DefaultSerializer, "test", "localhost"); + EventStore.InitializeAsync().Wait(); + } + + public void Dispose() + { + CleanupAsync().Wait(); + } + + private async Task CleanupAsync() + { + var endpoints = await Dns.GetHostAddressesAsync("localhost"); + var endpoint = new IPEndPoint(endpoints.First(x => x.AddressFamily == AddressFamily.InterNetwork), 2113); + + var credentials = connection.Settings.DefaultUserCredentials; + + var projectionsManager = + new ProjectionsManager( + connection.Settings.Log, endpoint, + connection.Settings.OperationTimeout); + + foreach (var projection in await projectionsManager.ListAllAsync(credentials)) + { + var name = projection.Name; + + if (name.StartsWith("by-test", StringComparison.OrdinalIgnoreCase)) + { + await projectionsManager.DisableAsync(name, credentials); + await projectionsManager.DeleteAsync(name, true, credentials); + } + } + } + } +} diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/GetEventStoreTests.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/GetEventStoreTests.cs new file mode 100644 index 000000000..5b3f9a23c --- /dev/null +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/GetEventStoreTests.cs @@ -0,0 +1,29 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Xunit; + +namespace Squidex.Infrastructure.EventSourcing +{ + [Trait("Category", "Dependencies")] + public class GetEventStoreTests : EventStoreTests, IClassFixture + { + private readonly GetEventStoreFixture fixture; + + protected override int SubscriptionDelayInMs { get; } = 1000; + + public GetEventStoreTests(GetEventStoreFixture fixture) + { + this.fixture = fixture; + } + + public override GetEventStore CreateStore() + { + return fixture.EventStore; + } + } +} diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreFixture.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreFixture.cs index b000e1258..6e77f0abd 100644 --- a/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreFixture.cs +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreFixture.cs @@ -16,27 +16,25 @@ namespace Squidex.Infrastructure.EventSourcing { public sealed class MongoEventStoreFixture : IDisposable { - public MongoEventStore EventStore { get; } - - public IMongoClient MongoClient { get; } = new MongoClient("mongodb://localhost"); + private readonly IMongoClient mongoClient = new MongoClient("mongodb://localhost"); + private readonly IMongoDatabase mongoDatabase; + private readonly IEventNotifier notifier = A.Fake(); - public IMongoDatabase MongoDatabase { get; } - - public IEventNotifier Notifier { get; } = A.Fake(); + public MongoEventStore EventStore { get; } public MongoEventStoreFixture() { - MongoDatabase = MongoClient.GetDatabase("EventStoreTest"); + mongoDatabase = mongoClient.GetDatabase("EventStoreTest"); BsonJsonConvention.Register(JsonSerializer.Create(JsonHelper.DefaultSettings())); - EventStore = new MongoEventStore(MongoDatabase, Notifier); + EventStore = new MongoEventStore(mongoDatabase, notifier); EventStore.InitializeAsync().Wait(); } public void Dispose() { - MongoClient.DropDatabase("EventStoreTest"); + mongoClient.DropDatabase("EventStoreTest"); } } } diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreTests.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreTests.cs index 615fe0790..00a42a328 100644 --- a/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/MongoEventStoreTests.cs @@ -9,7 +9,7 @@ using Xunit; namespace Squidex.Infrastructure.EventSourcing { - [Trait("Dependency", "MongoDB")] + [Trait("Category", "Dependencies")] public class MongoEventStoreTests : EventStoreTests, IClassFixture { private readonly MongoEventStoreFixture fixture; diff --git a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj index 8a596b7aa..5bf9da847 100644 --- a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj +++ b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj @@ -8,6 +8,7 @@ + From d195002b2d54645274554701275e5256182b2536 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Feb 2019 15:53:50 +0100 Subject: [PATCH 15/55] Filter dependency tests. --- Dockerfile | 2 +- Dockerfile.build | 2 +- tests/RunCoverage.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6eefd8277..f1aa53214 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN cp -a /tmp/node_modules src/Squidex/ \ # Test Backend RUN dotnet restore \ - && dotnet test tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj \ + && dotnet test tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj --filter TraitName!=TraitValue \ && dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \ && dotnet test tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj \ && dotnet test tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj \ diff --git a/Dockerfile.build b/Dockerfile.build index 6f877d600..b79592a48 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -17,7 +17,7 @@ RUN cp -a /tmp/node_modules src/Squidex/ \ # Test Backend RUN dotnet restore \ - && dotnet test tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj \ + && dotnet test tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj --filter Category!=Dependencies \ && dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \ && dotnet test tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj \ && dotnet test tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj \ diff --git a/tests/RunCoverage.ps1 b/tests/RunCoverage.ps1 index bc2f198f1..64ef54bf2 100644 --- a/tests/RunCoverage.ps1 +++ b/tests/RunCoverage.ps1 @@ -25,7 +25,7 @@ if ($all -Or $infrastructure) { &"$folderHome\.nuget\packages\OpenCover\4.7.922\tools\OpenCover.Console.exe" ` -register:user ` -target:"C:\Program Files\dotnet\dotnet.exe" ` - -targetargs:"test $folderWorking\Squidex.Infrastructure.Tests\Squidex.Infrastructure.Tests.csproj" ` + -targetargs:"test $folderWorking\Squidex.Infrastructure.Tests\Squidex.Infrastructure.Tests.csproj --filter Category!=Dependencies" ` -filter:"+[Squidex.*]* -[Squidex.Infrastructure*]*CodeGen* -[Squidex.Infrastructure*]*OrleansGeneratedCode*" ` -skipautoprops ` -output:"$folderWorking\$folderReports\Infrastructure.xml" ` From 41d2d6d209f5990cc9044fbfce0f949592f78d33 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Feb 2019 16:53:03 +0100 Subject: [PATCH 16/55] Filter test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f1aa53214..a6859a510 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN cp -a /tmp/node_modules src/Squidex/ \ # Test Backend RUN dotnet restore \ - && dotnet test tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj --filter TraitName!=TraitValue \ + && dotnet test --filter Category!=Dependencies tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj \ && dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \ && dotnet test tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj \ && dotnet test tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj \ From ffa5e825b25d789fd180c72b8d5d733b533c1cf6 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Feb 2019 17:02:32 +0100 Subject: [PATCH 17/55] Filter finalized. --- Dockerfile.build | 2 +- tests/RunCoverage.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.build b/Dockerfile.build index b79592a48..4fba46954 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -17,7 +17,7 @@ RUN cp -a /tmp/node_modules src/Squidex/ \ # Test Backend RUN dotnet restore \ - && dotnet test tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj --filter Category!=Dependencies \ + && dotnet test --filter Category!=Dependencies tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj \ && dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \ && dotnet test tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj \ && dotnet test tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj \ diff --git a/tests/RunCoverage.ps1 b/tests/RunCoverage.ps1 index 64ef54bf2..b5d468203 100644 --- a/tests/RunCoverage.ps1 +++ b/tests/RunCoverage.ps1 @@ -25,7 +25,7 @@ if ($all -Or $infrastructure) { &"$folderHome\.nuget\packages\OpenCover\4.7.922\tools\OpenCover.Console.exe" ` -register:user ` -target:"C:\Program Files\dotnet\dotnet.exe" ` - -targetargs:"test $folderWorking\Squidex.Infrastructure.Tests\Squidex.Infrastructure.Tests.csproj --filter Category!=Dependencies" ` + -targetargs:"test --filter Category!=Dependencies $folderWorking\Squidex.Infrastructure.Tests\Squidex.Infrastructure.Tests.csproj" ` -filter:"+[Squidex.*]* -[Squidex.Infrastructure*]*CodeGen* -[Squidex.Infrastructure*]*OrleansGeneratedCode*" ` -skipautoprops ` -output:"$folderWorking\$folderReports\Infrastructure.xml" ` From c3e8f82e434943950a9d1f86cdba75618f0cfde6 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Feb 2019 20:40:18 +0100 Subject: [PATCH 18/55] Started with cosmos db. --- .../EventSourcing/CosmosDbEvent.cs | 33 ++++ .../EventSourcing/CosmosDbEventCommit.cs | 34 ++++ .../EventSourcing/CosmosDbEventStore.cs | 67 ++++++++ .../CosmosDbEventStore_Reader.cs | 160 ++++++++++++++++++ .../CosmosDbEventStore_Writer.cs | 138 +++++++++++++++ .../EventSourcing/FilterBuilder.cs | 145 ++++++++++++++++ .../EventSourcing/StreamPosition.cs | 55 ++++++ .../Squidex.Infrastructure.Azure.csproj | 1 + .../EventSourcing/MongoEventStore.cs | 1 - .../EventSourcing/MongoEventStore_Writer.cs | 14 +- .../EventSourcing/StreamPosition.cs | 2 +- .../CosmosDbEventStoreFixture.cs | 32 ++++ .../EventSourcing/CosmosDbEventStoreTests.cs | 29 ++++ 13 files changed, 702 insertions(+), 9 deletions(-) create mode 100644 src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEvent.cs create mode 100644 src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventCommit.cs create mode 100644 src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs create mode 100644 src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs create mode 100644 src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs create mode 100644 src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs create mode 100644 src/Squidex.Infrastructure.Azure/EventSourcing/StreamPosition.cs create mode 100644 tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreFixture.cs create mode 100644 tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreTests.cs diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEvent.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEvent.cs new file mode 100644 index 000000000..ce1beb819 --- /dev/null +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEvent.cs @@ -0,0 +1,33 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Newtonsoft.Json; + +namespace Squidex.Infrastructure.EventSourcing +{ + internal sealed class CosmosDbEvent + { + [JsonProperty] + public string Type { get; set; } + + [JsonProperty] + public string Payload { get; set; } + + [JsonProperty] + public EnvelopeHeaders Headers { get; set; } + + public static CosmosDbEvent FromEventData(EventData data) + { + return new CosmosDbEvent { Type = data.Type, Headers = data.Headers, Payload = data.Payload }; + } + + public EventData ToEventData() + { + return new EventData(Type, Headers, Payload); + } + } +} \ No newline at end of file diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventCommit.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventCommit.cs new file mode 100644 index 000000000..761123f68 --- /dev/null +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventCommit.cs @@ -0,0 +1,34 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Newtonsoft.Json; +using NodaTime; + +namespace Squidex.Infrastructure.EventSourcing +{ + internal sealed class CosmosDbEventCommit + { + [JsonProperty] + public Guid Id { get; set; } + + [JsonProperty] + public CosmosDbEvent[] Events { get; set; } + + [JsonProperty] + public long EventStreamOffset { get; set; } + + [JsonProperty] + public long EventsCount { get; set; } + + [JsonProperty] + public string EventStream { get; set; } + + [JsonProperty] + public long Timestamp { get; set; } + } +} diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs new file mode 100644 index 000000000..0adcadc73 --- /dev/null +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs @@ -0,0 +1,67 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.ObjectModel; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Azure.Documents; +using Microsoft.Azure.Documents.Client; +using Newtonsoft.Json; + +namespace Squidex.Infrastructure.EventSourcing +{ + public sealed partial class CosmosDbEventStore : IEventStore, IInitializable + { + private readonly DocumentClient documentClient; + private readonly Uri databaseUri; + private readonly Uri collectionUri; + private readonly string database; + + public CosmosDbEventStore(DocumentClient documentClient, string database) + { + Guard.NotNull(documentClient, nameof(documentClient)); + Guard.NotNullOrEmpty(database, nameof(database)); + + this.documentClient = documentClient; + + this.databaseUri = UriFactory.CreateDatabaseUri(database); + this.database = database; + + collectionUri = UriFactory.CreateDocumentCollectionUri(database, FilterBuilder.Collection); + } + + public async Task InitializeAsync(CancellationToken ct = default) + { + await documentClient.CreateDatabaseIfNotExistsAsync(new Database { Id = database }); + + await documentClient.CreateDocumentCollectionIfNotExistsAsync(databaseUri, + new DocumentCollection + { + UniqueKeyPolicy = new UniqueKeyPolicy + { + UniqueKeys = new Collection + { + new UniqueKey + { + Paths = new Collection + { + $"/{FilterBuilder.EventStreamField}", + $"/{FilterBuilder.EventStreamOffsetField}" + } + } + } + }, + Id = FilterBuilder.Collection, + }, + new RequestOptions + { + PartitionKey = new PartitionKey($"/{FilterBuilder.EventStreamField}") + }); + } + } +} diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs new file mode 100644 index 000000000..f2d2e2194 --- /dev/null +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs @@ -0,0 +1,160 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Azure.Documents.Linq; +using Squidex.Infrastructure.Log; + +namespace Squidex.Infrastructure.EventSourcing +{ + public delegate bool EventPredicate(EventData data); + + public partial class CosmosDbEventStore : IEventStore, IInitializable + { + public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null) + { + Guard.NotNull(subscriber, nameof(subscriber)); + Guard.NotNullOrEmpty(streamFilter, nameof(streamFilter)); + + return new PollingSubscription(this, subscriber, streamFilter, position); + } + + public Task CreateIndexAsync(string property) + { + return Task.CompletedTask; + } + + public async Task> QueryAsync(string streamName, long streamPosition = 0) + { + using (Profiler.TraceMethod()) + { + var query = + documentClient.CreateDocumentQuery(collectionUri, + FilterBuilder.ByStreamName(streamName, streamPosition)); + + var documentQuery = query.AsDocumentQuery(); + + var result = new List(); + + while (documentQuery.HasMoreResults) + { + var commits = await documentQuery.ExecuteNextAsync(); + + foreach (var commit in commits) + { + var eventStreamOffset = (int)commit.EventStreamOffset; + + var commitTimestamp = commit.Timestamp; + var commitOffset = 0; + + foreach (var e in commit.Events) + { + eventStreamOffset++; + + if (eventStreamOffset >= streamPosition) + { + var eventData = e.ToEventData(); + var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); + + result.Add(new StoredEvent(streamName, eventToken, eventStreamOffset, eventData)); + } + } + } + } + + return result; + } + } + + public Task QueryAsync(Func callback, string property, object value, string position = null, CancellationToken ct = default) + { + Guard.NotNull(callback, nameof(callback)); + + StreamPosition lastPosition = position; + + var filterDefinition = CreateFilter(property, value, lastPosition); + var filterExpression = CreateFilterExpression(property, value); + + return QueryAsync(callback, lastPosition, filterDefinition, filterExpression, ct); + } + + public Task QueryAsync(Func callback, string streamFilter = null, string position = null, CancellationToken ct = default) + { + Guard.NotNull(callback, nameof(callback)); + + StreamPosition lastPosition = position; + + var filterDefinition = CreateFilter(streamFilter, lastPosition); + var filterExpression = CreateFilterExpression(null, null); + + return QueryAsync(callback, lastPosition, filterDefinition, filterExpression, ct); + } + + private async Task QueryAsync(Func callback, StreamPosition lastPosition, IQueryable query, EventPredicate filterExpression, CancellationToken ct = default) + { + using (Profiler.TraceMethod()) + { + var documentQuery = query.AsDocumentQuery(); + + while (documentQuery.HasMoreResults && !ct.IsCancellationRequested) + { + var commits = await documentQuery.ExecuteNextAsync(ct); + + foreach (var commit in commits) + { + var eventStreamOffset = (int)commit.EventStreamOffset; + + var commitTimestamp = commit.Timestamp; + var commitOffset = 0; + + foreach (var e in commit.Events) + { + eventStreamOffset++; + + if (commitOffset > lastPosition.CommitOffset || commitTimestamp > lastPosition.Timestamp) + { + var eventData = e.ToEventData(); + + if (filterExpression(eventData)) + { + var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); + + await callback(new StoredEvent(commit.EventStream, eventToken, eventStreamOffset, eventData)); + } + } + + commitOffset++; + } + } + } + } + } + + private IQueryable CreateFilter(string property, object value, StreamPosition streamPosition) + { + var query = FilterBuilder.ByProperty(property, value, streamPosition); + + return documentClient.CreateDocumentQuery(collectionUri, query); + } + + private IQueryable CreateFilter(string streamFilter, StreamPosition streamPosition) + { + var query = FilterBuilder.ByFilter(streamFilter, streamPosition); + + return documentClient.CreateDocumentQuery(collectionUri, query); + } + + private static EventPredicate CreateFilterExpression(string property, object value) + { + return FilterBuilder.CreateFilterExpression(property, value); + } + } +} \ No newline at end of file diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs new file mode 100644 index 000000000..912713204 --- /dev/null +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs @@ -0,0 +1,138 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Threading.Tasks; +using Microsoft.Azure.Documents; +using Microsoft.Azure.Documents.Client; +using NodaTime; +using Squidex.Infrastructure.Log; + +namespace Squidex.Infrastructure.EventSourcing +{ + public partial class CosmosDbEventStore + { + private const int MaxWriteAttempts = 20; + private const int MaxCommitSize = 10; + private static readonly FeedOptions TakeOne = new FeedOptions { MaxItemCount = 1 }; + + public Task DeleteStreamAsync(string streamName) + { + return Task.CompletedTask; + } + + public Task AppendAsync(Guid commitId, string streamName, ICollection events) + { + return AppendAsync(commitId, streamName, EtagVersion.Any, events); + } + + public async Task AppendAsync(Guid commitId, string streamName, long expectedVersion, ICollection events) + { + Guard.GreaterEquals(expectedVersion, EtagVersion.Any, nameof(expectedVersion)); + Guard.NotNullOrEmpty(streamName, nameof(streamName)); + Guard.NotNull(events, nameof(events)); + Guard.LessThan(events.Count, MaxCommitSize, "events.Count"); + + using (Profiler.TraceMethod()) + { + if (events.Count == 0) + { + return; + } + + var currentVersion = GetEventStreamOffset(streamName); + + if (expectedVersion != EtagVersion.Any && expectedVersion != currentVersion) + { + throw new WrongEventVersionException(currentVersion, expectedVersion); + } + + var commit = BuildCommit(commitId, streamName, expectedVersion >= -1 ? expectedVersion : currentVersion, events); + + for (var attempt = 0; attempt < MaxWriteAttempts; attempt++) + { + try + { + await documentClient.CreateDocumentAsync(collectionUri, commit); + + return; + } + catch (DocumentClientException ex) + { + if (ex.StatusCode == HttpStatusCode.Conflict) + { + currentVersion = GetEventStreamOffset(streamName); + + if (expectedVersion != EtagVersion.Any) + { + throw new WrongEventVersionException(currentVersion, expectedVersion); + } + + if (attempt < MaxWriteAttempts) + { + expectedVersion = currentVersion; + } + else + { + throw new TimeoutException("Could not acquire a free slot for the commit within the provided time."); + } + } + else + { + throw; + } + } + } + } + } + + private long GetEventStreamOffset(string streamName) + { + var query = + documentClient.CreateDocumentQuery(collectionUri, + FilterBuilder.LastPosition(streamName)); + + var document = query.ToList().FirstOrDefault(); + + if (document != null) + { + return document.EventStreamOffset + document.EventsCount; + } + + return EtagVersion.Empty; + } + + private static CosmosDbEventCommit BuildCommit(Guid commitId, string streamName, long expectedVersion, ICollection events) + { + var commitEvents = new CosmosDbEvent[events.Count]; + + var i = 0; + + foreach (var e in events) + { + var mongoEvent = CosmosDbEvent.FromEventData(e); + + commitEvents[i++] = mongoEvent; + } + + var mongoCommit = new CosmosDbEventCommit + { + Id = commitId, + Events = commitEvents, + EventsCount = events.Count, + EventStream = streamName, + EventStreamOffset = expectedVersion, + Timestamp = SystemClock.Instance.GetCurrentInstant().ToUnixTimeTicks() + }; + + return mongoCommit; + } + } +} \ No newline at end of file diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs new file mode 100644 index 000000000..98eed6335 --- /dev/null +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs @@ -0,0 +1,145 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using Microsoft.Azure.Documents; +using Squidex.Infrastructure.Json.Objects; + +namespace Squidex.Infrastructure.EventSourcing +{ + internal static class FilterBuilder + { + public const string Collection = "Events"; + + public static readonly string EventsCountField = nameof(CosmosDbEventCommit.EventsCount).ToCamelCase(); + public static readonly string EventStreamOffsetField = nameof(CosmosDbEventCommit.EventStreamOffset).ToCamelCase(); + public static readonly string EventStreamField = nameof(CosmosDbEventCommit.EventStream).ToCamelCase(); + public static readonly string TimestampField = nameof(CosmosDbEventCommit.Timestamp).ToCamelCase(); + + public static SqlQuerySpec LastPosition(string streamName) + { + var query = + $"SELECT TOP 1 " + + $" e.{EventStreamOffsetField}," + + $" e.{EventsCountField} " + + $"FROM {Collection} e " + + $"WHERE " + + $" e.{EventStreamField} = @name " + + $"ORDER BY e.{EventStreamOffsetField} DESC"; + + var parameters = new SqlParameterCollection + { + new SqlParameter("@name", streamName) + }; + + return new SqlQuerySpec(query, parameters); + } + + public static SqlQuerySpec ByStreamName(string streamName, long streamPosition = 0) + { + var query = + $"SELECT * " + + $"FROM {Collection} e " + + $"WHERE " + + $" e.{EventStreamField} = @name " + + $"AND e.{EventStreamOffsetField} >= @position " + + $"ORDER BY e.{EventStreamOffsetField} ASC"; + + var parameters = new SqlParameterCollection + { + new SqlParameter("@name", streamName), + new SqlParameter("@position", streamPosition) + }; + + return new SqlQuerySpec(query, parameters); + } + + public static SqlQuerySpec ByProperty(string property, object value, StreamPosition streamPosition) + { + var filters = new List(); + + var parameters = new SqlParameterCollection(); + + filters.ForPosition(parameters, streamPosition); + filters.ForProperty(parameters, property, value); + + return BuildQuery(filters, parameters); + } + + public static SqlQuerySpec ByFilter(string streamFilter, StreamPosition streamPosition) + { + var filters = new List(); + + var parameters = new SqlParameterCollection(); + + filters.ForPosition(parameters, streamPosition); + filters.ForRegex(parameters, streamFilter); + + return BuildQuery(filters, parameters); + } + + private static SqlQuerySpec BuildQuery(List filters, SqlParameterCollection parameters) + { + var query = $"SELECT * FROM {Collection} e WHERE {string.Join(" AND ", filters)} ORDER BY e.{TimestampField}"; + + return new SqlQuerySpec(query, parameters); + } + + private static void ForProperty(this List filters, SqlParameterCollection parameters, string property, object value) + { + filters.Add($"e.events.headers.{property} = @value"); + + parameters.Add(new SqlParameter("@value", value)); + } + + private static void ForRegex(this List filters, SqlParameterCollection parameters, string streamFilter) + { + if (!string.IsNullOrWhiteSpace(streamFilter) && !string.Equals(streamFilter, ".*", StringComparison.OrdinalIgnoreCase)) + { + if (streamFilter.Contains("^")) + { + filters.Add($"STARTSWITH(e.{EventStreamField}, @filter)"); + } + else + { + filters.Add($"e.{EventStreamField} = @filter"); + } + + parameters.Add(new SqlParameter("@filter", streamFilter)); + } + } + + private static void ForPosition(this List filters, SqlParameterCollection parameters, StreamPosition streamPosition) + { + if (streamPosition.IsEndOfCommit) + { + filters.Add($"e.{TimestampField} > @time"); + } + else + { + filters.Add($"e.{TimestampField} >= @time"); + } + + parameters.Add(new SqlParameter("@time", streamPosition.Timestamp)); + } + + public static EventPredicate CreateFilterExpression(string property, object value) + { + if (!string.IsNullOrWhiteSpace(property)) + { + var jsonValue = JsonValue.Create(value); + + return x => x.Headers.TryGetValue(property, out var p) && p.Equals(jsonValue); + } + else + { + return x => true; + } + } + } +} diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/StreamPosition.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/StreamPosition.cs new file mode 100644 index 000000000..f0626ee5d --- /dev/null +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/StreamPosition.cs @@ -0,0 +1,55 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Infrastructure.EventSourcing +{ + internal sealed class StreamPosition + { + public long Timestamp { get; } + + public long CommitOffset { get; } + + public long CommitSize { get; } + + public bool IsEndOfCommit + { + get { return CommitOffset == CommitSize - 1; } + } + + public StreamPosition(long timestamp, long commitOffset, long commitSize) + { + Timestamp = timestamp; + + CommitOffset = commitOffset; + CommitSize = commitSize; + } + + public static implicit operator string(StreamPosition position) + { + var parts = new object[] + { + position.Timestamp, + position.CommitOffset, + position.CommitSize + }; + + return string.Join("-", parts); + } + + public static implicit operator StreamPosition(string position) + { + if (!string.IsNullOrWhiteSpace(position)) + { + var parts = position.Split('-'); + + return new StreamPosition(long.Parse(parts[0]), long.Parse(parts[1]), long.Parse(parts[2])); + } + + return new StreamPosition(0, -1, -1); + } + } +} diff --git a/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj b/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj index 755262980..d4d6148da 100644 --- a/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj +++ b/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj @@ -5,6 +5,7 @@ 7.3 + diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs index fe20956ed..c33c11f40 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs @@ -15,7 +15,6 @@ namespace Squidex.Infrastructure.EventSourcing { public partial class MongoEventStore : MongoRepositoryBase, IEventStore { - private const int MaxCommitSize = 10; private static readonly FieldDefinition TimestampField = Fields.Build(x => x.Timestamp); private static readonly FieldDefinition EventsCountField = Fields.Build(x => x.EventsCount); private static readonly FieldDefinition EventStreamOffsetField = Fields.Build(x => x.EventStreamOffset); diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs index aa0707f2e..a7dbe12de 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs @@ -16,6 +16,7 @@ namespace Squidex.Infrastructure.EventSourcing { public partial class MongoEventStore { + private const int MaxCommitSize = 10; private const int MaxWriteAttempts = 20; private static readonly BsonTimestamp EmptyTimestamp = new BsonTimestamp(0); @@ -31,20 +32,19 @@ namespace Squidex.Infrastructure.EventSourcing public async Task AppendAsync(Guid commitId, string streamName, long expectedVersion, ICollection events) { + Guard.GreaterEquals(expectedVersion, EtagVersion.Any, nameof(expectedVersion)); + Guard.NotNullOrEmpty(streamName, nameof(streamName)); + Guard.NotNull(events, nameof(events)); Guard.LessThan(events.Count, MaxCommitSize, "events.Count"); using (Profiler.TraceMethod()) { - Guard.GreaterEquals(expectedVersion, EtagVersion.Any, nameof(expectedVersion)); - Guard.NotNullOrEmpty(streamName, nameof(streamName)); - Guard.NotNull(events, nameof(events)); - if (events.Count == 0) { return; } - var currentVersion = await GetEventStreamOffset(streamName); + var currentVersion = await GetEventStreamOffsetAsync(streamName); if (expectedVersion != EtagVersion.Any && expectedVersion != currentVersion) { @@ -67,7 +67,7 @@ namespace Squidex.Infrastructure.EventSourcing { if (ex.WriteError?.Category == ServerErrorCategory.DuplicateKey) { - currentVersion = await GetEventStreamOffset(streamName); + currentVersion = await GetEventStreamOffsetAsync(streamName); if (expectedVersion != EtagVersion.Any) { @@ -92,7 +92,7 @@ namespace Squidex.Infrastructure.EventSourcing } } - private async Task GetEventStreamOffset(string streamName) + private async Task GetEventStreamOffsetAsync(string streamName) { var document = await Collection.Find(Filter.Eq(EventStreamField, streamName)) diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/StreamPosition.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/StreamPosition.cs index 45c0910e9..661c83435 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/StreamPosition.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/StreamPosition.cs @@ -9,7 +9,7 @@ using MongoDB.Bson; namespace Squidex.Infrastructure.EventSourcing { - public sealed class StreamPosition + internal sealed class StreamPosition { private static readonly BsonTimestamp EmptyTimestamp = new BsonTimestamp(0); diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreFixture.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreFixture.cs new file mode 100644 index 000000000..221a6c305 --- /dev/null +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreFixture.cs @@ -0,0 +1,32 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Microsoft.Azure.Documents.Client; +using Squidex.Infrastructure.TestHelpers; + +namespace Squidex.Infrastructure.EventSourcing +{ + public sealed class CosmosDbEventStoreFixture : IDisposable + { + private readonly DocumentClient client; + + public CosmosDbEventStore EventStore { get; } + + public CosmosDbEventStoreFixture() + { + client = new DocumentClient(new Uri("https://localhost:8081"), "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==", JsonHelper.DefaultSettings()); + + EventStore = new CosmosDbEventStore(client, "Test"); + EventStore.InitializeAsync().Wait(); + } + + public void Dispose() + { + } + } +} diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreTests.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreTests.cs new file mode 100644 index 000000000..f49d2f064 --- /dev/null +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreTests.cs @@ -0,0 +1,29 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Xunit; + +namespace Squidex.Infrastructure.EventSourcing +{ + [Trait("Category", "Dependencies")] + public class CosmosDbEventStoreTests : EventStoreTests, IClassFixture + { + private readonly CosmosDbEventStoreFixture fixture; + + protected override int SubscriptionDelayInMs { get; } = 1000; + + public CosmosDbEventStoreTests(CosmosDbEventStoreFixture fixture) + { + this.fixture = fixture; + } + + public override CosmosDbEventStore CreateStore() + { + return fixture.EventStore; + } + } +} From 752cbfc431109d01205b2b381ecabb8f4da55084 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Feb 2019 20:41:07 +0100 Subject: [PATCH 19/55] Small refactoring. --- .../EventSourcing/MongoEventStore.cs | 1 - .../EventSourcing/MongoEventStore_Writer.cs | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs index fe20956ed..c33c11f40 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs @@ -15,7 +15,6 @@ namespace Squidex.Infrastructure.EventSourcing { public partial class MongoEventStore : MongoRepositoryBase, IEventStore { - private const int MaxCommitSize = 10; private static readonly FieldDefinition TimestampField = Fields.Build(x => x.Timestamp); private static readonly FieldDefinition EventsCountField = Fields.Build(x => x.EventsCount); private static readonly FieldDefinition EventStreamOffsetField = Fields.Build(x => x.EventStreamOffset); diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs index aa0707f2e..83f0416e7 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs @@ -17,6 +17,7 @@ namespace Squidex.Infrastructure.EventSourcing public partial class MongoEventStore { private const int MaxWriteAttempts = 20; + private const int MaxCommitSize = 10; private static readonly BsonTimestamp EmptyTimestamp = new BsonTimestamp(0); public Task DeleteStreamAsync(string streamName) @@ -32,13 +33,12 @@ namespace Squidex.Infrastructure.EventSourcing public async Task AppendAsync(Guid commitId, string streamName, long expectedVersion, ICollection events) { Guard.LessThan(events.Count, MaxCommitSize, "events.Count"); + Guard.GreaterEquals(expectedVersion, EtagVersion.Any, nameof(expectedVersion)); + Guard.NotNullOrEmpty(streamName, nameof(streamName)); + Guard.NotNull(events, nameof(events)); using (Profiler.TraceMethod()) { - Guard.GreaterEquals(expectedVersion, EtagVersion.Any, nameof(expectedVersion)); - Guard.NotNullOrEmpty(streamName, nameof(streamName)); - Guard.NotNull(events, nameof(events)); - if (events.Count == 0) { return; From 2cd7d517e8dc6f83cf7acf95c6ee35a40ed3cf2c Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 25 Feb 2019 12:30:36 +0100 Subject: [PATCH 20/55] Filter for property. --- .../EventSourcing/CosmosDbEventCommit.cs | 1 - .../EventSourcing/CosmosDbEventStore.cs | 1 - src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventCommit.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventCommit.cs index 761123f68..7e104f2c9 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventCommit.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventCommit.cs @@ -7,7 +7,6 @@ using System; using Newtonsoft.Json; -using NodaTime; namespace Squidex.Infrastructure.EventSourcing { diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs index 0adcadc73..d25052b78 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs @@ -11,7 +11,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Azure.Documents; using Microsoft.Azure.Documents.Client; -using Newtonsoft.Json; namespace Squidex.Infrastructure.EventSourcing { diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs index 98eed6335..0de29581f 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs @@ -92,7 +92,7 @@ namespace Squidex.Infrastructure.EventSourcing private static void ForProperty(this List filters, SqlParameterCollection parameters, string property, object value) { - filters.Add($"e.events.headers.{property} = @value"); + filters.Add($"ARRAY_CONTAINS(e.events, {{ \"headers\": {{ \"{property}\": @value }} }}, true)"); parameters.Add(new SqlParameter("@value", value)); } From f31e94db07d002297c7c2c9fd7a08f4744287380 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 25 Feb 2019 13:35:26 +0100 Subject: [PATCH 21/55] Queries finalized. --- .../EventSourcing/CosmosDbEvent.cs | 6 +- .../EventSourcing/CosmosDbEventCommit.cs | 12 +- .../EventSourcing/CosmosDbEventStore.cs | 10 +- .../CosmosDbEventStore_Reader.cs | 109 ++++++------------ .../CosmosDbEventStore_Writer.cs | 7 +- .../EventSourcing/FilterBuilder.cs | 54 ++++++++- 6 files changed, 109 insertions(+), 89 deletions(-) diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEvent.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEvent.cs index ce1beb819..c12c6548f 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEvent.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEvent.cs @@ -11,13 +11,13 @@ namespace Squidex.Infrastructure.EventSourcing { internal sealed class CosmosDbEvent { - [JsonProperty] + [JsonProperty("type")] public string Type { get; set; } - [JsonProperty] + [JsonProperty("payload")] public string Payload { get; set; } - [JsonProperty] + [JsonProperty("header")] public EnvelopeHeaders Headers { get; set; } public static CosmosDbEvent FromEventData(EventData data) diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventCommit.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventCommit.cs index 7e104f2c9..6a5dca9b3 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventCommit.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventCommit.cs @@ -12,22 +12,22 @@ namespace Squidex.Infrastructure.EventSourcing { internal sealed class CosmosDbEventCommit { - [JsonProperty] + [JsonProperty("id")] public Guid Id { get; set; } - [JsonProperty] + [JsonProperty("events")] public CosmosDbEvent[] Events { get; set; } - [JsonProperty] + [JsonProperty("eventStreamOffset")] public long EventStreamOffset { get; set; } - [JsonProperty] + [JsonProperty("eventsCount")] public long EventsCount { get; set; } - [JsonProperty] + [JsonProperty("eventStream")] public string EventStream { get; set; } - [JsonProperty] + [JsonProperty("timestamp")] public long Timestamp { get; set; } } } diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs index d25052b78..c28984b0f 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs @@ -19,7 +19,8 @@ namespace Squidex.Infrastructure.EventSourcing private readonly DocumentClient documentClient; private readonly Uri databaseUri; private readonly Uri collectionUri; - private readonly string database; + private readonly string databaseId; + private readonly string collectionId; public CosmosDbEventStore(DocumentClient documentClient, string database) { @@ -28,15 +29,16 @@ namespace Squidex.Infrastructure.EventSourcing this.documentClient = documentClient; - this.databaseUri = UriFactory.CreateDatabaseUri(database); - this.database = database; + databaseUri = UriFactory.CreateDatabaseUri(database); + databaseId = database; collectionUri = UriFactory.CreateDocumentCollectionUri(database, FilterBuilder.Collection); + collectionId = FilterBuilder.Collection; } public async Task InitializeAsync(CancellationToken ct = default) { - await documentClient.CreateDatabaseIfNotExistsAsync(new Database { Id = database }); + await documentClient.CreateDatabaseIfNotExistsAsync(new Database { Id = databaseId }); await documentClient.CreateDocumentCollectionIfNotExistsAsync(databaseUri, new DocumentCollection diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs index f2d2e2194..adaef8785 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs @@ -7,11 +7,11 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.Azure.Documents.Linq; +using Microsoft.Azure.Documents; using Squidex.Infrastructure.Log; +using Squidex.Infrastructure.Tasks; namespace Squidex.Infrastructure.EventSourcing { @@ -24,7 +24,7 @@ namespace Squidex.Infrastructure.EventSourcing Guard.NotNull(subscriber, nameof(subscriber)); Guard.NotNullOrEmpty(streamFilter, nameof(streamFilter)); - return new PollingSubscription(this, subscriber, streamFilter, position); + throw new NotSupportedException(); } public Task CreateIndexAsync(string property) @@ -36,39 +36,32 @@ namespace Squidex.Infrastructure.EventSourcing { using (Profiler.TraceMethod()) { - var query = - documentClient.CreateDocumentQuery(collectionUri, - FilterBuilder.ByStreamName(streamName, streamPosition)); - - var documentQuery = query.AsDocumentQuery(); + var query = FilterBuilder.ByStreamName(streamName, streamPosition - MaxCommitSize); var result = new List(); - while (documentQuery.HasMoreResults) + await documentClient.QueryAsync(collectionUri, query, commit => { - var commits = await documentQuery.ExecuteNextAsync(); + var eventStreamOffset = (int)commit.EventStreamOffset; - foreach (var commit in commits) - { - var eventStreamOffset = (int)commit.EventStreamOffset; + var commitTimestamp = commit.Timestamp; + var commitOffset = 0; - var commitTimestamp = commit.Timestamp; - var commitOffset = 0; + foreach (var e in commit.Events) + { + eventStreamOffset++; - foreach (var e in commit.Events) + if (eventStreamOffset >= streamPosition) { - eventStreamOffset++; + var eventData = e.ToEventData(); + var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); - if (eventStreamOffset >= streamPosition) - { - var eventData = e.ToEventData(); - var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); - - result.Add(new StoredEvent(streamName, eventToken, eventStreamOffset, eventData)); - } + result.Add(new StoredEvent(streamName, eventToken, eventStreamOffset, eventData)); } } - } + + return TaskHelper.Done; + }); return result; } @@ -80,8 +73,8 @@ namespace Squidex.Infrastructure.EventSourcing StreamPosition lastPosition = position; - var filterDefinition = CreateFilter(property, value, lastPosition); - var filterExpression = CreateFilterExpression(property, value); + var filterDefinition = FilterBuilder.CreateByProperty(property, value, lastPosition); + var filterExpression = FilterBuilder.CreateExpression(property, value); return QueryAsync(callback, lastPosition, filterDefinition, filterExpression, ct); } @@ -92,69 +85,43 @@ namespace Squidex.Infrastructure.EventSourcing StreamPosition lastPosition = position; - var filterDefinition = CreateFilter(streamFilter, lastPosition); - var filterExpression = CreateFilterExpression(null, null); + var filterDefinition = FilterBuilder.CreateByFilter(streamFilter, lastPosition); + var filterExpression = FilterBuilder.CreateExpression(null, null); return QueryAsync(callback, lastPosition, filterDefinition, filterExpression, ct); } - private async Task QueryAsync(Func callback, StreamPosition lastPosition, IQueryable query, EventPredicate filterExpression, CancellationToken ct = default) + private async Task QueryAsync(Func callback, StreamPosition lastPosition, SqlQuerySpec query, EventPredicate filterExpression, CancellationToken ct = default) { using (Profiler.TraceMethod()) { - var documentQuery = query.AsDocumentQuery(); - - while (documentQuery.HasMoreResults && !ct.IsCancellationRequested) + await documentClient.QueryAsync(collectionUri, query, async commit => { - var commits = await documentQuery.ExecuteNextAsync(ct); + var eventStreamOffset = (int)commit.EventStreamOffset; - foreach (var commit in commits) - { - var eventStreamOffset = (int)commit.EventStreamOffset; + var commitTimestamp = commit.Timestamp; + var commitOffset = 0; - var commitTimestamp = commit.Timestamp; - var commitOffset = 0; + foreach (var e in commit.Events) + { + eventStreamOffset++; - foreach (var e in commit.Events) + if (commitOffset > lastPosition.CommitOffset || commitTimestamp > lastPosition.Timestamp) { - eventStreamOffset++; + var eventData = e.ToEventData(); - if (commitOffset > lastPosition.CommitOffset || commitTimestamp > lastPosition.Timestamp) + if (filterExpression(eventData)) { - var eventData = e.ToEventData(); - - if (filterExpression(eventData)) - { - var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); + var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); - await callback(new StoredEvent(commit.EventStream, eventToken, eventStreamOffset, eventData)); - } + await callback(new StoredEvent(commit.EventStream, eventToken, eventStreamOffset, eventData)); } - - commitOffset++; } + + commitOffset++; } - } + }, ct); } } - - private IQueryable CreateFilter(string property, object value, StreamPosition streamPosition) - { - var query = FilterBuilder.ByProperty(property, value, streamPosition); - - return documentClient.CreateDocumentQuery(collectionUri, query); - } - - private IQueryable CreateFilter(string streamFilter, StreamPosition streamPosition) - { - var query = FilterBuilder.ByFilter(streamFilter, streamPosition); - - return documentClient.CreateDocumentQuery(collectionUri, query); - } - - private static EventPredicate CreateFilterExpression(string property, object value) - { - return FilterBuilder.CreateFilterExpression(property, value); - } } } \ No newline at end of file diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs index 912713204..89650117d 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs @@ -25,7 +25,12 @@ namespace Squidex.Infrastructure.EventSourcing public Task DeleteStreamAsync(string streamName) { - return Task.CompletedTask; + var query = FilterBuilder.AllIds(streamName); + + return documentClient.QueryAsync(collectionUri, query, commit => + { + return documentClient.DeleteDocumentAsync(UriFactory.CreateDocumentUri(databaseId, collectionId, commit.Id.ToString())); + }); } public Task AppendAsync(Guid commitId, string streamName, ICollection events) diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs index 0de29581f..821c53092 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs @@ -7,7 +7,11 @@ using System; using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; using Microsoft.Azure.Documents; +using Microsoft.Azure.Documents.Client; +using Microsoft.Azure.Documents.Linq; using Squidex.Infrastructure.Json.Objects; namespace Squidex.Infrastructure.EventSourcing @@ -16,11 +20,53 @@ namespace Squidex.Infrastructure.EventSourcing { public const string Collection = "Events"; + public static readonly string CommitId = nameof(CosmosDbEventCommit.Id).ToCamelCase(); public static readonly string EventsCountField = nameof(CosmosDbEventCommit.EventsCount).ToCamelCase(); public static readonly string EventStreamOffsetField = nameof(CosmosDbEventCommit.EventStreamOffset).ToCamelCase(); public static readonly string EventStreamField = nameof(CosmosDbEventCommit.EventStream).ToCamelCase(); public static readonly string TimestampField = nameof(CosmosDbEventCommit.Timestamp).ToCamelCase(); + public static async Task QueryAsync(this DocumentClient documentClient, Uri collectionUri, SqlQuerySpec querySpec, Func handler, CancellationToken ct = default) + { + var query = + documentClient.CreateDocumentQuery(collectionUri, querySpec) + .AsDocumentQuery(); + + using (query) + { + var result = new List(); + + while (query.HasMoreResults && !ct.IsCancellationRequested) + { + var commits = await query.ExecuteNextAsync(ct); + + foreach (var commit in commits) + { + await handler(commit); + } + } + } + } + + public static SqlQuerySpec AllIds(string streamName) + { + var query = + $"SELECT TOP 1 " + + $" e.{CommitId}," + + $" e.{EventsCountField} " + + $"FROM {Collection} e " + + $"WHERE " + + $" e.{EventStreamField} = @name " + + $"ORDER BY e.{EventStreamOffsetField} DESC"; + + var parameters = new SqlParameterCollection + { + new SqlParameter("@name", streamName) + }; + + return new SqlQuerySpec(query, parameters); + } + public static SqlQuerySpec LastPosition(string streamName) { var query = @@ -59,7 +105,7 @@ namespace Squidex.Infrastructure.EventSourcing return new SqlQuerySpec(query, parameters); } - public static SqlQuerySpec ByProperty(string property, object value, StreamPosition streamPosition) + public static SqlQuerySpec CreateByProperty(string property, object value, StreamPosition streamPosition) { var filters = new List(); @@ -71,7 +117,7 @@ namespace Squidex.Infrastructure.EventSourcing return BuildQuery(filters, parameters); } - public static SqlQuerySpec ByFilter(string streamFilter, StreamPosition streamPosition) + public static SqlQuerySpec CreateByFilter(string streamFilter, StreamPosition streamPosition) { var filters = new List(); @@ -92,7 +138,7 @@ namespace Squidex.Infrastructure.EventSourcing private static void ForProperty(this List filters, SqlParameterCollection parameters, string property, object value) { - filters.Add($"ARRAY_CONTAINS(e.events, {{ \"headers\": {{ \"{property}\": @value }} }}, true)"); + filters.Add($"ARRAY_CONTAINS(e.events, {{ \"header\": {{ \"{property}\": @value }} }}, true)"); parameters.Add(new SqlParameter("@value", value)); } @@ -128,7 +174,7 @@ namespace Squidex.Infrastructure.EventSourcing parameters.Add(new SqlParameter("@time", streamPosition.Timestamp)); } - public static EventPredicate CreateFilterExpression(string property, object value) + public static EventPredicate CreateExpression(string property, object value) { if (!string.IsNullOrWhiteSpace(property)) { From bb609208308c6d9a29066871c7f178c3814f1e16 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 25 Feb 2019 20:35:15 +0100 Subject: [PATCH 22/55] Cosmos db event store finalized. --- .../EventSourcing/Constants.cs | 16 ++ .../EventSourcing/CosmosDbEventStore.cs | 56 +++++-- .../CosmosDbEventStore_Reader.cs | 11 +- .../CosmosDbEventStore_Writer.cs | 5 +- .../EventSourcing/CosmosDbSubscription.cs | 150 ++++++++++++++++++ .../EventSourcing/FilterBuilder.cs | 48 +++--- .../Squidex.Infrastructure.Azure.csproj | 1 + .../EventSourcing/MongoEventStore_Reader.cs | 10 +- .../EventSourcing/StreamFilter.cs | 22 +++ .../CosmosDbEventStoreFixture.cs | 7 +- 10 files changed, 273 insertions(+), 53 deletions(-) create mode 100644 src/Squidex.Infrastructure.Azure/EventSourcing/Constants.cs create mode 100644 src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbSubscription.cs create mode 100644 src/Squidex.Infrastructure/EventSourcing/StreamFilter.cs diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/Constants.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/Constants.cs new file mode 100644 index 000000000..120f38704 --- /dev/null +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/Constants.cs @@ -0,0 +1,16 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Infrastructure.EventSourcing +{ + internal static class Constants + { + public const string Collection = "Events"; + + public const string LeaseCollection = "Leases"; + } +} diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs index c28984b0f..152bc6bf1 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs @@ -11,6 +11,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Azure.Documents; using Microsoft.Azure.Documents.Client; +using Newtonsoft.Json; namespace Squidex.Infrastructure.EventSourcing { @@ -19,27 +20,62 @@ namespace Squidex.Infrastructure.EventSourcing private readonly DocumentClient documentClient; private readonly Uri databaseUri; private readonly Uri collectionUri; + private readonly Uri serviceUri; + private readonly string masterKey; private readonly string databaseId; - private readonly string collectionId; + private readonly JsonSerializerSettings serializerSettings; - public CosmosDbEventStore(DocumentClient documentClient, string database) + public JsonSerializerSettings SerializerSettings { - Guard.NotNull(documentClient, nameof(documentClient)); + get { return serializerSettings; } + } + + public string DatabaseId + { + get { return databaseId; } + } + + public string MasterKey + { + get { return masterKey; } + } + + public Uri ServiceUri + { + get { return serviceUri; } + } + + public CosmosDbEventStore(Uri uri, string masterKey, JsonSerializerSettings serializerSettings, string database) + { + Guard.NotNull(uri, nameof(uri)); + Guard.NotNull(serializerSettings, nameof(serializerSettings)); + Guard.NotNullOrEmpty(masterKey, nameof(masterKey)); Guard.NotNullOrEmpty(database, nameof(database)); - this.documentClient = documentClient; + documentClient = new DocumentClient(uri, masterKey, serializerSettings); databaseUri = UriFactory.CreateDatabaseUri(database); databaseId = database; - collectionUri = UriFactory.CreateDocumentCollectionUri(database, FilterBuilder.Collection); - collectionId = FilterBuilder.Collection; + collectionUri = UriFactory.CreateDocumentCollectionUri(database, Constants.Collection); + + serviceUri = uri; + + this.masterKey = masterKey; + + this.serializerSettings = serializerSettings; } public async Task InitializeAsync(CancellationToken ct = default) { await documentClient.CreateDatabaseIfNotExistsAsync(new Database { Id = databaseId }); + await documentClient.CreateDocumentCollectionIfNotExistsAsync(databaseUri, + new DocumentCollection + { + Id = Constants.LeaseCollection, + }); + await documentClient.CreateDocumentCollectionIfNotExistsAsync(databaseUri, new DocumentCollection { @@ -51,17 +87,17 @@ namespace Squidex.Infrastructure.EventSourcing { Paths = new Collection { - $"/{FilterBuilder.EventStreamField}", - $"/{FilterBuilder.EventStreamOffsetField}" + $"/eventStream", + $"/eventStreamOffset" } } } }, - Id = FilterBuilder.Collection, + Id = Constants.Collection, }, new RequestOptions { - PartitionKey = new PartitionKey($"/{FilterBuilder.EventStreamField}") + PartitionKey = new PartitionKey($"/eventStream") }); } } diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs index adaef8785..fb5eb249b 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs @@ -22,9 +22,8 @@ namespace Squidex.Infrastructure.EventSourcing public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null) { Guard.NotNull(subscriber, nameof(subscriber)); - Guard.NotNullOrEmpty(streamFilter, nameof(streamFilter)); - throw new NotSupportedException(); + return new CosmosDbSubscription(this, subscriber, streamFilter, position); } public Task CreateIndexAsync(string property) @@ -47,13 +46,13 @@ namespace Squidex.Infrastructure.EventSourcing var commitTimestamp = commit.Timestamp; var commitOffset = 0; - foreach (var e in commit.Events) + foreach (var @event in commit.Events) { eventStreamOffset++; if (eventStreamOffset >= streamPosition) { - var eventData = e.ToEventData(); + var eventData = @event.ToEventData(); var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); result.Add(new StoredEvent(streamName, eventToken, eventStreamOffset, eventData)); @@ -102,13 +101,13 @@ namespace Squidex.Infrastructure.EventSourcing var commitTimestamp = commit.Timestamp; var commitOffset = 0; - foreach (var e in commit.Events) + foreach (var @event in commit.Events) { eventStreamOffset++; if (commitOffset > lastPosition.CommitOffset || commitTimestamp > lastPosition.Timestamp) { - var eventData = e.ToEventData(); + var eventData = @event.ToEventData(); if (filterExpression(eventData)) { diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs index 89650117d..cfcdc2e1e 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs @@ -21,7 +21,6 @@ namespace Squidex.Infrastructure.EventSourcing { private const int MaxWriteAttempts = 20; private const int MaxCommitSize = 10; - private static readonly FeedOptions TakeOne = new FeedOptions { MaxItemCount = 1 }; public Task DeleteStreamAsync(string streamName) { @@ -29,7 +28,9 @@ namespace Squidex.Infrastructure.EventSourcing return documentClient.QueryAsync(collectionUri, query, commit => { - return documentClient.DeleteDocumentAsync(UriFactory.CreateDocumentUri(databaseId, collectionId, commit.Id.ToString())); + var documentUri = UriFactory.CreateDocumentUri(databaseId, Constants.Collection, commit.Id.ToString()); + + return documentClient.DeleteDocumentAsync(documentUri); }); } diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbSubscription.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbSubscription.cs new file mode 100644 index 000000000..86fdb41c4 --- /dev/null +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbSubscription.cs @@ -0,0 +1,150 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Text.RegularExpressions; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Azure.Documents; +using Microsoft.Azure.Documents.ChangeFeedProcessor.FeedProcessing; +using Newtonsoft.Json; +using Builder = Microsoft.Azure.Documents.ChangeFeedProcessor.ChangeFeedProcessorBuilder; +using Collection = Microsoft.Azure.Documents.ChangeFeedProcessor.DocumentCollectionInfo; +using Options = Microsoft.Azure.Documents.ChangeFeedProcessor.ChangeFeedProcessorOptions; + +#pragma warning disable IDE0017 // Simplify object initialization + +namespace Squidex.Infrastructure.EventSourcing +{ + internal sealed class CosmosDbSubscription : IEventSubscription, IChangeFeedObserverFactory, IChangeFeedObserver + { + private readonly TaskCompletionSource processorStopRequested = new TaskCompletionSource(); + private readonly Task processorTask; + private readonly CosmosDbEventStore store; + private readonly Regex regex; + private readonly string hostName; + private readonly IEventSubscriber subscriber; + + public CosmosDbSubscription(CosmosDbEventStore store, IEventSubscriber subscriber, string streamFilter, string position = null) + { + var fromBeginning = string.IsNullOrWhiteSpace(position); + + if (fromBeginning) + { + hostName = $"squidex.{DateTime.UtcNow.Ticks.ToString()}"; + } + else + { + hostName = position; + } + + if (!StreamFilter.IsAll(streamFilter)) + { + regex = new Regex(streamFilter); + } + + this.store = store; + + this.subscriber = subscriber; + + processorTask = Task.Run(async () => + { + try + { + Collection CreateCollection(string name) + { + var collection = new Collection(); + + collection.CollectionName = name; + collection.DatabaseName = store.DatabaseId; + collection.MasterKey = store.MasterKey; + collection.Uri = store.ServiceUri; + + return collection; + } + + var processor = + await new Builder() + .WithFeedCollection(CreateCollection(Constants.Collection)) + .WithLeaseCollection(CreateCollection(Constants.LeaseCollection)) + .WithHostName(hostName) + .WithProcessorOptions(new Options { StartFromBeginning = fromBeginning }) + .WithObserverFactory(this) + .BuildAsync(); + + await processor.StartAsync(); + await processorStopRequested.Task; + await processor.StopAsync(); + } + catch (Exception ex) + { + await subscriber.OnErrorAsync(this, ex); + } + }); + } + + public IChangeFeedObserver CreateObserver() + { + return this; + } + + public async Task CloseAsync(IChangeFeedObserverContext context, ChangeFeedObserverCloseReason reason) + { + if (reason == ChangeFeedObserverCloseReason.ObserverError) + { + await subscriber.OnErrorAsync(this, new InvalidOperationException("Change feed observer failed.")); + } + } + + public Task OpenAsync(IChangeFeedObserverContext context) + { + return Task.CompletedTask; + } + + public async Task ProcessChangesAsync(IChangeFeedObserverContext context, IReadOnlyList docs, CancellationToken cancellationToken) + { + if (!processorStopRequested.Task.IsCompleted) + { + foreach (var document in docs) + { + if (!processorStopRequested.Task.IsCompleted) + { + var streamName = document.GetPropertyValue("eventStream"); + + if (regex == null || regex.IsMatch(streamName)) + { + var commit = JsonConvert.DeserializeObject(document.ToString(), store.SerializerSettings); + + var eventStreamOffset = (int)commit.EventStreamOffset; + + foreach (var @event in commit.Events) + { + eventStreamOffset++; + + var eventData = @event.ToEventData(); + + await subscriber.OnEventAsync(this, new StoredEvent(commit.EventStream, hostName, eventStreamOffset, eventData)); + } + } + } + } + } + } + + public void WakeUp() + { + } + + public Task StopAsync() + { + processorStopRequested.SetResult(true); + + return processorTask; + } + } +} diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs index 821c53092..7180ad59c 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs @@ -18,14 +18,6 @@ namespace Squidex.Infrastructure.EventSourcing { internal static class FilterBuilder { - public const string Collection = "Events"; - - public static readonly string CommitId = nameof(CosmosDbEventCommit.Id).ToCamelCase(); - public static readonly string EventsCountField = nameof(CosmosDbEventCommit.EventsCount).ToCamelCase(); - public static readonly string EventStreamOffsetField = nameof(CosmosDbEventCommit.EventStreamOffset).ToCamelCase(); - public static readonly string EventStreamField = nameof(CosmosDbEventCommit.EventStream).ToCamelCase(); - public static readonly string TimestampField = nameof(CosmosDbEventCommit.Timestamp).ToCamelCase(); - public static async Task QueryAsync(this DocumentClient documentClient, Uri collectionUri, SqlQuerySpec querySpec, Func handler, CancellationToken ct = default) { var query = @@ -52,12 +44,12 @@ namespace Squidex.Infrastructure.EventSourcing { var query = $"SELECT TOP 1 " + - $" e.{CommitId}," + - $" e.{EventsCountField} " + - $"FROM {Collection} e " + + $" e.id," + + $" e.eventsCount " + + $"FROM {Constants.Collection} e " + $"WHERE " + - $" e.{EventStreamField} = @name " + - $"ORDER BY e.{EventStreamOffsetField} DESC"; + $" e.eventStream = @name " + + $"ORDER BY e.eventStreamOffset DESC"; var parameters = new SqlParameterCollection { @@ -71,12 +63,12 @@ namespace Squidex.Infrastructure.EventSourcing { var query = $"SELECT TOP 1 " + - $" e.{EventStreamOffsetField}," + - $" e.{EventsCountField} " + - $"FROM {Collection} e " + + $" e.eventStreamOffset," + + $" e.eventsCount " + + $"FROM {Constants.Collection} e " + $"WHERE " + - $" e.{EventStreamField} = @name " + - $"ORDER BY e.{EventStreamOffsetField} DESC"; + $" e.eventStream = @name " + + $"ORDER BY e.eventStreamOffset DESC"; var parameters = new SqlParameterCollection { @@ -90,11 +82,11 @@ namespace Squidex.Infrastructure.EventSourcing { var query = $"SELECT * " + - $"FROM {Collection} e " + + $"FROM {Constants.Collection} e " + $"WHERE " + - $" e.{EventStreamField} = @name " + - $"AND e.{EventStreamOffsetField} >= @position " + - $"ORDER BY e.{EventStreamOffsetField} ASC"; + $" e.eventStream = @name " + + $"AND e.eventStreamOffset >= @position " + + $"ORDER BY e.eventStreamOffset ASC"; var parameters = new SqlParameterCollection { @@ -131,7 +123,7 @@ namespace Squidex.Infrastructure.EventSourcing private static SqlQuerySpec BuildQuery(List filters, SqlParameterCollection parameters) { - var query = $"SELECT * FROM {Collection} e WHERE {string.Join(" AND ", filters)} ORDER BY e.{TimestampField}"; + var query = $"SELECT * FROM {Constants.Collection} e WHERE {string.Join(" AND ", filters)} ORDER BY e.timestamp"; return new SqlQuerySpec(query, parameters); } @@ -145,15 +137,15 @@ namespace Squidex.Infrastructure.EventSourcing private static void ForRegex(this List filters, SqlParameterCollection parameters, string streamFilter) { - if (!string.IsNullOrWhiteSpace(streamFilter) && !string.Equals(streamFilter, ".*", StringComparison.OrdinalIgnoreCase)) + if (!StreamFilter.IsAll(streamFilter)) { if (streamFilter.Contains("^")) { - filters.Add($"STARTSWITH(e.{EventStreamField}, @filter)"); + filters.Add($"STARTSWITH(e.eventStream, @filter)"); } else { - filters.Add($"e.{EventStreamField} = @filter"); + filters.Add($"e.eventStream = @filter"); } parameters.Add(new SqlParameter("@filter", streamFilter)); @@ -164,11 +156,11 @@ namespace Squidex.Infrastructure.EventSourcing { if (streamPosition.IsEndOfCommit) { - filters.Add($"e.{TimestampField} > @time"); + filters.Add($"e.timestamp > @time"); } else { - filters.Add($"e.{TimestampField} >= @time"); + filters.Add($"e.timestamp >= @time"); } parameters.Add(new SqlParameter("@time", streamPosition.Timestamp)); diff --git a/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj b/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj index d4d6148da..32ea4d0ad 100644 --- a/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj +++ b/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj @@ -5,6 +5,7 @@ 7.3 + diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs index 314304445..e0e7d635c 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs @@ -55,13 +55,13 @@ namespace Squidex.Infrastructure.EventSourcing var commitTimestamp = commit.Timestamp; var commitOffset = 0; - foreach (var e in commit.Events) + foreach (var @event in commit.Events) { eventStreamOffset++; if (eventStreamOffset >= streamPosition) { - var eventData = e.ToEventData(); + var eventData = @event.ToEventData(); var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); result.Add(new StoredEvent(streamName, eventToken, eventStreamOffset, eventData)); @@ -108,13 +108,13 @@ namespace Squidex.Infrastructure.EventSourcing var commitTimestamp = commit.Timestamp; var commitOffset = 0; - foreach (var e in commit.Events) + foreach (var @event in commit.Events) { eventStreamOffset++; if (commitOffset > lastPosition.CommitOffset || commitTimestamp > lastPosition.Timestamp) { - var eventData = e.ToEventData(); + var eventData = @event.ToEventData(); if (filterExpression(eventData)) { @@ -157,7 +157,7 @@ namespace Squidex.Infrastructure.EventSourcing private static void AppendByStream(string streamFilter, List filters) { - if (!string.IsNullOrWhiteSpace(streamFilter) && !string.Equals(streamFilter, ".*", StringComparison.OrdinalIgnoreCase)) + if (!StreamFilter.IsAll(streamFilter)) { if (streamFilter.Contains("^")) { diff --git a/src/Squidex.Infrastructure/EventSourcing/StreamFilter.cs b/src/Squidex.Infrastructure/EventSourcing/StreamFilter.cs new file mode 100644 index 000000000..b3bc063af --- /dev/null +++ b/src/Squidex.Infrastructure/EventSourcing/StreamFilter.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; + +namespace Squidex.Infrastructure.EventSourcing +{ + public static class StreamFilter + { + public static bool IsAll(string filter) + { + return string.IsNullOrWhiteSpace(filter) + || string.Equals(filter, ".*", StringComparison.OrdinalIgnoreCase) + || string.Equals(filter, "(.*)", StringComparison.OrdinalIgnoreCase) + || string.Equals(filter, "(.*?)", StringComparison.OrdinalIgnoreCase); + } + } +} diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreFixture.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreFixture.cs index 221a6c305..42a5292be 100644 --- a/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreFixture.cs +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreFixture.cs @@ -13,20 +13,23 @@ namespace Squidex.Infrastructure.EventSourcing { public sealed class CosmosDbEventStoreFixture : IDisposable { + private const string EmulatorKey = "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="; + private const string EmulatorUri = "https://localhost:8081"; private readonly DocumentClient client; public CosmosDbEventStore EventStore { get; } public CosmosDbEventStoreFixture() { - client = new DocumentClient(new Uri("https://localhost:8081"), "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==", JsonHelper.DefaultSettings()); + client = new DocumentClient(new Uri(EmulatorUri), EmulatorKey); - EventStore = new CosmosDbEventStore(client, "Test"); + EventStore = new CosmosDbEventStore(new Uri(EmulatorUri), EmulatorKey, JsonHelper.DefaultSettings(), "Test"); EventStore.InitializeAsync().Wait(); } public void Dispose() { + client.DeleteDatabaseAsync(UriFactory.CreateDatabaseUri("Test")).Wait(); } } } From 5e33460776d4f45e250007fa6a4205850f8ae754 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 25 Feb 2019 21:55:34 +0100 Subject: [PATCH 23/55] Cosmos db registered to DI. --- .../Diagnostics/CosmosDbHealthCheck.cs | 32 ++++++++++ .../EventSourcing/CosmosDbEventStore.cs | 23 ++++--- .../CosmosDbEventStore_Reader.cs | 18 +++++- .../CosmosDbEventStore_Writer.cs | 8 ++- .../EventSourcing/CosmosDbSubscription.cs | 6 +- .../EventSourcing/GetEventStore.cs | 22 +++++-- .../GetEventStoreSubscription.cs | 2 - .../EventSourcing/MongoEventStore_Reader.cs | 9 ++- .../EventSourcing/MongoEventStore_Writer.cs | 4 +- .../CQRS/Events/RabbitMqEventConsumer.cs | 2 +- .../EventSourcing/IEventStore.cs | 2 +- .../Config/Domain/EventStoreServices.cs | 22 +++++++ src/Squidex/appsettings.json | 20 +++++- .../CosmosDbEventStoreFixture.cs | 4 +- .../EventSourcing/EventStoreTests.cs | 64 ++++++++++++++++++- 15 files changed, 205 insertions(+), 33 deletions(-) create mode 100644 src/Squidex.Infrastructure.Azure/Diagnostics/CosmosDbHealthCheck.cs diff --git a/src/Squidex.Infrastructure.Azure/Diagnostics/CosmosDbHealthCheck.cs b/src/Squidex.Infrastructure.Azure/Diagnostics/CosmosDbHealthCheck.cs new file mode 100644 index 000000000..09698e250 --- /dev/null +++ b/src/Squidex.Infrastructure.Azure/Diagnostics/CosmosDbHealthCheck.cs @@ -0,0 +1,32 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Azure.Documents.Client; +using Microsoft.Extensions.Diagnostics.HealthChecks; + +namespace Squidex.Infrastructure.Diagnostics +{ + public sealed class CosmosDbHealthCheck : IHealthCheck + { + private readonly DocumentClient documentClient; + + public CosmosDbHealthCheck(Uri uri, string masterKey) + { + documentClient = new DocumentClient(uri, masterKey); + } + + public async Task CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default) + { + await documentClient.ReadDatabaseFeedAsync(); + + return HealthCheckResult.Healthy("Application must query data from CosmosDB."); + } + } +} diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs index 152bc6bf1..227289fe3 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs @@ -15,12 +15,11 @@ using Newtonsoft.Json; namespace Squidex.Infrastructure.EventSourcing { - public sealed partial class CosmosDbEventStore : IEventStore, IInitializable + public sealed partial class CosmosDbEventStore : DisposableObjectBase, IEventStore, IInitializable { private readonly DocumentClient documentClient; - private readonly Uri databaseUri; private readonly Uri collectionUri; - private readonly Uri serviceUri; + private readonly Uri databaseUri; private readonly string masterKey; private readonly string databaseId; private readonly JsonSerializerSettings serializerSettings; @@ -42,30 +41,36 @@ namespace Squidex.Infrastructure.EventSourcing public Uri ServiceUri { - get { return serviceUri; } + get { return documentClient.ServiceEndpoint; } } - public CosmosDbEventStore(Uri uri, string masterKey, JsonSerializerSettings serializerSettings, string database) + public CosmosDbEventStore(DocumentClient documentClient, string masterKey, string database, JsonSerializerSettings serializerSettings) { - Guard.NotNull(uri, nameof(uri)); + Guard.NotNull(documentClient, nameof(documentClient)); Guard.NotNull(serializerSettings, nameof(serializerSettings)); Guard.NotNullOrEmpty(masterKey, nameof(masterKey)); Guard.NotNullOrEmpty(database, nameof(database)); - documentClient = new DocumentClient(uri, masterKey, serializerSettings); + this.documentClient = documentClient; databaseUri = UriFactory.CreateDatabaseUri(database); databaseId = database; collectionUri = UriFactory.CreateDocumentCollectionUri(database, Constants.Collection); - serviceUri = uri; - this.masterKey = masterKey; this.serializerSettings = serializerSettings; } + protected override void DisposeObject(bool disposing) + { + if (disposing) + { + documentClient.Dispose(); + } + } + public async Task InitializeAsync(CancellationToken ct = default) { await documentClient.CreateDatabaseIfNotExistsAsync(new Database { Id = databaseId }); diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs index fb5eb249b..e0cccf559 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Reader.cs @@ -19,20 +19,30 @@ namespace Squidex.Infrastructure.EventSourcing public partial class CosmosDbEventStore : IEventStore, IInitializable { - public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null) + public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter = null, string position = null) { Guard.NotNull(subscriber, nameof(subscriber)); + ThrowIfDisposed(); + return new CosmosDbSubscription(this, subscriber, streamFilter, position); } public Task CreateIndexAsync(string property) { + Guard.NotNullOrEmpty(property, nameof(property)); + + ThrowIfDisposed(); + return Task.CompletedTask; } public async Task> QueryAsync(string streamName, long streamPosition = 0) { + Guard.NotNullOrEmpty(streamName, nameof(streamName)); + + ThrowIfDisposed(); + using (Profiler.TraceMethod()) { var query = FilterBuilder.ByStreamName(streamName, streamPosition - MaxCommitSize); @@ -69,6 +79,10 @@ namespace Squidex.Infrastructure.EventSourcing public Task QueryAsync(Func callback, string property, object value, string position = null, CancellationToken ct = default) { Guard.NotNull(callback, nameof(callback)); + Guard.NotNullOrEmpty(property, nameof(property)); + Guard.NotNull(value, nameof(value)); + + ThrowIfDisposed(); StreamPosition lastPosition = position; @@ -82,6 +96,8 @@ namespace Squidex.Infrastructure.EventSourcing { Guard.NotNull(callback, nameof(callback)); + ThrowIfDisposed(); + StreamPosition lastPosition = position; var filterDefinition = FilterBuilder.CreateByFilter(streamFilter, lastPosition); diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs index cfcdc2e1e..793e934e5 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs @@ -24,6 +24,10 @@ namespace Squidex.Infrastructure.EventSourcing public Task DeleteStreamAsync(string streamName) { + Guard.NotNullOrEmpty(streamName, nameof(streamName)); + + ThrowIfDisposed(); + var query = FilterBuilder.AllIds(streamName); return documentClient.QueryAsync(collectionUri, query, commit => @@ -41,11 +45,13 @@ namespace Squidex.Infrastructure.EventSourcing public async Task AppendAsync(Guid commitId, string streamName, long expectedVersion, ICollection events) { - Guard.GreaterEquals(expectedVersion, EtagVersion.Any, nameof(expectedVersion)); + Guard.NotEmpty(commitId, nameof(commitId)); Guard.NotNullOrEmpty(streamName, nameof(streamName)); Guard.NotNull(events, nameof(events)); Guard.LessThan(events.Count, MaxCommitSize, "events.Count"); + ThrowIfDisposed(); + using (Profiler.TraceMethod()) { if (events.Count == 0) diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbSubscription.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbSubscription.cs index 86fdb41c4..fa5d8af86 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbSubscription.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbSubscription.cs @@ -32,6 +32,8 @@ namespace Squidex.Infrastructure.EventSourcing public CosmosDbSubscription(CosmosDbEventStore store, IEventSubscriber subscriber, string streamFilter, string position = null) { + this.store = store; + var fromBeginning = string.IsNullOrWhiteSpace(position); if (fromBeginning) @@ -48,8 +50,6 @@ namespace Squidex.Infrastructure.EventSourcing regex = new Regex(streamFilter); } - this.store = store; - this.subscriber = subscriber; processorTask = Task.Run(async () => @@ -73,7 +73,7 @@ namespace Squidex.Infrastructure.EventSourcing .WithFeedCollection(CreateCollection(Constants.Collection)) .WithLeaseCollection(CreateCollection(Constants.LeaseCollection)) .WithHostName(hostName) - .WithProcessorOptions(new Options { StartFromBeginning = fromBeginning }) + .WithProcessorOptions(new Options { StartFromBeginning = fromBeginning, LeasePrefix = hostName }) .WithObserverFactory(this) .BuildAsync(); diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs index 1f2dfcecb..d06c1ea15 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs @@ -53,18 +53,26 @@ namespace Squidex.Infrastructure.EventSourcing await projectionClient.ConnectAsync(ct); } - public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null) + public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter = null, string position = null) { + Guard.NotNull(streamFilter, nameof(streamFilter)); + return new GetEventStoreSubscription(connection, subscriber, serializer, projectionClient, position, prefix, streamFilter); } public Task CreateIndexAsync(string property) { + Guard.NotNullOrEmpty(property, nameof(property)); + return projectionClient.CreateProjectionAsync(property, string.Empty); } public async Task QueryAsync(Func callback, string property, object value, string position = null, CancellationToken ct = default) { + Guard.NotNull(callback, nameof(callback)); + Guard.NotNullOrEmpty(property, nameof(property)); + Guard.NotNull(value, nameof(value)); + using (Profiler.TraceMethod()) { var streamName = await projectionClient.CreateProjectionAsync(property, value); @@ -77,6 +85,8 @@ namespace Squidex.Infrastructure.EventSourcing public async Task QueryAsync(Func callback, string streamFilter = null, string position = null, CancellationToken ct = default) { + Guard.NotNull(callback, nameof(callback)); + using (Profiler.TraceMethod()) { var streamName = await projectionClient.CreateProjectionAsync(streamFilter); @@ -111,6 +121,8 @@ namespace Squidex.Infrastructure.EventSourcing public async Task> QueryAsync(string streamName, long streamPosition = 0) { + Guard.NotNullOrEmpty(streamName, nameof(streamName)); + using (Profiler.TraceMethod()) { var result = new List(); @@ -142,6 +154,8 @@ namespace Squidex.Infrastructure.EventSourcing public Task DeleteStreamAsync(string streamName) { + Guard.NotNullOrEmpty(streamName, nameof(streamName)); + return connection.DeleteStreamAsync(GetStreamName(streamName), ExpectedVersion.Any); } @@ -159,11 +173,11 @@ namespace Squidex.Infrastructure.EventSourcing private async Task AppendEventsInternalAsync(string streamName, long expectedVersion, ICollection events) { + Guard.NotNullOrEmpty(streamName, nameof(streamName)); + Guard.NotNull(events, nameof(events)); + using (Profiler.TraceMethod(nameof(AppendAsync))) { - Guard.NotNullOrEmpty(streamName, nameof(streamName)); - Guard.NotNull(events, nameof(events)); - if (events.Count == 0) { return; diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStoreSubscription.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStoreSubscription.cs index a458bda5c..0f06e4e77 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStoreSubscription.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStoreSubscription.cs @@ -31,8 +31,6 @@ namespace Squidex.Infrastructure.EventSourcing string prefix, string streamFilter) { - Guard.NotNull(subscriber, nameof(subscriber)); - this.connection = connection; this.position = projectionClient.ParsePositionOrNull(position); diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs index e0e7d635c..4f254ddd4 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs @@ -23,20 +23,23 @@ namespace Squidex.Infrastructure.EventSourcing { public Task CreateIndexAsync(string property) { + Guard.NotNullOrEmpty(property, nameof(property)); + return Collection.Indexes.CreateOneAsync( new CreateIndexModel(Index.Ascending(CreateIndexPath(property)))); } - public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null) + public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter = null, string position = null) { Guard.NotNull(subscriber, nameof(subscriber)); - Guard.NotNullOrEmpty(streamFilter, nameof(streamFilter)); return new PollingSubscription(this, subscriber, streamFilter, position); } public async Task> QueryAsync(string streamName, long streamPosition = 0) { + Guard.NotNullOrEmpty(streamName, nameof(streamName)); + using (Profiler.TraceMethod()) { var commits = @@ -76,6 +79,8 @@ namespace Squidex.Infrastructure.EventSourcing public Task QueryAsync(Func callback, string property, object value, string position = null, CancellationToken ct = default) { Guard.NotNull(callback, nameof(callback)); + Guard.NotNullOrEmpty(property, nameof(property)); + Guard.NotNull(value, nameof(value)); StreamPosition lastPosition = position; diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs index a7dbe12de..c60fb755b 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs @@ -22,6 +22,8 @@ namespace Squidex.Infrastructure.EventSourcing public Task DeleteStreamAsync(string streamName) { + Guard.NotNullOrEmpty(streamName, nameof(streamName)); + return Collection.DeleteManyAsync(x => x.EventStream == streamName); } @@ -32,7 +34,7 @@ namespace Squidex.Infrastructure.EventSourcing public async Task AppendAsync(Guid commitId, string streamName, long expectedVersion, ICollection events) { - Guard.GreaterEquals(expectedVersion, EtagVersion.Any, nameof(expectedVersion)); + Guard.NotEmpty(commitId, nameof(commitId)); Guard.NotNullOrEmpty(streamName, nameof(streamName)); Guard.NotNull(events, nameof(events)); Guard.LessThan(events.Count, MaxCommitSize, "events.Count"); diff --git a/src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs b/src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs index 18a544342..21d44ae47 100644 --- a/src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs +++ b/src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs @@ -49,8 +49,8 @@ namespace Squidex.Infrastructure.CQRS.Events this.exchange = exchange; this.eventsFilter = eventsFilter; - this.jsonSerializer = jsonSerializer; this.eventPublisherName = eventPublisherName; + this.jsonSerializer = jsonSerializer; } protected override void DisposeObject(bool disposing) diff --git a/src/Squidex.Infrastructure/EventSourcing/IEventStore.cs b/src/Squidex.Infrastructure/EventSourcing/IEventStore.cs index 46765b666..6ee608632 100644 --- a/src/Squidex.Infrastructure/EventSourcing/IEventStore.cs +++ b/src/Squidex.Infrastructure/EventSourcing/IEventStore.cs @@ -28,6 +28,6 @@ namespace Squidex.Infrastructure.EventSourcing Task DeleteStreamAsync(string streamName); - IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null); + IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter = null, string position = null); } } diff --git a/src/Squidex/Config/Domain/EventStoreServices.cs b/src/Squidex/Config/Domain/EventStoreServices.cs index abd77f817..69ebbbab5 100644 --- a/src/Squidex/Config/Domain/EventStoreServices.cs +++ b/src/Squidex/Config/Domain/EventStoreServices.cs @@ -5,11 +5,14 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; using System.Linq; using EventStore.ClientAPI; +using Microsoft.Azure.Documents.Client; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using MongoDB.Driver; +using Newtonsoft.Json; using Squidex.Infrastructure; using Squidex.Infrastructure.Diagnostics; using Squidex.Infrastructure.EventSourcing; @@ -39,6 +42,25 @@ namespace Squidex.Config.Domain }) .AsOptional(); }, + ["CosmosDb"] = () => + { + var cosmosDbConfiguration = config.GetRequiredValue("eventStore:cosmosDB:configuration"); + var cosmosDbMasterKey = config.GetRequiredValue("eventStore:cosmosDB:masterKey"); + var cosmosDbDatabase = config.GetRequiredValue("eventStore:cosmosDB:database"); + + services.AddSingletonAs(c => new DocumentClient(new Uri(cosmosDbConfiguration), cosmosDbMasterKey, c.GetRequiredService())) + .AsSelf(); + + services.AddSingletonAs(c => new CosmosDbEventStore( + c.GetRequiredService(), + cosmosDbMasterKey, + cosmosDbDatabase, + c.GetRequiredService())) + .AsOptional(); + + services.AddHealthChecks() + .AddCheck("CosmosDB", tags: new[] { "node" }); + }, ["GetEventStore"] = () => { var eventStoreConfiguration = config.GetRequiredValue("eventStore:getEventStore:configuration"); diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json index 8a642f33c..28a5d7795 100644 --- a/src/Squidex/appsettings.json +++ b/src/Squidex/appsettings.json @@ -29,8 +29,8 @@ /* * Set to true, to use strong etags. */ - "strong": false -}, + "strong": false + }, "ui": { /* @@ -199,7 +199,7 @@ /* * Define the type of the event store. * - * Supported: MongoDb, GetEventStore + * Supported: MongoDb, GetEventStore, CosmosDb */ "type": "MongoDb", "mongoDb": { @@ -230,6 +230,20 @@ */ "prefix": "squidex" } + "cosmosDb": { + /* + * The connection string to your CosmosDB instance. + */ + "configuration": "https://localhost:8081", + /* + * The primary access key. + */ + "masterKey": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==", + /* + * The name of the event store database. + */ + "database": "Squidex" + } }, "eventPublishers": { diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreFixture.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreFixture.cs index 42a5292be..b8e96a318 100644 --- a/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreFixture.cs +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/CosmosDbEventStoreFixture.cs @@ -21,9 +21,9 @@ namespace Squidex.Infrastructure.EventSourcing public CosmosDbEventStoreFixture() { - client = new DocumentClient(new Uri(EmulatorUri), EmulatorKey); + client = new DocumentClient(new Uri(EmulatorUri), EmulatorKey, JsonHelper.DefaultSettings()); - EventStore = new CosmosDbEventStore(new Uri(EmulatorUri), EmulatorKey, JsonHelper.DefaultSettings(), "Test"); + EventStore = new CosmosDbEventStore(client, EmulatorKey, "Test", JsonHelper.DefaultSettings()); EventStore.InitializeAsync().Wait(); } diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/EventStoreTests.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/EventStoreTests.cs index 3f9f33b08..ac7f06f7b 100644 --- a/tests/Squidex.Infrastructure.Tests/EventSourcing/EventStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/EventStoreTests.cs @@ -19,11 +19,14 @@ namespace Squidex.Infrastructure.EventSourcing public abstract class EventStoreTests where T : IEventStore { private readonly Lazy sut; + private string subscriptionPosition; public sealed class EventSubscriber : IEventSubscriber { public List Events { get; } = new List(); + public string LastPosition { get; set; } + public Task OnErrorAsync(IEventSubscription subscription, Exception exception) { throw new NotSupportedException(); @@ -31,6 +34,8 @@ namespace Squidex.Infrastructure.EventSourcing public Task OnEventAsync(IEventSubscription subscription, StoredEvent storedEvent) { + LastPosition = storedEvent.EventPosition; + Events.Add(storedEvent); return TaskHelper.Done; @@ -132,6 +137,54 @@ namespace Squidex.Infrastructure.EventSourcing ShouldBeEquivalentTo(readEvents, expected); } + [Fact] + public async Task Should_subscribe_to_next_events() + { + var streamName = $"test-{Guid.NewGuid()}"; + + var events1 = new EventData[] + { + new EventData("Type1", new EnvelopeHeaders(), "1"), + new EventData("Type2", new EnvelopeHeaders(), "2"), + }; + + await QueryWithSubscriptionAsync(streamName, async () => + { + await Sut.AppendAsync(Guid.NewGuid(), streamName, events1); + }); + + var events2 = new EventData[] + { + new EventData("Type1", new EnvelopeHeaders(), "1"), + new EventData("Type2", new EnvelopeHeaders(), "2"), + }; + + var readEventsFromPosition = await QueryWithSubscriptionAsync(streamName, async () => + { + await Sut.AppendAsync(Guid.NewGuid(), streamName, events2); + }); + + var expectedFromPosition = new StoredEvent[] + { + new StoredEvent(streamName, "Position", 2, events2[0]), + new StoredEvent(streamName, "Position", 3, events2[1]) + }; + + var readEventsFromBeginning = await QueryWithSubscriptionAsync(streamName, fromBeginning: true); + + var expectedFromBeginning = new StoredEvent[] + { + new StoredEvent(streamName, "Position", 0, events1[0]), + new StoredEvent(streamName, "Position", 1, events1[1]), + new StoredEvent(streamName, "Position", 2, events2[0]), + new StoredEvent(streamName, "Position", 3, events2[1]) + }; + + ShouldBeEquivalentTo(readEventsFromPosition, expectedFromPosition); + + ShouldBeEquivalentTo(readEventsFromBeginning, expectedFromBeginning); + } + [Fact] public async Task Should_read_events_from_offset() { @@ -272,16 +325,19 @@ namespace Squidex.Infrastructure.EventSourcing } } - private async Task> QueryWithSubscriptionAsync(string streamFilter, Func action) + private async Task> QueryWithSubscriptionAsync(string streamFilter, Func action = null, bool fromBeginning = false) { var subscriber = new EventSubscriber(); IEventSubscription subscription = null; try { - subscription = Sut.CreateSubscription(subscriber, streamFilter); + subscription = Sut.CreateSubscription(subscriber, streamFilter, fromBeginning ? null : subscriptionPosition); - await action(); + if (action != null) + { + await action(); + } using (var cts = new CancellationTokenSource(30000)) { @@ -293,6 +349,8 @@ namespace Squidex.Infrastructure.EventSourcing if (subscriber.Events.Count > 0) { + subscriptionPosition = subscriber.LastPosition; + return subscriber.Events; } } From 316cecec3a8f73ea9b5f77449071bb9d11851714 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 26 Feb 2019 09:00:18 +0100 Subject: [PATCH 24/55] Fix in appsettings --- src/Squidex/appsettings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json index 28a5d7795..3e5ba0b28 100644 --- a/src/Squidex/appsettings.json +++ b/src/Squidex/appsettings.json @@ -229,7 +229,7 @@ * Prefix for all streams and projections (for multiple installations). */ "prefix": "squidex" - } + }, "cosmosDb": { /* * The connection string to your CosmosDB instance. From 7ef35703926455e5fcc4ab06ede540441bcfba8a Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 26 Feb 2019 14:55:08 +0100 Subject: [PATCH 25/55] CosmosDB adjustments. --- .../Contents/MongoContentDraftCollection.cs | 28 +++++---- .../MongoContentPublishedCollection.cs | 20 +++--- .../Contents/MongoContentRepository.cs | 9 ++- .../History/MongoHistoryEventRepository.cs | 12 +++- .../EventSourcing/CosmosDbEventStore.cs | 15 +++++ .../CosmosDbEventStore_Writer.cs | 8 +-- .../EventSourcing/FilterBuilder.cs | 27 -------- .../EventSourcing/FilterExtensions.cs | 62 +++++++++++++++++++ .../MongoDb/MongoDbOptions.cs | 14 +++++ .../{Options.cs => Alternatives.cs} | 4 +- .../Configuration/ConfigurationExtensions.cs | 2 +- src/Squidex/Config/Domain/AssetServices.cs | 2 +- .../Config/Domain/EventStoreServices.cs | 2 +- src/Squidex/Config/Domain/StoreServices.cs | 11 +++- src/Squidex/Config/Orleans/OrleansServices.cs | 4 +- .../Migrations/ConvertOldSnapshotStores.cs | 12 +++- 16 files changed, 169 insertions(+), 63 deletions(-) create mode 100644 src/Squidex.Infrastructure.Azure/EventSourcing/FilterExtensions.cs create mode 100644 src/Squidex.Infrastructure.MongoDb/MongoDb/MongoDbOptions.cs rename src/Squidex.Infrastructure/Configuration/{Options.cs => Alternatives.cs} (85%) diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs index 30c0edda0..653e35172 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.Options; using MongoDB.Driver; using NodaTime; using Squidex.Domain.Apps.Core.ConvertContent; @@ -29,28 +30,33 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { internal sealed class MongoContentDraftCollection : MongoContentCollection { - public MongoContentDraftCollection(IMongoDatabase database, IJsonSerializer serializer) + private readonly MongoDbOptions options; + + public MongoContentDraftCollection(IMongoDatabase database, IJsonSerializer serializer, IOptions options) : base(database, serializer, "State_Content_Draft") { + this.options = options.Value; } protected override async Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default) { - await collection.Indexes.CreateManyAsync( - new[] - { - new CreateIndexModel( - Index - .Ascending(x => x.IndexedSchemaId) - .Ascending(x => x.Id) - .Ascending(x => x.IsDeleted)), + await collection.Indexes.CreateOneAsync( + new CreateIndexModel( + Index + .Ascending(x => x.IndexedSchemaId) + .Ascending(x => x.Id) + .Ascending(x => x.IsDeleted)), null, ct); + + if (!options.IsCosmosDb) + { + await collection.Indexes.CreateOneAsync( new CreateIndexModel( Index .Text(x => x.DataText) .Ascending(x => x.IndexedSchemaId) .Ascending(x => x.IsDeleted) - .Ascending(x => x.Status)) - }, ct); + .Ascending(x => x.Status)), null, ct); + } await base.SetupCollectionAsync(collection, ct); } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs index 0184b87e1..08d819402 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs @@ -8,6 +8,7 @@ using System; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.Options; using MongoDB.Driver; using Squidex.Domain.Apps.Core.ConvertContent; using Squidex.Domain.Apps.Entities.Apps; @@ -20,19 +21,24 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { internal sealed class MongoContentPublishedCollection : MongoContentCollection { - public MongoContentPublishedCollection(IMongoDatabase database, IJsonSerializer serializer) + private readonly MongoDbOptions options; + + public MongoContentPublishedCollection(IMongoDatabase database, IJsonSerializer serializer, IOptions options) : base(database, serializer, "State_Content_Published") { + this.options = options.Value; } protected override async Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default) { - await collection.Indexes.CreateManyAsync( - new[] - { - new CreateIndexModel(Index.Text(x => x.DataText).Ascending(x => x.IndexedSchemaId)), - new CreateIndexModel(Index.Ascending(x => x.IndexedSchemaId).Ascending(x => x.Id)) - }, ct); + await collection.Indexes.CreateOneAsync( + new CreateIndexModel(Index.Ascending(x => x.IndexedSchemaId).Ascending(x => x.Id)), null, ct); + + if (!options.IsCosmosDb) + { + await collection.Indexes.CreateOneAsync( + new CreateIndexModel(Index.Text(x => x.DataText).Ascending(x => x.IndexedSchemaId)), null, ct); + } await base.SetupCollectionAsync(collection, ct); } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs index 3c663d642..f24c6be1d 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs @@ -9,6 +9,7 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.Options; using MongoDB.Driver; using NodaTime; using Squidex.Domain.Apps.Core.Contents; @@ -19,6 +20,7 @@ using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Infrastructure.Json; using Squidex.Infrastructure.Log; +using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.Queries; namespace Squidex.Domain.Apps.Entities.MongoDb.Contents @@ -31,17 +33,18 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents private readonly MongoContentDraftCollection contentsDraft; private readonly MongoContentPublishedCollection contentsPublished; - public MongoContentRepository(IMongoDatabase database, IAppProvider appProvider, IJsonSerializer serializer) + public MongoContentRepository(IMongoDatabase database, IAppProvider appProvider, IJsonSerializer serializer, IOptions options) { Guard.NotNull(appProvider, nameof(appProvider)); Guard.NotNull(serializer, nameof(serializer)); + Guard.NotNull(options, nameof(options)); this.appProvider = appProvider; this.serializer = serializer; - contentsDraft = new MongoContentDraftCollection(database, serializer); - contentsPublished = new MongoContentPublishedCollection(database, serializer); + contentsDraft = new MongoContentDraftCollection(database, serializer, options); + contentsPublished = new MongoContentPublishedCollection(database, serializer, options); this.database = database; } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventRepository.cs index 6b5e6cd77..5a39bb706 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventRepository.cs @@ -9,6 +9,8 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.Options; +using MongoDB.Bson.Serialization; using MongoDB.Driver; using Squidex.Domain.Apps.Entities.History; using Squidex.Domain.Apps.Entities.History.Repositories; @@ -18,9 +20,17 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.History { public class MongoHistoryEventRepository : MongoRepositoryBase, IHistoryEventRepository { - public MongoHistoryEventRepository(IMongoDatabase database) + public MongoHistoryEventRepository(IMongoDatabase database, IOptions options) : base(database) { + if (options.Value.IsCosmosDb) + { + var classMap = BsonClassMap.RegisterClassMap(); + + classMap.MapProperty(x => x.Created) + .SetElementName("_ts"); + classMap.AutoMap(); + } } protected override string CollectionName() diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs index 227289fe3..a07bf13ec 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore.cs @@ -84,6 +84,21 @@ namespace Squidex.Infrastructure.EventSourcing await documentClient.CreateDocumentCollectionIfNotExistsAsync(databaseUri, new DocumentCollection { + IndexingPolicy = new IndexingPolicy + { + IncludedPaths = new Collection + { + new IncludedPath + { + Path = "/*", + Indexes = new Collection + { + Index.Range(DataType.Number), + Index.Range(DataType.String), + } + } + } + }, UniqueKeyPolicy = new UniqueKeyPolicy { UniqueKeys = new Collection diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs index 793e934e5..ac0024573 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs @@ -59,7 +59,7 @@ namespace Squidex.Infrastructure.EventSourcing return; } - var currentVersion = GetEventStreamOffset(streamName); + var currentVersion = await GetEventStreamOffsetAsync(streamName); if (expectedVersion != EtagVersion.Any && expectedVersion != currentVersion) { @@ -80,7 +80,7 @@ namespace Squidex.Infrastructure.EventSourcing { if (ex.StatusCode == HttpStatusCode.Conflict) { - currentVersion = GetEventStreamOffset(streamName); + currentVersion = await GetEventStreamOffsetAsync(streamName); if (expectedVersion != EtagVersion.Any) { @@ -105,13 +105,13 @@ namespace Squidex.Infrastructure.EventSourcing } } - private long GetEventStreamOffset(string streamName) + private async Task GetEventStreamOffsetAsync(string streamName) { var query = documentClient.CreateDocumentQuery(collectionUri, FilterBuilder.LastPosition(streamName)); - var document = query.ToList().FirstOrDefault(); + var document = await query.FirstOrDefaultAsync(); if (document != null) { diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs index 7180ad59c..b6bd7686c 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/FilterBuilder.cs @@ -5,41 +5,14 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; using Microsoft.Azure.Documents; -using Microsoft.Azure.Documents.Client; -using Microsoft.Azure.Documents.Linq; using Squidex.Infrastructure.Json.Objects; namespace Squidex.Infrastructure.EventSourcing { internal static class FilterBuilder { - public static async Task QueryAsync(this DocumentClient documentClient, Uri collectionUri, SqlQuerySpec querySpec, Func handler, CancellationToken ct = default) - { - var query = - documentClient.CreateDocumentQuery(collectionUri, querySpec) - .AsDocumentQuery(); - - using (query) - { - var result = new List(); - - while (query.HasMoreResults && !ct.IsCancellationRequested) - { - var commits = await query.ExecuteNextAsync(ct); - - foreach (var commit in commits) - { - await handler(commit); - } - } - } - } - public static SqlQuerySpec AllIds(string streamName) { var query = diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/FilterExtensions.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/FilterExtensions.cs new file mode 100644 index 000000000..c24e93ff1 --- /dev/null +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/FilterExtensions.cs @@ -0,0 +1,62 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Azure.Documents; +using Microsoft.Azure.Documents.Client; +using Microsoft.Azure.Documents.Linq; + +namespace Squidex.Infrastructure.EventSourcing +{ + internal static class FilterExtensions + { + public static async Task FirstOrDefaultAsync(this IQueryable queryable, CancellationToken ct = default) + { + var documentQuery = queryable.AsDocumentQuery(); + + using (documentQuery) + { + if (documentQuery.HasMoreResults) + { + var results = await documentQuery.ExecuteNextAsync(ct); + + return results.FirstOrDefault(); + } + } + + return default; + } + + public static Task QueryAsync(this DocumentClient documentClient, Uri collectionUri, SqlQuerySpec querySpec, Func handler, CancellationToken ct = default) + { + var query = documentClient.CreateDocumentQuery(collectionUri, querySpec); + + return query.QueryAsync(handler, ct); + } + + public static async Task QueryAsync(this IQueryable queryable, Func handler, CancellationToken ct = default) + { + var documentQuery = queryable.AsDocumentQuery(); + + using (documentQuery) + { + while (documentQuery.HasMoreResults && !ct.IsCancellationRequested) + { + var items = await documentQuery.ExecuteNextAsync(ct); + + foreach (var item in items) + { + await handler(item); + } + } + } + } + } +} diff --git a/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoDbOptions.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoDbOptions.cs new file mode 100644 index 000000000..65462dc6c --- /dev/null +++ b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoDbOptions.cs @@ -0,0 +1,14 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Infrastructure.MongoDb +{ + public sealed class MongoDbOptions + { + public bool IsCosmosDb { get; set; } + } +} diff --git a/src/Squidex.Infrastructure/Configuration/Options.cs b/src/Squidex.Infrastructure/Configuration/Alternatives.cs similarity index 85% rename from src/Squidex.Infrastructure/Configuration/Options.cs rename to src/Squidex.Infrastructure/Configuration/Alternatives.cs index 89cb9f596..77d70602f 100644 --- a/src/Squidex.Infrastructure/Configuration/Options.cs +++ b/src/Squidex.Infrastructure/Configuration/Alternatives.cs @@ -10,9 +10,9 @@ using System.Collections.Generic; namespace Microsoft.Extensions.Configuration { - public sealed class Options : Dictionary + public sealed class Alternatives : Dictionary { - public Options() + public Alternatives() : base(StringComparer.OrdinalIgnoreCase) { } diff --git a/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs b/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs index fafb0ee84..4c86b80a0 100644 --- a/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs +++ b/src/Squidex.Infrastructure/Configuration/ConfigurationExtensions.cs @@ -46,7 +46,7 @@ namespace Microsoft.Extensions.Configuration return value; } - public static string ConfigureByOption(this IConfiguration config, string path, Options options) + public static string ConfigureByOption(this IConfiguration config, string path, Alternatives options) { var value = config.GetRequiredValue(path); diff --git a/src/Squidex/Config/Domain/AssetServices.cs b/src/Squidex/Config/Domain/AssetServices.cs index 5b8e36706..669cd29b8 100644 --- a/src/Squidex/Config/Domain/AssetServices.cs +++ b/src/Squidex/Config/Domain/AssetServices.cs @@ -20,7 +20,7 @@ namespace Squidex.Config.Domain { public static void AddMyAssetServices(this IServiceCollection services, IConfiguration config) { - config.ConfigureByOption("assetStore:type", new Options + config.ConfigureByOption("assetStore:type", new Alternatives { ["Default"] = () => { diff --git a/src/Squidex/Config/Domain/EventStoreServices.cs b/src/Squidex/Config/Domain/EventStoreServices.cs index 69ebbbab5..ee90b1d47 100644 --- a/src/Squidex/Config/Domain/EventStoreServices.cs +++ b/src/Squidex/Config/Domain/EventStoreServices.cs @@ -26,7 +26,7 @@ namespace Squidex.Config.Domain { public static void AddMyEventStoreServices(this IServiceCollection services, IConfiguration config) { - config.ConfigureByOption("eventStore:type", new Options + config.ConfigureByOption("eventStore:type", new Alternatives { ["MongoDb"] = () => { diff --git a/src/Squidex/Config/Domain/StoreServices.cs b/src/Squidex/Config/Domain/StoreServices.cs index 63559f3d4..b95d436ba 100644 --- a/src/Squidex/Config/Domain/StoreServices.cs +++ b/src/Squidex/Config/Domain/StoreServices.cs @@ -10,6 +10,7 @@ using IdentityServer4.Stores; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Options; using Migrate_01.Migrations; using MongoDB.Driver; using Squidex.Domain.Apps.Entities; @@ -31,6 +32,7 @@ using Squidex.Infrastructure.Diagnostics; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Json; using Squidex.Infrastructure.Migrations; +using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.States; using Squidex.Infrastructure.UsageTracking; @@ -40,7 +42,7 @@ namespace Squidex.Config.Domain { public static void AddMyStoreServices(this IServiceCollection services, IConfiguration config) { - config.ConfigureByOption("store:type", new Options + config.ConfigureByOption("store:type", new Alternatives { ["MongoDB"] = () => { @@ -48,6 +50,10 @@ namespace Squidex.Config.Domain var mongoDatabaseName = config.GetRequiredValue("store:mongoDb:database"); var mongoContentDatabaseName = config.GetOptionalValue("store:mongoDb:contentDatabase", mongoDatabaseName); + var isCosmosDb = config.GetOptionalValue("store:mongoDB:isCosmosDB"); + + services.Configure(config.GetSection("store:mongoDB")); + services.AddSingleton(typeof(ISnapshotStore<,>), typeof(MongoSnapshotStore<,>)); services.AddSingletonAs(_ => Singletons.GetOrAdd(mongoConfiguration, s => new MongoClient(s))) @@ -97,7 +103,8 @@ namespace Squidex.Config.Domain services.AddSingletonAs(c => new MongoContentRepository( c.GetRequiredService().GetDatabase(mongoContentDatabaseName), c.GetRequiredService(), - c.GetRequiredService())) + c.GetRequiredService(), + c.GetRequiredService>())) .AsOptional() .AsOptional>() .AsOptional(); diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs index aed630ded..36c3cdc71 100644 --- a/src/Squidex/Config/Orleans/OrleansServices.cs +++ b/src/Squidex/Config/Orleans/OrleansServices.cs @@ -58,7 +58,7 @@ namespace Squidex.Config.Orleans var siloPort = config.GetOptionalValue("orleans:siloPort", 11111); - config.ConfigureByOption("orleans:clustering", new Options + config.ConfigureByOption("orleans:clustering", new Alternatives { ["MongoDB"] = () => { @@ -81,7 +81,7 @@ namespace Squidex.Config.Orleans } }); - config.ConfigureByOption("store:type", new Options + config.ConfigureByOption("store:type", new Alternatives { ["MongoDB"] = () => { diff --git a/tools/Migrate_01/Migrations/ConvertOldSnapshotStores.cs b/tools/Migrate_01/Migrations/ConvertOldSnapshotStores.cs index 4528f8e5b..58c3f8643 100644 --- a/tools/Migrate_01/Migrations/ConvertOldSnapshotStores.cs +++ b/tools/Migrate_01/Migrations/ConvertOldSnapshotStores.cs @@ -7,23 +7,33 @@ using System.Linq; using System.Threading.Tasks; +using Microsoft.Extensions.Options; using MongoDB.Bson; using MongoDB.Driver; using Squidex.Infrastructure.Migrations; +using Squidex.Infrastructure.MongoDb; +using Squidex.Infrastructure.Tasks; namespace Migrate_01.Migrations { public sealed class ConvertOldSnapshotStores : IMigration { private readonly IMongoDatabase database; + private readonly MongoDbOptions options; - public ConvertOldSnapshotStores(IMongoDatabase database) + public ConvertOldSnapshotStores(IMongoDatabase database, IOptions options) { this.database = database; + this.options = options.Value; } public Task UpdateAsync() { + if (options.IsCosmosDb) + { + return TaskHelper.Done; + } + var collections = new[] { "States_Apps", From ae9a8ff6bb8ca197e200e0978a3997ac2205dcac Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 26 Feb 2019 19:05:35 +0100 Subject: [PATCH 26/55] Indexer grain. --- .../Backup/BackupGrain.cs | 2 +- .../Contents/Text/MultiLanguageAnalyzer.cs | 65 +++++ .../Contents/Text/PersistenceHelper.cs | 90 ++++++ .../Contents/Text/TextIndexer.cs | 47 +++ .../Contents/Text/TextIndexerGrain.cs | 268 ++++++++++++++++++ .../Squidex.Domain.Apps.Entities.csproj | 3 + .../Assets/AzureBlobAssetStore.cs | 10 +- .../CosmosDbEventStore_Writer.cs | 1 - .../Assets/GoogleCloudAssetStore.cs | 10 +- .../Assets/MongoGridFsAssetStore.cs | 15 +- .../Assets/AssetAlreadyExistsException.cs | 2 +- .../Assets/FolderAssetStore.cs | 10 +- .../Assets/IAssetStore.cs | 2 +- .../Assets/MemoryAssetStore.cs | 26 +- .../Assets/NoopAssetStore.cs | 2 +- .../Orleans/GrainOfGuid.cs | 2 +- .../Orleans/GrainOfString.cs | 2 +- .../Contents/Text/TextIndexerGrainTests.cs | 165 +++++++++++ .../Assets/AssetStoreTests.cs | 13 + 19 files changed, 703 insertions(+), 32 deletions(-) create mode 100644 src/Squidex.Domain.Apps.Entities/Contents/Text/MultiLanguageAnalyzer.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Contents/Text/PersistenceHelper.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexer.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs create mode 100644 tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs diff --git a/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs b/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs index f1bff2c44..fe6a484ec 100644 --- a/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs @@ -164,7 +164,7 @@ namespace Squidex.Domain.Apps.Entities.Backup currentTask.Token.ThrowIfCancellationRequested(); - await assetStore.UploadAsync(job.Id.ToString(), 0, null, stream, currentTask.Token); + await assetStore.UploadAsync(job.Id.ToString(), 0, null, stream, false, currentTask.Token); } job.Status = JobStatus.Completed; diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/MultiLanguageAnalyzer.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/MultiLanguageAnalyzer.cs new file mode 100644 index 000000000..8bd41df9c --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/MultiLanguageAnalyzer.cs @@ -0,0 +1,65 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Linq; +using Lucene.Net.Analysis; +using Lucene.Net.Analysis.Standard; +using Lucene.Net.Util; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Entities.Contents.Text +{ + public sealed class MultiLanguageAnalyzer : AnalyzerWrapper + { + private readonly StandardAnalyzer fallbackAnalyzer; + private readonly Dictionary analyzers = new Dictionary(StringComparer.OrdinalIgnoreCase); + + public MultiLanguageAnalyzer(LuceneVersion version) + : base(PER_FIELD_REUSE_STRATEGY) + { + fallbackAnalyzer = new StandardAnalyzer(version); + + foreach (var type in typeof(StandardAnalyzer).Assembly.GetTypes()) + { + if (typeof(Analyzer).IsAssignableFrom(type)) + { + var language = type.Namespace.Split('.').Last(); + + if (language.Length == 2) + { + try + { + var analyzer = Activator.CreateInstance(type, version); + + analyzers[language] = (Analyzer)analyzer; + } + catch (MissingMethodException) + { + continue; + } + } + } + } + } + + protected override Analyzer GetWrappedAnalyzer(string fieldName) + { + if (fieldName.Length > 0) + { + var analyzer = analyzers.GetOrDefault(fieldName.Substring(0, 2)) ?? fallbackAnalyzer; + + return analyzer; + } + else + { + return fallbackAnalyzer; + } + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/PersistenceHelper.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/PersistenceHelper.cs new file mode 100644 index 000000000..49424c856 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/PersistenceHelper.cs @@ -0,0 +1,90 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.IO; +using System.IO.Compression; +using System.Threading.Tasks; +using Squidex.Infrastructure.Assets; + +namespace Squidex.Domain.Apps.Entities.Contents.Text +{ + public static class PersistenceHelper + { + private const string ArchiveFile = "Archive.zip"; + private const string LockFile = "write.lock"; + + public static async Task UploadDirectoryAsync(this IAssetStore assetStore, DirectoryInfo directory) + { + using (var fileStream = new FileStream( + Path.Combine(directory.FullName, ArchiveFile), + FileMode.Create, + FileAccess.ReadWrite, + FileShare.None, + 4096, + FileOptions.DeleteOnClose)) + { + using (var zipArchive = new ZipArchive(fileStream, ZipArchiveMode.Create, true)) + { + foreach (var file in directory.GetFiles()) + { + try + { + if (!file.Name.Equals(ArchiveFile, StringComparison.OrdinalIgnoreCase) && !file.Name.Equals(LockFile, StringComparison.OrdinalIgnoreCase)) + { + zipArchive.CreateEntryFromFile(file.FullName, file.Name); + } + } + catch (IOException) + { + continue; + } + } + } + + fileStream.Position = 0; + + await assetStore.UploadAsync(directory.Name, 0, string.Empty, fileStream, true); + } + } + + public static async Task DownloadAsync(this IAssetStore assetStore, DirectoryInfo directory) + { + if (directory.Exists) + { + directory.Delete(true); + } + + directory.Create(); + + using (var fileStream = new FileStream( + Path.Combine(directory.FullName, ArchiveFile), + FileMode.Create, + FileAccess.ReadWrite, + FileShare.None, + 4096, + FileOptions.DeleteOnClose)) + { + try + { + await assetStore.DownloadAsync(directory.Name, 0, string.Empty, fileStream); + + fileStream.Position = 0; + + using (var zipArchive = new ZipArchive(fileStream, ZipArchiveMode.Read, true)) + { + zipArchive.ExtractToDirectory(directory.FullName); + } + } + catch (AssetNotFoundException) + { + return; + } + } + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexer.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexer.cs new file mode 100644 index 000000000..db309826f --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexer.cs @@ -0,0 +1,47 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Threading.Tasks; +using Squidex.Domain.Apps.Events.Contents; +using Squidex.Infrastructure.EventSourcing; +using Squidex.Infrastructure.Tasks; + +namespace Squidex.Domain.Apps.Entities.Contents.Text +{ + public sealed class TextIndexer : IEventConsumer + { + public string Name + { + get { return GetType().Name; } + } + + public string EventsFilter + { + get { return "^content-"; } + } + + public Task ClearAsync() + { + return TaskHelper.Done; + } + + public Task On(Envelope @event) + { + switch (@event.Payload) + { + case ContentCreated contentCreated: + break; + case ContentUpdated contentUpdated: + break; + case ContentUpdateProposed contentUpdateProposed: + break; + } + + return Task.CompletedTask; + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs new file mode 100644 index 000000000..119df813f --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs @@ -0,0 +1,268 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; +using Lucene.Net.Analysis; +using Lucene.Net.Analysis.Standard; +using Lucene.Net.Documents; +using Lucene.Net.Index; +using Lucene.Net.QueryParsers.Classic; +using Lucene.Net.Search; +using Lucene.Net.Store; +using Lucene.Net.Util; +using Squidex.Domain.Apps.Core; +using Squidex.Domain.Apps.Core.Contents; +using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Assets; +using Squidex.Infrastructure.Json.Objects; +using Squidex.Infrastructure.Orleans; + +namespace Squidex.Domain.Apps.Entities.Contents.Text +{ + public sealed class TextIndexerGrain : GrainOfGuid + { + private const LuceneVersion Version = LuceneVersion.LUCENE_48; + private const int MaxResults = 2000; + private const int MaxUpdates = 100; + private static readonly HashSet IdFields = new HashSet(); + private static readonly Analyzer Analyzer = new MultiLanguageAnalyzer(Version); + private readonly IAssetStore assetStore; + private DirectoryInfo directory; + private IndexWriter indexWriter; + private IndexReader indexReader; + private QueryParser queryParser; + private int currentAppVersion; + private int currentSchemaVersion; + private int updates; + + public TextIndexerGrain(IAssetStore assetStore) + { + Guard.NotNull(assetStore, nameof(assetStore)); + + this.assetStore = assetStore; + } + + public override Task OnActivateAsync() + { + RegisterTimer(_ => FlushAsync(), null, TimeSpan.Zero, TimeSpan.FromMinutes(10)); + + return base.OnActivateAsync(); + } + + public override async Task OnDeactivateAsync() + { + await DeactivateAsync(true); + } + + protected override async Task OnActivateAsync(Guid key) + { + directory = new DirectoryInfo(Path.Combine(Path.GetTempPath(), $"Index_{key}")); + + await assetStore.DownloadAsync(directory); + + indexWriter = new IndexWriter(FSDirectory.Open(directory), new IndexWriterConfig(Version, Analyzer)); + indexReader = indexWriter.GetReader(true); + } + + public Task DeleteContentAsync(Guid id) + { + indexWriter.DeleteDocuments(new Term("id", id.ToString())); + + return TryFlushAsync(); + } + + public Task AddContentAsync(Guid id, NamedContentData data, bool isUpdate, bool isDraft) + { + var idString = id.ToString(); + + if (isUpdate) + { + indexWriter.DeleteDocuments(new Term("id", idString)); + } + + var document = new Document(); + + document.AddStringField("id", idString, Field.Store.YES); + document.AddInt32Field("draft", isDraft ? 1 : 0, Field.Store.YES); + + foreach (var field in data) + { + foreach (var fieldValue in field.Value) + { + var value = fieldValue.Value; + + if (value.Type == JsonValueType.String) + { + var fieldName = BuildFieldName(fieldValue.Key, field.Key); + + document.AddTextField(fieldName, fieldValue.Value.ToString(), Field.Store.YES); + } + else if (value.Type == JsonValueType.Object) + { + foreach (var property in (JsonObject)value) + { + if (property.Value.Type == JsonValueType.String) + { + var fieldName = BuildFieldName(fieldValue.Key, field.Key, property.Key); + + document.AddTextField(fieldName, property.Value.ToString(), Field.Store.YES); + } + } + } + } + } + + indexWriter.AddDocument(document); + + return TryFlushAsync(); + } + + public Task> SearchAsync(string term, int appVersion, int schemaVersion, J schema, List languages) + { + var query = BuildQuery(term, appVersion, schemaVersion, schema, languages); + + var result = new List(); + + if (indexReader != null) + { + var hits = new IndexSearcher(indexReader).Search(query, MaxResults).ScoreDocs; + + foreach (var hit in hits) + { + var document = indexReader.Document(hit.Doc); + + var idField = document.GetField("id")?.GetStringValue(); + + if (idField != null && Guid.TryParse(idField, out var guid)) + { + result.Add(guid); + } + } + } + + return Task.FromResult(result); + } + + private Query BuildQuery(string query, int appVersion, int schemaVersion, J schema, List language) + { + if (queryParser == null || currentAppVersion != appVersion || currentSchemaVersion != schemaVersion) + { + var fields = BuildFields(schema, language); + + queryParser = new MultiFieldQueryParser(Version, fields, Analyzer); + + currentAppVersion = appVersion; + currentSchemaVersion = schemaVersion; + } + + return queryParser.Parse(query); + } + + private string[] BuildFields(Schema schema, IEnumerable languages) + { + var fieldNames = new List(); + + var iv = InvariantPartitioning.Instance.Master.Key; + + foreach (var field in schema.Fields) + { + if (field.RawProperties is StringFieldProperties) + { + if (field.Partitioning.Equals(Partitioning.Invariant)) + { + fieldNames.Add(BuildFieldName(iv, field.Name)); + } + else + { + foreach (var language in languages) + { + fieldNames.Add(BuildFieldName(language, field.Name)); + } + } + } + else if (field is IArrayField arrayField) + { + foreach (var nested in arrayField.Fields) + { + if (nested.RawProperties is StringFieldProperties) + { + if (field.Partitioning.Equals(Partitioning.Invariant)) + { + fieldNames.Add(BuildFieldName(iv, field.Name, nested.Name)); + } + else + { + foreach (var language in languages) + { + fieldNames.Add(BuildFieldName(language, field.Name, nested.Name)); + } + } + } + } + } + } + + return fieldNames.ToArray(); + } + + private async Task TryFlushAsync() + { + updates++; + + if (updates >= MaxUpdates) + { + await FlushAsync(); + } + } + + public async Task FlushAsync() + { + if (updates > 0 && indexWriter != null) + { + indexWriter.Flush(true, true); + indexWriter.Commit(); + + indexReader?.Dispose(); + indexReader = indexWriter.GetReader(true); + + await assetStore.UploadDirectoryAsync(directory); + + updates = 0; + } + } + + public async Task DeactivateAsync(bool deleteFolder = false) + { + await TryFlushAsync(); + + indexWriter?.Dispose(); + indexWriter = null; + + indexReader?.Dispose(); + indexReader = null; + + if (deleteFolder && directory.Exists) + { + directory.Delete(true); + } + } + + private static string BuildFieldName(string language, string name) + { + return $"{language}_{name}"; + } + + private static string BuildFieldName(string language, string name, string nested) + { + return $"{language}_{name}_{nested}"; + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj b/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj index 6adb6a190..b076b00cc 100644 --- a/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj +++ b/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj @@ -16,6 +16,9 @@ + + + all runtime; build; native; contentfiles; analyzers diff --git a/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs b/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs index 291fda481..e09a88879 100644 --- a/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs +++ b/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs @@ -110,14 +110,14 @@ namespace Squidex.Infrastructure.Assets } } - public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default) + public Task UploadAsync(string id, long version, string suffix, Stream stream, bool overwrite = false, CancellationToken ct = default) { - return UploadCoreAsync(GetObjectName(id, version, suffix), stream, ct); + return UploadCoreAsync(GetObjectName(id, version, suffix), stream, overwrite, ct); } public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default) { - return UploadCoreAsync(fileName, stream, ct); + return UploadCoreAsync(fileName, stream, false, ct); } public Task DeleteAsync(string id, long version, string suffix) @@ -137,13 +137,13 @@ namespace Squidex.Infrastructure.Assets return blob.DeleteIfExistsAsync(); } - private async Task UploadCoreAsync(string blobName, Stream stream, CancellationToken ct = default) + private async Task UploadCoreAsync(string blobName, Stream stream, bool overwrite = false, CancellationToken ct = default) { try { var tempBlob = blobContainer.GetBlockBlobReference(blobName); - await tempBlob.UploadFromStreamAsync(stream, AccessCondition.GenerateIfNotExistsCondition(), null, null, ct); + await tempBlob.UploadFromStreamAsync(stream, overwrite ? null : AccessCondition.GenerateIfNotExistsCondition(), null, null, ct); } catch (StorageException ex) when (ex.RequestInformation.HttpStatusCode == 409) { diff --git a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs index ac0024573..45144e56e 100644 --- a/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs +++ b/src/Squidex.Infrastructure.Azure/EventSourcing/CosmosDbEventStore_Writer.cs @@ -7,7 +7,6 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Net; using System.Threading.Tasks; using Microsoft.Azure.Documents; diff --git a/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs b/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs index e76b0d884..f76589938 100644 --- a/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs +++ b/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs @@ -80,14 +80,14 @@ namespace Squidex.Infrastructure.Assets } } - public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default) + public Task UploadAsync(string id, long version, string suffix, Stream stream, bool overwrite = false, CancellationToken ct = default) { - return UploadCoreAsync(GetObjectName(id, version, suffix), stream, ct); + return UploadCoreAsync(GetObjectName(id, version, suffix), stream, overwrite, ct); } public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default) { - return UploadCoreAsync(fileName, stream, ct); + return UploadCoreAsync(fileName, stream, false, ct); } public Task DeleteAsync(string id, long version, string suffix) @@ -100,11 +100,11 @@ namespace Squidex.Infrastructure.Assets return DeleteCoreAsync(fileName); } - private async Task UploadCoreAsync(string objectName, Stream stream, CancellationToken ct = default) + private async Task UploadCoreAsync(string objectName, Stream stream, bool overwrite = false, CancellationToken ct = default) { try { - await storageClient.UploadObjectAsync(bucketName, objectName, "application/octet-stream", stream, IfNotExists, ct); + await storageClient.UploadObjectAsync(bucketName, objectName, "application/octet-stream", stream, overwrite ? null : IfNotExists, ct); } catch (GoogleApiException ex) when (ex.HttpStatusCode == HttpStatusCode.PreconditionFailed) { diff --git a/src/Squidex.Infrastructure.MongoDb/Assets/MongoGridFsAssetStore.cs b/src/Squidex.Infrastructure.MongoDb/Assets/MongoGridFsAssetStore.cs index 6956bff4c..997fd9068 100644 --- a/src/Squidex.Infrastructure.MongoDb/Assets/MongoGridFsAssetStore.cs +++ b/src/Squidex.Infrastructure.MongoDb/Assets/MongoGridFsAssetStore.cs @@ -52,7 +52,7 @@ namespace Squidex.Infrastructure.Assets using (var readStream = await bucket.OpenDownloadStreamAsync(sourceFileName, cancellationToken: ct)) { - await UploadFileCoreAsync(target, readStream, ct); + await UploadFileCoreAsync(target, readStream, false, ct); } } catch (GridFSFileNotFoundException ex) @@ -78,14 +78,14 @@ namespace Squidex.Infrastructure.Assets } } - public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default) + public Task UploadAsync(string id, long version, string suffix, Stream stream, bool overwrite = false, CancellationToken ct = default) { - return UploadFileCoreAsync(GetFileName(id, version, suffix), stream, ct); + return UploadFileCoreAsync(GetFileName(id, version, suffix), stream, overwrite, ct); } public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default) { - return UploadFileCoreAsync(fileName, stream, ct); + return UploadFileCoreAsync(fileName, stream, false, ct); } public Task DeleteAsync(string id, long version, string suffix) @@ -110,10 +110,15 @@ namespace Squidex.Infrastructure.Assets } } - private async Task UploadFileCoreAsync(string id, Stream stream, CancellationToken ct = default) + private async Task UploadFileCoreAsync(string id, Stream stream, bool overwrite = false, CancellationToken ct = default) { try { + if (overwrite) + { + await bucket.DeleteAsync(id, ct); + } + await bucket.UploadFromStreamAsync(id, id, stream, cancellationToken: ct); } catch (MongoWriteException ex) when (ex.WriteError.Category == ServerErrorCategory.DuplicateKey) diff --git a/src/Squidex.Infrastructure/Assets/AssetAlreadyExistsException.cs b/src/Squidex.Infrastructure/Assets/AssetAlreadyExistsException.cs index 954f26c4c..ddf8465e0 100644 --- a/src/Squidex.Infrastructure/Assets/AssetAlreadyExistsException.cs +++ b/src/Squidex.Infrastructure/Assets/AssetAlreadyExistsException.cs @@ -32,7 +32,7 @@ namespace Squidex.Infrastructure.Assets { Guard.NotNullOrEmpty(fileName, nameof(fileName)); - return $"An asset with name '{fileName}' already not exists."; + return $"An asset with name '{fileName}' already exists."; } } } diff --git a/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs b/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs index 3c00b6ea8..a61e24366 100644 --- a/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs +++ b/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs @@ -95,14 +95,14 @@ namespace Squidex.Infrastructure.Assets } } - public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default) + public Task UploadAsync(string id, long version, string suffix, Stream stream, bool overwrite = false, CancellationToken ct = default) { - return UploadCoreAsync(GetFile(id, version, suffix), stream, ct); + return UploadCoreAsync(GetFile(id, version, suffix), stream, overwrite, ct); } public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default) { - return UploadCoreAsync(GetFile(fileName), stream, ct); + return UploadCoreAsync(GetFile(fileName), stream, false, ct); } public Task DeleteAsync(string id, long version, string suffix) @@ -122,11 +122,11 @@ namespace Squidex.Infrastructure.Assets return TaskHelper.Done; } - private static async Task UploadCoreAsync(FileInfo file, Stream stream, CancellationToken ct = default) + private static async Task UploadCoreAsync(FileInfo file, Stream stream, bool overwrite = false, CancellationToken ct = default) { try { - using (var fileStream = file.Open(FileMode.CreateNew, FileAccess.Write)) + using (var fileStream = file.Open(overwrite ? FileMode.Create : FileMode.CreateNew, FileAccess.Write)) { await stream.CopyToAsync(fileStream, BufferSize, ct); } diff --git a/src/Squidex.Infrastructure/Assets/IAssetStore.cs b/src/Squidex.Infrastructure/Assets/IAssetStore.cs index b4170bfff..65d3c4f84 100644 --- a/src/Squidex.Infrastructure/Assets/IAssetStore.cs +++ b/src/Squidex.Infrastructure/Assets/IAssetStore.cs @@ -21,7 +21,7 @@ namespace Squidex.Infrastructure.Assets Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default); - Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default); + Task UploadAsync(string id, long version, string suffix, Stream stream, bool overwrite = false, CancellationToken ct = default); Task DeleteAsync(string fileName); diff --git a/src/Squidex.Infrastructure/Assets/MemoryAssetStore.cs b/src/Squidex.Infrastructure/Assets/MemoryAssetStore.cs index 7c00f9a85..bc3b8804e 100644 --- a/src/Squidex.Infrastructure/Assets/MemoryAssetStore.cs +++ b/src/Squidex.Infrastructure/Assets/MemoryAssetStore.cs @@ -36,7 +36,7 @@ namespace Squidex.Infrastructure.Assets using (await readerLock.LockAsync()) { - await UploadAsync(id, version, suffix, sourceStream, ct); + await UploadAsync(id, version, suffix, sourceStream, false, ct); } } @@ -64,18 +64,23 @@ namespace Squidex.Infrastructure.Assets } } - public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default) + public Task UploadAsync(string id, long version, string suffix, Stream stream, bool overwrite = false, CancellationToken ct = default) { Guard.NotNullOrEmpty(id, nameof(id)); - return UploadAsync(GetFileName(id, version, suffix), stream, ct); + return UploadCoreAsync(GetFileName(id, version, suffix), stream, overwrite, ct); } - public async Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default) + public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default) + { + return UploadCoreAsync(fileName, stream, false); + } + + private async Task UploadCoreAsync(string fileName, Stream stream, bool overwrite, CancellationToken ct = default) { var memoryStream = new MemoryStream(); - if (streams.TryAdd(fileName, memoryStream)) + async Task CopyAsync() { using (await writerLock.LockAsync()) { @@ -89,6 +94,17 @@ namespace Squidex.Infrastructure.Assets } } } + + if (overwrite) + { + await CopyAsync(); + + streams[fileName] = memoryStream; + } + else if (streams.TryAdd(fileName, memoryStream)) + { + await CopyAsync(); + } else { throw new AssetAlreadyExistsException(fileName); diff --git a/src/Squidex.Infrastructure/Assets/NoopAssetStore.cs b/src/Squidex.Infrastructure/Assets/NoopAssetStore.cs index 5c98cd77a..b48eb7269 100644 --- a/src/Squidex.Infrastructure/Assets/NoopAssetStore.cs +++ b/src/Squidex.Infrastructure/Assets/NoopAssetStore.cs @@ -34,7 +34,7 @@ namespace Squidex.Infrastructure.Assets throw new NotSupportedException(); } - public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default) + public Task UploadAsync(string id, long version, string suffix, Stream stream, bool overwrite = false, CancellationToken ct = default) { throw new NotSupportedException(); } diff --git a/src/Squidex.Infrastructure/Orleans/GrainOfGuid.cs b/src/Squidex.Infrastructure/Orleans/GrainOfGuid.cs index 0a816c381..a179c78d8 100644 --- a/src/Squidex.Infrastructure/Orleans/GrainOfGuid.cs +++ b/src/Squidex.Infrastructure/Orleans/GrainOfGuid.cs @@ -16,7 +16,7 @@ namespace Squidex.Infrastructure.Orleans { public Guid Key { get; private set; } - public sealed override Task OnActivateAsync() + public override Task OnActivateAsync() { return ActivateAsync(this.GetPrimaryKey()); } diff --git a/src/Squidex.Infrastructure/Orleans/GrainOfString.cs b/src/Squidex.Infrastructure/Orleans/GrainOfString.cs index 041f67df5..13d737ae0 100644 --- a/src/Squidex.Infrastructure/Orleans/GrainOfString.cs +++ b/src/Squidex.Infrastructure/Orleans/GrainOfString.cs @@ -15,7 +15,7 @@ namespace Squidex.Infrastructure.Orleans { public string Key { get; private set; } - public sealed override Task OnActivateAsync() + public override Task OnActivateAsync() { return ActivateAsync(this.GetPrimaryKeyString()); } diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs new file mode 100644 index 000000000..ba4c93d1c --- /dev/null +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs @@ -0,0 +1,165 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Squidex.Domain.Apps.Core; +using Squidex.Domain.Apps.Core.Contents; +using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Infrastructure.Assets; +using Xunit; + +namespace Squidex.Domain.Apps.Entities.Contents.Text +{ + public class TextIndexerGrainTests : IDisposable + { + private readonly Schema schema = + new Schema("test") + .AddString(1, "test", Partitioning.Invariant) + .AddString(2, "localized", Partitioning.Language); + private readonly List languages = new List { "de", "en" }; + private readonly Guid schemaId = Guid.NewGuid(); + private readonly List ids1 = new List { Guid.NewGuid() }; + private readonly List ids2 = new List { Guid.NewGuid() }; + private readonly IAssetStore assetStore = new MemoryAssetStore(); + private readonly TextIndexerGrain sut; + + public TextIndexerGrainTests() + { + sut = new TextIndexerGrain(assetStore); + sut.ActivateAsync(schemaId).Wait(); + } + + public void Dispose() + { + sut.OnDeactivateAsync().Wait(); + } + + [Fact] + public async Task Should_read_index_and_retrieve() + { + await AddInvariantContent(); + + await sut.DeactivateAsync(); + + var other = new TextIndexerGrain(assetStore); + try + { + await other.ActivateAsync(schemaId); + + var helloIds = await other.SearchAsync("Hello", 0, 0, schema, languages); + + Assert.Equal(ids1, helloIds); + + var worldIds = await other.SearchAsync("World", 0, 0, schema, languages); + + Assert.Equal(ids2, worldIds); + } + finally + { + await other.OnDeactivateAsync(); + } + } + + [Fact] + public async Task Should_index_invariant_content_and_retrieve() + { + await AddInvariantContent(); + + var helloIds = await sut.SearchAsync("Hello", 0, 0, schema, languages); + + Assert.Equal(ids1, helloIds); + + var worldIds = await sut.SearchAsync("World", 0, 0, schema, languages); + + Assert.Equal(ids2, worldIds); + } + + [Fact] + public async Task Should_delete_documents_from_index() + { + await AddInvariantContent(); + + await sut.DeleteContentAsync(ids1[0]); + await sut.FlushAsync(); + + var helloIds = await sut.SearchAsync("Hello", 0, 0, schema, languages); + + Assert.Empty(helloIds); + + var worldIds = await sut.SearchAsync("World", 0, 0, schema, languages); + + Assert.Equal(ids2, worldIds); + } + + [Fact] + public async Task Should_index_localized_content_and_retrieve() + { + await AddLocalizedContent(); + + var german1 = await sut.SearchAsync("Stadt", 0, 0, schema, languages); + var german2 = await sut.SearchAsync("and", 0, 0, schema, languages); + + var germanStopwordsIds = await sut.SearchAsync("und", 0, 0, schema, languages); + + Assert.Equal(ids1, german1); + Assert.Equal(ids1, german2); + + Assert.Equal(ids2, germanStopwordsIds); + + var english1 = await sut.SearchAsync("City", 0, 0, schema, languages); + var english2 = await sut.SearchAsync("und", 0, 0, schema, languages); + + var englishStopwordsIds = await sut.SearchAsync("and", 0, 0, schema, languages); + + Assert.Equal(ids2, english1); + Assert.Equal(ids2, english2); + + Assert.Equal(ids1, englishStopwordsIds); + } + + private async Task AddLocalizedContent() + { + var germanData = + new NamedContentData() + .AddField("localized", + new ContentFieldData() + .AddValue("de", "Stadt und Umgebung and whatever")); + + var englishData = + new NamedContentData() + .AddField("localized", + new ContentFieldData() + .AddValue("en", "City and Surroundings und sonstiges")); + + await sut.AddContentAsync(ids1[0], germanData, false, false); + await sut.AddContentAsync(ids2[0], englishData, false, false); + await sut.FlushAsync(); + } + + private async Task AddInvariantContent() + { + var data1 = + new NamedContentData() + .AddField("test", + new ContentFieldData() + .AddValue("iv", "Hello")); + + var data2 = + new NamedContentData() + .AddField("test", + new ContentFieldData() + .AddValue("iv", "World")); + + await sut.AddContentAsync(ids1[0], data1, false, false); + await sut.AddContentAsync(ids2[0], data2, false, false); + + await sut.FlushAsync(); + } + } +} diff --git a/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs index 40202902e..080a68d64 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs @@ -60,6 +60,19 @@ namespace Squidex.Infrastructure.Assets Assert.Equal(assetData.ToArray(), readData.ToArray()); } + [Fact] + public async Task Should_read_and_override_file() + { + await Sut.UploadAsync(assetId, 1, "suffix", new MemoryStream(new byte[] { 0x3, 0x4, 0x5, 0x6 })); + await Sut.UploadAsync(assetId, 1, "suffix", assetData, true); + + var readData = new MemoryStream(); + + await Sut.DownloadAsync(assetId, 1, "suffix", readData); + + Assert.Equal(assetData.ToArray(), readData.ToArray()); + } + [Fact] public async Task Should_throw_exception_when_file_to_write_already_exists() { From 6935426784f16853a6e3061cd141f9b35efd034b Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 26 Feb 2019 21:34:19 +0100 Subject: [PATCH 27/55] Some progress. --- .../Contents/MongoContentCollection.cs | 123 ++++++++++-- .../Contents/MongoContentDraftCollection.cs | 153 -------------- .../Contents/MongoContentEntity.cs | 4 - .../MongoContentPublishedCollection.cs | 67 ------- .../Contents/MongoContentRepository.cs | 54 +++-- .../MongoContentRepository_EventHandling.cs | 8 +- .../MongoContentRepository_SnapshotStore.cs | 14 +- .../{FindExtensions.cs => FilterFactory.cs} | 44 +++-- .../Repositories/IContentRepository.cs | 2 - .../Contents/Text/GrainTextIndexer.cs | 76 +++++++ .../Contents/Text/ITextIndexer.cs | 25 +++ .../Contents/Text/ITextIndexerGrain.cs | 24 +++ .../Contents/Text/IndexData.cs | 18 ++ .../Contents/Text/SearchContext.cs | 23 +++ .../Contents/Text/TextIndexer.cs | 47 ----- .../Contents/Text/TextIndexerGrain.cs | 187 ++++++++---------- src/Squidex/Config/Domain/EntitiesServices.cs | 4 + .../Contents/Text/TextIndexerGrainTests.cs | 44 +++-- 18 files changed, 444 insertions(+), 473 deletions(-) delete mode 100644 src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs delete mode 100644 src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs rename src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/{FindExtensions.cs => FilterFactory.cs} (82%) create mode 100644 src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexer.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexerGrain.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Contents/Text/IndexData.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs delete mode 100644 src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexer.cs diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs index f77be31ba..f3c95069c 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs @@ -11,50 +11,57 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; +using NodaTime; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Contents; +using Squidex.Domain.Apps.Entities.Contents.State; using Squidex.Domain.Apps.Entities.MongoDb.Contents.Visitors; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Infrastructure.Json; using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.Queries; +using Squidex.Infrastructure.Reflection; +using Squidex.Infrastructure.States; namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { internal class MongoContentCollection : MongoRepositoryBase { - private readonly string collectionName; - protected IJsonSerializer Serializer { get; } - public MongoContentCollection(IMongoDatabase database, IJsonSerializer serializer, string collectionName) + public MongoContentCollection(IMongoDatabase database, IJsonSerializer serializer) : base(database) { - this.collectionName = collectionName; - Serializer = serializer; } - protected override async Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default) + protected override Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default) { - await collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.ReferencedIds)), cancellationToken: ct); + return collection.Indexes.CreateManyAsync(new[] + { + new CreateIndexModel(Index + .Ascending(x => x.IndexedSchemaId).Ascending(x => x.Id).Ascending(x => x.Status)), + new CreateIndexModel(Index + .Ascending(x => x.ScheduledAt).Ascending(x => x.IsDeleted)), + new CreateIndexModel(Index + .Ascending(x => x.ReferencedIds)) + }, ct); } protected override string CollectionName() { - return collectionName; + return "State_Contents"; } - public async Task> QueryAsync(IAppEntity app, ISchemaEntity schema, Query query, Status[] status = null, bool useDraft = false) + public async Task> QueryAsync(IAppEntity app, ISchemaEntity schema, Query query, List ids, Status[] status = null, bool useDraft = false) { try { query = query.AdjustToModel(schema.SchemaDef, useDraft); - var filter = query.ToFilter(schema.Id, status); + var filter = query.ToFilter(schema.Id, ids, status); var contentCount = Collection.Find(filter).CountDocumentsAsync(); var contentItems = @@ -62,7 +69,6 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents .ContentTake(query) .ContentSkip(query) .ContentSort(query) - .Not(x => x.DataText) .ToListAsync(); await Task.WhenAll(contentItems, contentCount); @@ -89,12 +95,9 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents public async Task> QueryAsync(IAppEntity app, ISchemaEntity schema, HashSet ids, Status[] status = null) { - var find = - status != null && status.Length > 0 ? - Collection.Find(x => x.IndexedSchemaId == schema.Id && ids.Contains(x.Id) && x.IsDeleted != true && status.Contains(x.Status)) : - Collection.Find(x => x.IndexedSchemaId == schema.Id && ids.Contains(x.Id)); + var find = Collection.Find(FilterFactory.Build(schema.Id, ids, status)); - var contentItems = find.Not(x => x.DataText).ToListAsync(); + var contentItems = find.ToListAsync(); var contentCount = find.CountDocumentsAsync(); await Task.WhenAll(contentItems, contentCount); @@ -107,6 +110,66 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents return ResultList.Create(contentCount.Result, contentItems.Result); } + public async Task FindContentAsync(IAppEntity app, ISchemaEntity schema, Guid id, Status[] status = null) + { + var find = Collection.Find(FilterFactory.Build(schema.Id, id, status)); + + var contentEntity = await find.FirstOrDefaultAsync(); + + contentEntity?.ParseData(schema.SchemaDef, Serializer); + + return contentEntity; + } + + public Task QueryScheduledWithoutDataAsync(Instant now, Func callback) + { + return Collection.Find(x => x.ScheduledAt < now && x.IsDeleted != true) + .Not(x => x.DataByIds) + .Not(x => x.DataDraftByIds) + .ForEachAsync(c => + { + callback(c); + }); + } + + public async Task> QueryIdsAsync(Guid appId, ISchemaEntity schema, FilterNode filterNode) + { + var filter = filterNode.AdjustToModel(schema.SchemaDef, true).ToFilter(schema.Id); + + var contentEntities = + await Collection.Find(filter).Only(x => x.Id) + .ToListAsync(); + + return contentEntities.Select(x => Guid.Parse(x["_id"].AsString)).ToList(); + } + + public async Task> QueryIdsAsync(Guid appId) + { + var contentEntities = + await Collection.Find(x => x.IndexedAppId == appId).Only(x => x.Id) + .ToListAsync(); + + return contentEntities.Select(x => Guid.Parse(x["_id"].AsString)).ToList(); + } + + public async Task<(ContentState Value, long Version)> ReadAsync(Guid key, Func> getSchema) + { + var contentEntity = + await Collection.Find(x => x.Id == key) + .FirstOrDefaultAsync(); + + if (contentEntity != null) + { + var schema = await getSchema(contentEntity.IndexedAppId, contentEntity.IndexedSchemaId); + + contentEntity.ParseData(schema.SchemaDef, Serializer); + + return (SimpleMapper.Map(contentEntity, new ContentState()), contentEntity.Version); + } + + return (null, EtagVersion.NotFound); + } + public Task CleanupAsync(Guid id) { return Collection.UpdateManyAsync( @@ -120,5 +183,31 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { return Collection.DeleteOneAsync(x => x.Id == id); } + + public async Task UpsertAsync(MongoContentEntity content, long oldVersion) + { + try + { + await Collection.ReplaceOneAsync(x => x.Id == content.Id && x.Version == oldVersion, content, Upsert); + } + catch (MongoWriteException ex) + { + if (ex.WriteError.Category == ServerErrorCategory.DuplicateKey) + { + var existingVersion = + await Collection.Find(x => x.Id == content.Id).Only(x => x.Id, x => x.Version) + .FirstOrDefaultAsync(); + + if (existingVersion != null) + { + throw new InconsistentStateException(existingVersion["vs"].AsInt64, oldVersion, ex); + } + } + else + { + throw; + } + } + } } } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs deleted file mode 100644 index 653e35172..000000000 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs +++ /dev/null @@ -1,153 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Extensions.Options; -using MongoDB.Driver; -using NodaTime; -using Squidex.Domain.Apps.Core.ConvertContent; -using Squidex.Domain.Apps.Entities.Apps; -using Squidex.Domain.Apps.Entities.Contents; -using Squidex.Domain.Apps.Entities.Contents.State; -using Squidex.Domain.Apps.Entities.MongoDb.Contents.Visitors; -using Squidex.Domain.Apps.Entities.Schemas; -using Squidex.Infrastructure; -using Squidex.Infrastructure.Json; -using Squidex.Infrastructure.MongoDb; -using Squidex.Infrastructure.Queries; -using Squidex.Infrastructure.Reflection; -using Squidex.Infrastructure.States; - -namespace Squidex.Domain.Apps.Entities.MongoDb.Contents -{ - internal sealed class MongoContentDraftCollection : MongoContentCollection - { - private readonly MongoDbOptions options; - - public MongoContentDraftCollection(IMongoDatabase database, IJsonSerializer serializer, IOptions options) - : base(database, serializer, "State_Content_Draft") - { - this.options = options.Value; - } - - protected override async Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default) - { - await collection.Indexes.CreateOneAsync( - new CreateIndexModel( - Index - .Ascending(x => x.IndexedSchemaId) - .Ascending(x => x.Id) - .Ascending(x => x.IsDeleted)), null, ct); - - if (!options.IsCosmosDb) - { - await collection.Indexes.CreateOneAsync( - new CreateIndexModel( - Index - .Text(x => x.DataText) - .Ascending(x => x.IndexedSchemaId) - .Ascending(x => x.IsDeleted) - .Ascending(x => x.Status)), null, ct); - } - - await base.SetupCollectionAsync(collection, ct); - } - - public async Task> QueryIdsAsync(Guid appId, ISchemaEntity schema, FilterNode filterNode) - { - var filter = filterNode.AdjustToModel(schema.SchemaDef, true).ToFilter(schema.Id); - - var contentEntities = - await Collection.Find(filter).Only(x => x.Id) - .ToListAsync(); - - return contentEntities.Select(x => Guid.Parse(x["_id"].AsString)).ToList(); - } - - public async Task> QueryIdsAsync(Guid appId) - { - var contentEntities = - await Collection.Find(x => x.IndexedAppId == appId).Only(x => x.Id) - .ToListAsync(); - - return contentEntities.Select(x => Guid.Parse(x["_id"].AsString)).ToList(); - } - - public Task QueryScheduledWithoutDataAsync(Instant now, Func callback) - { - return Collection.Find(x => x.ScheduledAt < now && x.IsDeleted != true) - .Not(x => x.DataByIds) - .Not(x => x.DataDraftByIds) - .Not(x => x.DataText) - .ForEachAsync(c => - { - callback(c); - }); - } - - public async Task FindContentAsync(IAppEntity app, ISchemaEntity schema, Guid id) - { - var contentEntity = - await Collection.Find(x => x.IndexedSchemaId == schema.Id && x.Id == id && x.IsDeleted != true).Not(x => x.DataText) - .FirstOrDefaultAsync(); - - contentEntity?.ParseData(schema.SchemaDef, Serializer); - - return contentEntity; - } - - public async Task<(ContentState Value, long Version)> ReadAsync(Guid key, Func> getSchema) - { - var contentEntity = - await Collection.Find(x => x.Id == key).Not(x => x.DataText) - .FirstOrDefaultAsync(); - - if (contentEntity != null) - { - var schema = await getSchema(contentEntity.IndexedAppId, contentEntity.IndexedSchemaId); - - contentEntity.ParseData(schema.SchemaDef, Serializer); - - return (SimpleMapper.Map(contentEntity, new ContentState()), contentEntity.Version); - } - - return (null, EtagVersion.NotFound); - } - - public async Task UpsertAsync(MongoContentEntity content, long oldVersion) - { - try - { - content.DataText = content.DataDraftByIds.ToFullText(); - - await Collection.ReplaceOneAsync(x => x.Id == content.Id && x.Version == oldVersion, content, Upsert); - } - catch (MongoWriteException ex) - { - if (ex.WriteError.Category == ServerErrorCategory.DuplicateKey) - { - var existingVersion = - await Collection.Find(x => x.Id == content.Id).Only(x => x.Id, x => x.Version) - .FirstOrDefaultAsync(); - - if (existingVersion != null) - { - throw new InconsistentStateException(existingVersion["vs"].AsInt64, oldVersion, ex); - } - } - else - { - throw; - } - } - } - } -} diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentEntity.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentEntity.cs index a2346db31..9c8f3eba7 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentEntity.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentEntity.cs @@ -69,10 +69,6 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents [BsonJson] public ScheduleJob ScheduleJob { get; set; } - [BsonIgnoreIfDefault] - [BsonElement("dt")] - public string DataText { get; set; } - [BsonRequired] [BsonElement("ai")] public NamedId AppId { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs deleted file mode 100644 index 08d819402..000000000 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs +++ /dev/null @@ -1,67 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Extensions.Options; -using MongoDB.Driver; -using Squidex.Domain.Apps.Core.ConvertContent; -using Squidex.Domain.Apps.Entities.Apps; -using Squidex.Domain.Apps.Entities.Contents; -using Squidex.Domain.Apps.Entities.Schemas; -using Squidex.Infrastructure.Json; -using Squidex.Infrastructure.MongoDb; - -namespace Squidex.Domain.Apps.Entities.MongoDb.Contents -{ - internal sealed class MongoContentPublishedCollection : MongoContentCollection - { - private readonly MongoDbOptions options; - - public MongoContentPublishedCollection(IMongoDatabase database, IJsonSerializer serializer, IOptions options) - : base(database, serializer, "State_Content_Published") - { - this.options = options.Value; - } - - protected override async Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default) - { - await collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.IndexedSchemaId).Ascending(x => x.Id)), null, ct); - - if (!options.IsCosmosDb) - { - await collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Text(x => x.DataText).Ascending(x => x.IndexedSchemaId)), null, ct); - } - - await base.SetupCollectionAsync(collection, ct); - } - - public async Task FindContentAsync(IAppEntity app, ISchemaEntity schema, Guid id) - { - var contentEntity = - await Collection.Find(x => x.IndexedSchemaId == schema.Id && x.Id == id).Not(x => x.DataText) - .FirstOrDefaultAsync(); - - contentEntity?.ParseData(schema.SchemaDef, Serializer); - - return contentEntity; - } - - public Task UpsertAsync(MongoContentEntity content) - { - content.DataText = content.DataByIds.ToFullText(); - content.DataDraftByIds = null; - content.ScheduleJob = null; - content.ScheduledAt = null; - - return Collection.ReplaceOneAsync(x => x.Id == content.Id, content, new UpdateOptions { IsUpsert = true }); - } - } -} diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs index f24c6be1d..ea8fd726b 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs @@ -9,18 +9,17 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Microsoft.Extensions.Options; using MongoDB.Driver; using NodaTime; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Contents.Repositories; +using Squidex.Domain.Apps.Entities.Contents.Text; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Infrastructure.Json; using Squidex.Infrastructure.Log; -using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.Queries; namespace Squidex.Domain.Apps.Entities.MongoDb.Contents @@ -30,28 +29,26 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents private readonly IMongoDatabase database; private readonly IAppProvider appProvider; private readonly IJsonSerializer serializer; - private readonly MongoContentDraftCollection contentsDraft; - private readonly MongoContentPublishedCollection contentsPublished; + private readonly ITextIndexer indexer; + private readonly MongoContentCollection contents; - public MongoContentRepository(IMongoDatabase database, IAppProvider appProvider, IJsonSerializer serializer, IOptions options) + public MongoContentRepository(IMongoDatabase database, IAppProvider appProvider, IJsonSerializer serializer, ITextIndexer indexer) { Guard.NotNull(appProvider, nameof(appProvider)); Guard.NotNull(serializer, nameof(serializer)); - Guard.NotNull(options, nameof(options)); + Guard.NotNull(indexer, nameof(ITextIndexer)); this.appProvider = appProvider; - + this.database = database; + this.indexer = indexer; this.serializer = serializer; - contentsDraft = new MongoContentDraftCollection(database, serializer, options); - contentsPublished = new MongoContentPublishedCollection(database, serializer, options); - - this.database = database; + contents = new MongoContentCollection(database, serializer); } public Task InitializeAsync(CancellationToken ct = default) { - return Task.WhenAll(contentsDraft.InitializeAsync(ct), contentsPublished.InitializeAsync(ct)); + return contents.InitializeAsync(ct); } public async Task> QueryAsync(IAppEntity app, ISchemaEntity schema, Status[] status, Query query) @@ -60,11 +57,15 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { if (RequiresPublished(status)) { - return await contentsPublished.QueryAsync(app, schema, query); + var ids = await indexer.SearchAsync(query.FullText, app, schema); + + return await contents.QueryAsync(app, schema, query, ids); } else { - return await contentsDraft.QueryAsync(app, schema, query, status, true); + var ids = await indexer.SearchAsync(query.FullText, app, schema, true); + + return await contents.QueryAsync(app, schema, query, ids, status, true); } } } @@ -75,11 +76,11 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { if (RequiresPublished(status)) { - return await contentsPublished.QueryAsync(app, schema, ids); + return await contents.QueryAsync(app, schema, ids); } else { - return await contentsDraft.QueryAsync(app, schema, ids, status); + return await contents.QueryAsync(app, schema, ids, status); } } } @@ -90,11 +91,11 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { if (RequiresPublished(status)) { - return await contentsPublished.FindContentAsync(app, schema, id); + return await contents.FindContentAsync(app, schema, id); } else { - return await contentsDraft.FindContentAsync(app, schema, id); + return await contents.FindContentAsync(app, schema, id, status); } } } @@ -103,7 +104,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { using (Profiler.TraceMethod()) { - return await contentsDraft.QueryIdsAsync(appId, await appProvider.GetSchemaAsync(appId, schemaId), filterNode); + return await contents.QueryIdsAsync(appId, await appProvider.GetSchemaAsync(appId, schemaId), filterNode); } } @@ -111,7 +112,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { using (Profiler.TraceMethod()) { - return await contentsDraft.QueryIdsAsync(appId); + return await contents.QueryIdsAsync(appId); } } @@ -119,22 +120,13 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { using (Profiler.TraceMethod()) { - await contentsDraft.QueryScheduledWithoutDataAsync(now, callback); + await contents.QueryScheduledWithoutDataAsync(now, callback); } } - public Task RemoveAsync(Guid appId) - { - return Task.WhenAll( - contentsDraft.RemoveAsync(appId), - contentsPublished.RemoveAsync(appId)); - } - public Task ClearAsync() { - return Task.WhenAll( - contentsDraft.ClearAsync(), - contentsPublished.ClearAsync()); + return contents.ClearAsync(); } public Task DeleteArchiveAsync() diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_EventHandling.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_EventHandling.cs index 427629d1d..bb072df70 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_EventHandling.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_EventHandling.cs @@ -33,16 +33,12 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents protected Task On(AssetDeleted @event) { - return Task.WhenAll( - contentsDraft.CleanupAsync(@event.AssetId), - contentsPublished.CleanupAsync(@event.AssetId)); + return contents.CleanupAsync(@event.AssetId); } protected Task On(ContentDeleted @event) { - return Task.WhenAll( - contentsDraft.CleanupAsync(@event.ContentId), - contentsPublished.CleanupAsync(@event.ContentId)); + return contents.CleanupAsync(@event.ContentId); } Task IEventConsumer.ClearAsync() diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs index 32f38e982..a1a9620dd 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs @@ -7,7 +7,6 @@ using System; using System.Threading.Tasks; -using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Contents.State; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; @@ -23,7 +22,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { using (Profiler.TraceMethod()) { - return await contentsDraft.ReadAsync(key, GetSchemaAsync); + return await contents.ReadAsync(key, GetSchemaAsync); } } @@ -58,16 +57,9 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents Version = newVersion }); - await contentsDraft.UpsertAsync(content, oldVersion); + await contents.UpsertAsync(content, oldVersion); - if (value.Status == Status.Published && !value.IsDeleted) - { - await contentsPublished.UpsertAsync(content); - } - else - { - await contentsPublished.RemoveAsync(content.Id); - } + await indexer.IndexAsync(value.SchemaId.Id, value.Id, value.Data, value.DataDraft); } } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FilterFactory.cs similarity index 82% rename from src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs rename to src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FilterFactory.cs index 14195985f..152e98b87 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FilterFactory.cs @@ -19,7 +19,7 @@ using Squidex.Infrastructure.Queries; namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Visitors { - public static class FindExtensions + public static class FilterFactory { private static readonly FilterDefinitionBuilder Filter = Builders.Filter; @@ -109,7 +109,22 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Visitors return cursor.Skip(query); } - public static FilterDefinition ToFilter(this Query query, Guid schemaId, Status[] status) + public static FilterDefinition Build(Guid schemaId, Guid id, Status[] status) + { + return CreateFilter(schemaId, new List { id }, status, null); + } + + public static FilterDefinition Build(Guid schemaId, ICollection ids, Status[] status) + { + return CreateFilter(schemaId, ids, status, null); + } + + public static FilterDefinition ToFilter(this Query query, Guid schemaId, ICollection ids, Status[] status) + { + return CreateFilter(schemaId, ids, status, query); + } + + private static FilterDefinition CreateFilter(Guid schemaId, ICollection ids, Status[] status, Query query) { var filters = new List> { @@ -117,25 +132,28 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Visitors Filter.Ne(x => x.IsDeleted, true) }; - if (status != null) - { - filters.Add(Filter.In(x => x.Status, status)); - } - - var filter = query.BuildFilter(); - - if (filter.Filter != null) + if (ids != null && ids.Count > 0) { - if (filter.Last) + if (ids.Count > 1) { - filters.Add(filter.Filter); + filters.Add(Filter.In(x => x.Id, ids)); } else { - filters.Insert(0, filter.Filter); + filters.Add(Filter.Eq(x => x.Id, ids.First())); } } + if (status != null) + { + filters.Add(Filter.In(x => x.Status, status)); + } + + if (query.Filter != null) + { + filters.Add(query.Filter.BuildFilter()); + } + return Filter.And(filters); } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Repositories/IContentRepository.cs b/src/Squidex.Domain.Apps.Entities/Contents/Repositories/IContentRepository.cs index e82d39932..7944c1b32 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Repositories/IContentRepository.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Repositories/IContentRepository.cs @@ -28,7 +28,5 @@ namespace Squidex.Domain.Apps.Entities.Contents.Repositories Task FindContentAsync(IAppEntity app, ISchemaEntity schema, Status[] status, Guid id); Task QueryScheduledWithoutDataAsync(Instant now, Func callback); - - Task RemoveAsync(Guid appId); } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs new file mode 100644 index 000000000..6cf376033 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs @@ -0,0 +1,76 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Orleans; +using Squidex.Domain.Apps.Core.Contents; +using Squidex.Domain.Apps.Entities.Apps; +using Squidex.Domain.Apps.Entities.Schemas; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Entities.Contents.Text +{ + public sealed class GrainTextIndexer : ITextIndexer + { + private readonly IGrainFactory grainFactory; + + public GrainTextIndexer(IGrainFactory grainFactory) + { + Guard.NotNull(grainFactory, nameof(grainFactory)); + + this.grainFactory = grainFactory; + } + + public Task DeleteAsync(Guid schemaId, Guid id) + { + var index = grainFactory.GetGrain(schemaId); + + return index.DeleteAsync(id); + } + + public async Task IndexAsync(Guid schemaId, Guid id, NamedContentData data, NamedContentData dataDraft) + { + var index = grainFactory.GetGrain(schemaId); + + if (data != null) + { + await index.IndexAsync(id, new IndexData { }); + } + + if (dataDraft != null) + { + await index.IndexAsync(id, new IndexData { IsDraft = true }); + } + } + + public async Task> SearchAsync(string queryText, IAppEntity app, ISchemaEntity schema, bool useDraft = false) + { + if (string.IsNullOrWhiteSpace(queryText)) + { + return null; + } + + var index = grainFactory.GetGrain(schema.Id); + + var languages = app.LanguagesConfig.Select(x => x.Key).ToList(); + + var context = new SearchContext + { + AppVersion = app.Version, + Schema = schema.SchemaDef, + SchemaVersion = schema.Version, + Languages = languages, + IsDraft = useDraft + }; + + return await index.SearchAsync(queryText, context); + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexer.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexer.cs new file mode 100644 index 000000000..27d552d20 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexer.cs @@ -0,0 +1,25 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Squidex.Domain.Apps.Core.Contents; +using Squidex.Domain.Apps.Entities.Apps; +using Squidex.Domain.Apps.Entities.Schemas; + +namespace Squidex.Domain.Apps.Entities.Contents.Text +{ + public interface ITextIndexer + { + Task DeleteAsync(Guid schemaId, Guid id); + + Task IndexAsync(Guid schemaId, Guid id, NamedContentData data, NamedContentData dataDraft); + + Task> SearchAsync(string queryText, IAppEntity appEntity, ISchemaEntity schemaEntity, bool useDraft = false); + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexerGrain.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexerGrain.cs new file mode 100644 index 000000000..8bd3884d1 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexerGrain.cs @@ -0,0 +1,24 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Orleans; +using Squidex.Infrastructure.Orleans; + +namespace Squidex.Domain.Apps.Entities.Contents.Text +{ + public interface ITextIndexerGrain : IGrainWithGuidKey + { + Task DeleteAsync(Guid id); + + Task IndexAsync(Guid id, J data); + + Task> SearchAsync(string queryText, J context); + } +} \ No newline at end of file diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/IndexData.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/IndexData.cs new file mode 100644 index 000000000..7911be4a7 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/IndexData.cs @@ -0,0 +1,18 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Squidex.Domain.Apps.Core.Contents; + +namespace Squidex.Domain.Apps.Entities.Contents.Text +{ + public sealed class IndexData + { + public NamedContentData Data { get; set; } + + public bool IsDraft { get; set; } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs new file mode 100644 index 000000000..628613c53 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs @@ -0,0 +1,23 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; +using Squidex.Domain.Apps.Core.Schemas; + +namespace Squidex.Domain.Apps.Entities.Contents.Text +{ + public sealed class SearchContext + { + public bool IsDraft { get; set; } + + public long AppVersion { get; set; } + + public long SchemaVersion { get; set; } + + public List Languages { get; set; } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexer.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexer.cs deleted file mode 100644 index db309826f..000000000 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexer.cs +++ /dev/null @@ -1,47 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System.Threading.Tasks; -using Squidex.Domain.Apps.Events.Contents; -using Squidex.Infrastructure.EventSourcing; -using Squidex.Infrastructure.Tasks; - -namespace Squidex.Domain.Apps.Entities.Contents.Text -{ - public sealed class TextIndexer : IEventConsumer - { - public string Name - { - get { return GetType().Name; } - } - - public string EventsFilter - { - get { return "^content-"; } - } - - public Task ClearAsync() - { - return TaskHelper.Done; - } - - public Task On(Envelope @event) - { - switch (@event.Payload) - { - case ContentCreated contentCreated: - break; - case ContentUpdated contentUpdated: - break; - case ContentUpdateProposed contentUpdateProposed: - break; - } - - return Task.CompletedTask; - } - } -} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs index 119df813f..852deca7e 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs @@ -8,18 +8,16 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; +using System.Text; using System.Threading.Tasks; using Lucene.Net.Analysis; -using Lucene.Net.Analysis.Standard; using Lucene.Net.Documents; using Lucene.Net.Index; using Lucene.Net.QueryParsers.Classic; using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Util; -using Squidex.Domain.Apps.Core; -using Squidex.Domain.Apps.Core.Contents; -using Squidex.Domain.Apps.Core.Schemas; using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Json.Objects; @@ -27,7 +25,7 @@ using Squidex.Infrastructure.Orleans; namespace Squidex.Domain.Apps.Entities.Contents.Text { - public sealed class TextIndexerGrain : GrainOfGuid + public sealed class TextIndexerGrain : GrainOfGuid, ITextIndexerGrain { private const LuceneVersion Version = LuceneVersion.LUCENE_48; private const int MaxResults = 2000; @@ -39,9 +37,9 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text private IndexWriter indexWriter; private IndexReader indexReader; private QueryParser queryParser; - private int currentAppVersion; - private int currentSchemaVersion; - private int updates; + private long currentAppVersion; + private long currentSchemaVersion; + private long updates; public TextIndexerGrain(IAssetStore assetStore) { @@ -72,147 +70,133 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text indexReader = indexWriter.GetReader(true); } - public Task DeleteContentAsync(Guid id) + public Task DeleteAsync(Guid id) { indexWriter.DeleteDocuments(new Term("id", id.ToString())); return TryFlushAsync(); } - public Task AddContentAsync(Guid id, NamedContentData data, bool isUpdate, bool isDraft) + public Task IndexAsync(Guid id, J data) { - var idString = id.ToString(); + string idString = id.ToString(), draft = data.Value.IsDraft.ToString(); - if (isUpdate) - { - indexWriter.DeleteDocuments(new Term("id", idString)); - } + indexWriter.DeleteDocuments( + new Term("id", idString), + new Term("dd", draft)); var document = new Document(); document.AddStringField("id", idString, Field.Store.YES); - document.AddInt32Field("draft", isDraft ? 1 : 0, Field.Store.YES); + document.AddStringField("dd", draft, Field.Store.YES); - foreach (var field in data) + var languages = new Dictionary(); + + void AppendText(string language, string text) { - foreach (var fieldValue in field.Value) + if (!string.IsNullOrWhiteSpace(text)) { - var value = fieldValue.Value; + var sb = languages.GetOrAddNew(language); - if (value.Type == JsonValueType.String) + if (sb.Length > 0) { - var fieldName = BuildFieldName(fieldValue.Key, field.Key); - - document.AddTextField(fieldName, fieldValue.Value.ToString(), Field.Store.YES); + sb.Append(" "); } - else if (value.Type == JsonValueType.Object) - { - foreach (var property in (JsonObject)value) - { - if (property.Value.Type == JsonValueType.String) - { - var fieldName = BuildFieldName(fieldValue.Key, field.Key, property.Key); - document.AddTextField(fieldName, property.Value.ToString(), Field.Store.YES); - } - } - } + sb.Append(text); + } + } + + foreach (var field in data.Value.Data) + { + foreach (var fieldValue in field.Value) + { + var appendText = new Action(text => AppendText(fieldValue.Key, text)); + + AppendJsonText(fieldValue.Value, appendText); } } + foreach (var field in languages) + { + document.AddTextField(field.Key, field.Value.ToString(), Field.Store.NO); + } + indexWriter.AddDocument(document); return TryFlushAsync(); } - public Task> SearchAsync(string term, int appVersion, int schemaVersion, J schema, List languages) + private static void AppendJsonText(IJsonValue value, Action appendText) { - var query = BuildQuery(term, appVersion, schemaVersion, schema, languages); + if (value.Type == JsonValueType.String) + { + var text = value.ToString(); - var result = new List(); + appendText(text); + } + else if (value is JsonArray array) + { + foreach (var item in array) + { + AppendJsonText(item, appendText); + } + } + else if (value is JsonObject obj) + { + foreach (var item in obj.Values) + { + AppendJsonText(item, appendText); + } + } + } - if (indexReader != null) + public Task> SearchAsync(string queryText, J context) + { + var result = new HashSet(); + + if (!string.IsNullOrWhiteSpace(queryText)) { - var hits = new IndexSearcher(indexReader).Search(query, MaxResults).ScoreDocs; + var query = BuildQuery(queryText, context); - foreach (var hit in hits) + if (indexReader != null) { - var document = indexReader.Document(hit.Doc); + var filter = new QueryWrapperFilter(new TermQuery(new Term("dd", context.Value.IsDraft.ToString()))); - var idField = document.GetField("id")?.GetStringValue(); + var hits = new IndexSearcher(indexReader).Search(query, MaxResults).ScoreDocs; - if (idField != null && Guid.TryParse(idField, out var guid)) + foreach (var hit in hits) { - result.Add(guid); + var document = indexReader.Document(hit.Doc); + + var idField = document.GetField("id")?.GetStringValue(); + + if (idField != null && Guid.TryParse(idField, out var guid)) + { + result.Add(guid); + } } } } - return Task.FromResult(result); + return Task.FromResult(result.ToList()); } - private Query BuildQuery(string query, int appVersion, int schemaVersion, J schema, List language) + private Query BuildQuery(string query, SearchContext context) { - if (queryParser == null || currentAppVersion != appVersion || currentSchemaVersion != schemaVersion) + if (queryParser == null || currentAppVersion != context.AppVersion || currentSchemaVersion != context.SchemaVersion) { - var fields = BuildFields(schema, language); + var fields = context.Languages.Select(BuildFieldName).ToArray(); queryParser = new MultiFieldQueryParser(Version, fields, Analyzer); - currentAppVersion = appVersion; - currentSchemaVersion = schemaVersion; + currentAppVersion = context.AppVersion; + currentSchemaVersion = context.SchemaVersion; } return queryParser.Parse(query); } - private string[] BuildFields(Schema schema, IEnumerable languages) - { - var fieldNames = new List(); - - var iv = InvariantPartitioning.Instance.Master.Key; - - foreach (var field in schema.Fields) - { - if (field.RawProperties is StringFieldProperties) - { - if (field.Partitioning.Equals(Partitioning.Invariant)) - { - fieldNames.Add(BuildFieldName(iv, field.Name)); - } - else - { - foreach (var language in languages) - { - fieldNames.Add(BuildFieldName(language, field.Name)); - } - } - } - else if (field is IArrayField arrayField) - { - foreach (var nested in arrayField.Fields) - { - if (nested.RawProperties is StringFieldProperties) - { - if (field.Partitioning.Equals(Partitioning.Invariant)) - { - fieldNames.Add(BuildFieldName(iv, field.Name, nested.Name)); - } - else - { - foreach (var language in languages) - { - fieldNames.Add(BuildFieldName(language, field.Name, nested.Name)); - } - } - } - } - } - } - - return fieldNames.ToArray(); - } - private async Task TryFlushAsync() { updates++; @@ -255,14 +239,9 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text } } - private static string BuildFieldName(string language, string name) - { - return $"{language}_{name}"; - } - - private static string BuildFieldName(string language, string name, string nested) + private static string BuildFieldName(string language) { - return $"{language}_{name}_{nested}"; + return $"field_{language}"; } } } diff --git a/src/Squidex/Config/Domain/EntitiesServices.cs b/src/Squidex/Config/Domain/EntitiesServices.cs index c7a215257..26d62ef32 100644 --- a/src/Squidex/Config/Domain/EntitiesServices.cs +++ b/src/Squidex/Config/Domain/EntitiesServices.cs @@ -31,6 +31,7 @@ using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Domain.Apps.Entities.Contents.Edm; using Squidex.Domain.Apps.Entities.Contents.GraphQL; +using Squidex.Domain.Apps.Entities.Contents.Text; using Squidex.Domain.Apps.Entities.History; using Squidex.Domain.Apps.Entities.Rules; using Squidex.Domain.Apps.Entities.Rules.Commands; @@ -105,6 +106,9 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .As(); + services.AddSingletonAs() + .As(); + services.AddSingletonAs() .As>(); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs index ba4c93d1c..4d005609d 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs @@ -22,15 +22,23 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text new Schema("test") .AddString(1, "test", Partitioning.Invariant) .AddString(2, "localized", Partitioning.Language); - private readonly List languages = new List { "de", "en" }; private readonly Guid schemaId = Guid.NewGuid(); private readonly List ids1 = new List { Guid.NewGuid() }; private readonly List ids2 = new List { Guid.NewGuid() }; + private readonly SearchContext context; private readonly IAssetStore assetStore = new MemoryAssetStore(); private readonly TextIndexerGrain sut; public TextIndexerGrainTests() { + context = new SearchContext + { + AppVersion = 1, + Schema = schema, + SchemaVersion = 1, + Languages = new List { "de", "en" } + }; + sut = new TextIndexerGrain(assetStore); sut.ActivateAsync(schemaId).Wait(); } @@ -52,11 +60,11 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { await other.ActivateAsync(schemaId); - var helloIds = await other.SearchAsync("Hello", 0, 0, schema, languages); + var helloIds = await other.SearchAsync("Hello", context); Assert.Equal(ids1, helloIds); - var worldIds = await other.SearchAsync("World", 0, 0, schema, languages); + var worldIds = await other.SearchAsync("World", context); Assert.Equal(ids2, worldIds); } @@ -71,11 +79,11 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { await AddInvariantContent(); - var helloIds = await sut.SearchAsync("Hello", 0, 0, schema, languages); + var helloIds = await sut.SearchAsync("Hello", context); Assert.Equal(ids1, helloIds); - var worldIds = await sut.SearchAsync("World", 0, 0, schema, languages); + var worldIds = await sut.SearchAsync("World", context); Assert.Equal(ids2, worldIds); } @@ -85,14 +93,14 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { await AddInvariantContent(); - await sut.DeleteContentAsync(ids1[0]); + await sut.DeleteAsync(ids1[0]); await sut.FlushAsync(); - var helloIds = await sut.SearchAsync("Hello", 0, 0, schema, languages); + var helloIds = await sut.SearchAsync("Hello", context); Assert.Empty(helloIds); - var worldIds = await sut.SearchAsync("World", 0, 0, schema, languages); + var worldIds = await sut.SearchAsync("World", context); Assert.Equal(ids2, worldIds); } @@ -102,20 +110,20 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { await AddLocalizedContent(); - var german1 = await sut.SearchAsync("Stadt", 0, 0, schema, languages); - var german2 = await sut.SearchAsync("and", 0, 0, schema, languages); + var german1 = await sut.SearchAsync("Stadt", context); + var german2 = await sut.SearchAsync("and", context); - var germanStopwordsIds = await sut.SearchAsync("und", 0, 0, schema, languages); + var germanStopwordsIds = await sut.SearchAsync("und", context); Assert.Equal(ids1, german1); Assert.Equal(ids1, german2); Assert.Equal(ids2, germanStopwordsIds); - var english1 = await sut.SearchAsync("City", 0, 0, schema, languages); - var english2 = await sut.SearchAsync("und", 0, 0, schema, languages); + var english1 = await sut.SearchAsync("City", context); + var english2 = await sut.SearchAsync("und", context); - var englishStopwordsIds = await sut.SearchAsync("and", 0, 0, schema, languages); + var englishStopwordsIds = await sut.SearchAsync("and", context); Assert.Equal(ids2, english1); Assert.Equal(ids2, english2); @@ -137,8 +145,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text new ContentFieldData() .AddValue("en", "City and Surroundings und sonstiges")); - await sut.AddContentAsync(ids1[0], germanData, false, false); - await sut.AddContentAsync(ids2[0], englishData, false, false); + await sut.IndexAsync(ids1[0], new IndexData { Data = germanData }); + await sut.IndexAsync(ids2[0], new IndexData { Data = englishData }); await sut.FlushAsync(); } @@ -156,8 +164,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text new ContentFieldData() .AddValue("iv", "World")); - await sut.AddContentAsync(ids1[0], data1, false, false); - await sut.AddContentAsync(ids2[0], data2, false, false); + await sut.IndexAsync(ids1[0], new IndexData { Data = data1 }); + await sut.IndexAsync(ids2[0], new IndexData { Data = data2 }); await sut.FlushAsync(); } From 4f608ce775bb9a9dc4bec717a1a134a376fffd1b Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 26 Feb 2019 21:35:06 +0100 Subject: [PATCH 28/55] Fix --- .../Contents/Text/GrainTextIndexer.cs | 3 +-- .../Contents/Text/SearchContext.cs | 3 +-- .../Contents/Text/TextIndexerGrain.cs | 2 +- .../Contents/Text/TextIndexerGrainTests.cs | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs index 6cf376033..aea939d31 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs @@ -64,9 +64,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text var context = new SearchContext { AppVersion = app.Version, - Schema = schema.SchemaDef, + AppLanguages = languages, SchemaVersion = schema.Version, - Languages = languages, IsDraft = useDraft }; diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs index 628613c53..9c6a1ddad 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs @@ -6,7 +6,6 @@ // ========================================================================== using System.Collections.Generic; -using Squidex.Domain.Apps.Core.Schemas; namespace Squidex.Domain.Apps.Entities.Contents.Text { @@ -18,6 +17,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text public long SchemaVersion { get; set; } - public List Languages { get; set; } + public List AppLanguages { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs index 852deca7e..58ea91fde 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs @@ -186,7 +186,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { if (queryParser == null || currentAppVersion != context.AppVersion || currentSchemaVersion != context.SchemaVersion) { - var fields = context.Languages.Select(BuildFieldName).ToArray(); + var fields = context.AppLanguages.Select(BuildFieldName).ToArray(); queryParser = new MultiFieldQueryParser(Version, fields, Analyzer); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs index 4d005609d..dd009aa55 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs @@ -36,7 +36,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text AppVersion = 1, Schema = schema, SchemaVersion = 1, - Languages = new List { "de", "en" } + AppLanguages = new List { "de", "en" } }; sut = new TextIndexerGrain(assetStore); From 7f5ff73ef9e9ffb8175b7aca185c4fcb03f2b475 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 27 Feb 2019 09:51:39 +0100 Subject: [PATCH 29/55] First working version of full text search. --- .../Contents/MongoContentRepository.cs | 16 ++-- .../Contents/Text/GrainTextIndexer.cs | 25 ++--- .../Contents/Text/ITextIndexer.cs | 2 +- .../Contents/Text/ITextIndexerGrain.cs | 2 +- .../Contents/Text/PersistenceHelper.cs | 3 +- .../Contents/Text/SearchContext.cs | 6 +- .../Contents/Text/TextIndexerGrain.cs | 93 ++++++++++++------- .../Squidex.Domain.Apps.Entities.csproj | 1 + src/Squidex/Config/Domain/StoreServices.cs | 3 +- src/Squidex/appsettings.json | 58 ++++++------ .../Contents/Text/TextIndexerGrainTests.cs | 53 ++++++----- .../AssetUserPictureStoreTests.cs | 2 +- 12 files changed, 149 insertions(+), 115 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs index ea8fd726b..405148b16 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs @@ -55,18 +55,16 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { using (Profiler.TraceMethod("QueryAsyncByQuery")) { - if (RequiresPublished(status)) - { - var ids = await indexer.SearchAsync(query.FullText, app, schema); + var useDraft = RequiresPublished(status); - return await contents.QueryAsync(app, schema, query, ids); - } - else - { - var ids = await indexer.SearchAsync(query.FullText, app, schema, true); + var fullTextIds = await indexer.SearchAsync(query.FullText, app, schema, useDraft); - return await contents.QueryAsync(app, schema, query, ids, status, true); + if (fullTextIds?.Count == 0) + { + return ResultList.Create(0); } + + return await contents.QueryAsync(app, schema, query, fullTextIds, status, true); } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs index aea939d31..d54cba803 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs @@ -14,6 +14,7 @@ using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; +using Squidex.Infrastructure.Log; namespace Squidex.Domain.Apps.Entities.Contents.Text { @@ -41,12 +42,12 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text if (data != null) { - await index.IndexAsync(id, new IndexData { }); + await index.IndexAsync(id, new IndexData { Data = data }); } if (dataDraft != null) { - await index.IndexAsync(id, new IndexData { IsDraft = true }); + await index.IndexAsync(id, new IndexData { Data = dataDraft, IsDraft = true }); } } @@ -59,17 +60,19 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text var index = grainFactory.GetGrain(schema.Id); - var languages = app.LanguagesConfig.Select(x => x.Key).ToList(); - - var context = new SearchContext + using (Profiler.TraceMethod("SearchAsync")) { - AppVersion = app.Version, - AppLanguages = languages, - SchemaVersion = schema.Version, - IsDraft = useDraft - }; + var context = CreateContext(app, useDraft); + + return await index.SearchAsync(queryText, context); + } + } + + private static SearchContext CreateContext(IAppEntity app, bool useDraft) + { + var languages = new HashSet(app.LanguagesConfig.Select(x => x.Key)); - return await index.SearchAsync(queryText, context); + return new SearchContext { Languages = languages, IsDraft = useDraft }; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexer.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexer.cs index 27d552d20..51dcf82ed 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexer.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexer.cs @@ -20,6 +20,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text Task IndexAsync(Guid schemaId, Guid id, NamedContentData data, NamedContentData dataDraft); - Task> SearchAsync(string queryText, IAppEntity appEntity, ISchemaEntity schemaEntity, bool useDraft = false); + Task> SearchAsync(string queryText, IAppEntity app, ISchemaEntity schema, bool useDraft = false); } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexerGrain.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexerGrain.cs index 8bd3884d1..dd1d4c5c8 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexerGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexerGrain.cs @@ -19,6 +19,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text Task IndexAsync(Guid id, J data); - Task> SearchAsync(string queryText, J context); + Task> SearchAsync(string queryText, SearchContext context); } } \ No newline at end of file diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/PersistenceHelper.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/PersistenceHelper.cs index 49424c856..621e141c9 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/PersistenceHelper.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/PersistenceHelper.cs @@ -34,7 +34,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { try { - if (!file.Name.Equals(ArchiveFile, StringComparison.OrdinalIgnoreCase) && !file.Name.Equals(LockFile, StringComparison.OrdinalIgnoreCase)) + if (!file.Name.Equals(ArchiveFile, StringComparison.OrdinalIgnoreCase) && + !file.Name.Equals(LockFile, StringComparison.OrdinalIgnoreCase)) { zipArchive.CreateEntryFromFile(file.FullName, file.Name); } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs index 9c6a1ddad..01bd8f78a 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs @@ -13,10 +13,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { public bool IsDraft { get; set; } - public long AppVersion { get; set; } - - public long SchemaVersion { get; set; } - - public List AppLanguages { get; set; } + public HashSet Languages { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs index 58ea91fde..5335954ca 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs @@ -14,6 +14,7 @@ using System.Threading.Tasks; using Lucene.Net.Analysis; using Lucene.Net.Documents; using Lucene.Net.Index; +using Lucene.Net.Queries; using Lucene.Net.QueryParsers.Classic; using Lucene.Net.Search; using Lucene.Net.Store; @@ -30,15 +31,15 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text private const LuceneVersion Version = LuceneVersion.LUCENE_48; private const int MaxResults = 2000; private const int MaxUpdates = 100; - private static readonly HashSet IdFields = new HashSet(); + private static readonly TimeSpan CommitDelay = TimeSpan.FromSeconds(30); private static readonly Analyzer Analyzer = new MultiLanguageAnalyzer(Version); private readonly IAssetStore assetStore; + private IDisposable timer; private DirectoryInfo directory; private IndexWriter indexWriter; private IndexReader indexReader; private QueryParser queryParser; - private long currentAppVersion; - private long currentSchemaVersion; + private HashSet currentLanguages; private long updates; public TextIndexerGrain(IAssetStore assetStore) @@ -48,13 +49,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text this.assetStore = assetStore; } - public override Task OnActivateAsync() - { - RegisterTimer(_ => FlushAsync(), null, TimeSpan.Zero, TimeSpan.FromMinutes(10)); - - return base.OnActivateAsync(); - } - public override async Task OnDeactivateAsync() { await DeactivateAsync(true); @@ -79,16 +73,13 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text public Task IndexAsync(Guid id, J data) { - string idString = id.ToString(), draft = data.Value.IsDraft.ToString(); + var docId = id.ToString(); + var docDraft = data.Value.IsDraft.ToString(); + var docKey = $"{docId}_{docDraft}"; - indexWriter.DeleteDocuments( - new Term("id", idString), - new Term("dd", draft)); + var query = new BooleanQuery(); - var document = new Document(); - - document.AddStringField("id", idString, Field.Store.YES); - document.AddStringField("dd", draft, Field.Store.YES); + indexWriter.DeleteDocuments(new Term("key", docKey)); var languages = new Dictionary(); @@ -117,12 +108,23 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text } } - foreach (var field in languages) + if (languages.Count > 0) { - document.AddTextField(field.Key, field.Value.ToString(), Field.Store.NO); - } + var document = new Document(); - indexWriter.AddDocument(document); + document.AddStringField("id", docId, Field.Store.YES); + document.AddStringField("key", docKey, Field.Store.YES); + document.AddStringField("draft", docDraft, Field.Store.YES); + + foreach (var field in languages) + { + var fieldName = BuildFieldName(field.Key); + + document.AddTextField(fieldName, field.Value.ToString(), Field.Store.NO); + } + + indexWriter.AddDocument(document); + } return TryFlushAsync(); } @@ -131,9 +133,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { if (value.Type == JsonValueType.String) { - var text = value.ToString(); - - appendText(text); + appendText(value.ToString()); } else if (value is JsonArray array) { @@ -151,7 +151,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text } } - public Task> SearchAsync(string queryText, J context) + public Task> SearchAsync(string queryText, SearchContext context) { var result = new HashSet(); @@ -161,9 +161,9 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text if (indexReader != null) { - var filter = new QueryWrapperFilter(new TermQuery(new Term("dd", context.Value.IsDraft.ToString()))); + var filter = new TermsFilter(new Term("draft", context.IsDraft.ToString())); - var hits = new IndexSearcher(indexReader).Search(query, MaxResults).ScoreDocs; + var hits = new IndexSearcher(indexReader).Search(query, filter, MaxResults).ScoreDocs; foreach (var hit in hits) { @@ -184,17 +184,25 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text private Query BuildQuery(string query, SearchContext context) { - if (queryParser == null || currentAppVersion != context.AppVersion || currentSchemaVersion != context.SchemaVersion) + if (queryParser == null || !currentLanguages.SetEquals(context.Languages)) { - var fields = context.AppLanguages.Select(BuildFieldName).ToArray(); + var fields = + context.Languages.Select(BuildFieldName) + .Union(Enumerable.Repeat(BuildFieldName("iv"), 1)).ToArray(); queryParser = new MultiFieldQueryParser(Version, fields, Analyzer); - currentAppVersion = context.AppVersion; - currentSchemaVersion = context.SchemaVersion; + currentLanguages = context.Languages; } - return queryParser.Parse(query); + try + { + return queryParser.Parse(query); + } + catch (ParseException ex) + { + throw new ValidationException(ex.Message); + } } private async Task TryFlushAsync() @@ -205,6 +213,19 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { await FlushAsync(); } + else + { + timer?.Dispose(); + + try + { + timer = RegisterTimer(_ => FlushAsync(), null, CommitDelay, CommitDelay); + } + catch (InvalidOperationException) + { + return; + } + } } public async Task FlushAsync() @@ -221,6 +242,10 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text updates = 0; } + else + { + timer?.Dispose(); + } } public async Task DeactivateAsync(bool deleteFolder = false) @@ -241,7 +266,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text private static string BuildFieldName(string language) { - return $"field_{language}"; + return $"{language}_field"; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj b/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj index b076b00cc..7b7db6907 100644 --- a/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj +++ b/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj @@ -18,6 +18,7 @@ + all diff --git a/src/Squidex/Config/Domain/StoreServices.cs b/src/Squidex/Config/Domain/StoreServices.cs index b95d436ba..5f61cf9d4 100644 --- a/src/Squidex/Config/Domain/StoreServices.cs +++ b/src/Squidex/Config/Domain/StoreServices.cs @@ -18,6 +18,7 @@ using Squidex.Domain.Apps.Entities.Assets.Repositories; using Squidex.Domain.Apps.Entities.Assets.State; using Squidex.Domain.Apps.Entities.Contents.Repositories; using Squidex.Domain.Apps.Entities.Contents.State; +using Squidex.Domain.Apps.Entities.Contents.Text; using Squidex.Domain.Apps.Entities.History.Repositories; using Squidex.Domain.Apps.Entities.MongoDb.Assets; using Squidex.Domain.Apps.Entities.MongoDb.Contents; @@ -104,7 +105,7 @@ namespace Squidex.Config.Domain c.GetRequiredService().GetDatabase(mongoContentDatabaseName), c.GetRequiredService(), c.GetRequiredService(), - c.GetRequiredService>())) + c.GetRequiredService())) .AsOptional() .AsOptional>() .AsOptional(); diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json index 3e5ba0b28..08771041a 100644 --- a/src/Squidex/appsettings.json +++ b/src/Squidex/appsettings.json @@ -283,7 +283,11 @@ /* * The database for all your other read collections. */ - "database": "Squidex" + "database": "Squidex", + /* + * Indicate wheter the connection string is for cosmos db. + */ + "isCosmosDB": "false" } }, @@ -291,48 +295,48 @@ /* * Enable password auth. Set this to false if you want to disable local login, leaving only 3rd party login options. */ - "allowPasswordAuth": true, - /* + "allowPasswordAuth": true, + /* * Initial admin user. */ - "adminEmail": "", - "adminPassword": "", - /* + "adminEmail": "", + "adminPassword": "", + /* * Client with all admin permissions. */ - "adminClientId": "", - "adminClientSecret": "", - /* + "adminClientId": "", + "adminClientSecret": "", + /* * Settings for Google auth (keep empty to disable). */ - "googleClient": "1006817248705-t3lb3ge808m9am4t7upqth79hulk456l.apps.googleusercontent.com", - "googleSecret": "QsEi-fHqkGw2_PjJmtNHf2wg", - /* + "googleClient": "1006817248705-t3lb3ge808m9am4t7upqth79hulk456l.apps.googleusercontent.com", + "googleSecret": "QsEi-fHqkGw2_PjJmtNHf2wg", + /* * Settings for Github auth (keep empty to disable). */ - "githubClient": "211ea00e726baf754c78", - "githubSecret": "d0a0d0fe2c26469ae20987ac265b3a339fd73132", - /* + "githubClient": "211ea00e726baf754c78", + "githubSecret": "d0a0d0fe2c26469ae20987ac265b3a339fd73132", + /* * Settings for Microsoft auth (keep empty to disable). */ - "microsoftClient": "b55da740-6648-4502-8746-b9003f29d5f1", - "microsoftSecret": "idWbANxNYEF4cB368WXJhjN", - /* + "microsoftClient": "b55da740-6648-4502-8746-b9003f29d5f1", + "microsoftSecret": "idWbANxNYEF4cB368WXJhjN", + /* * Settings for your custom oidc server. */ - "oidcName": "OIDC", - "oidcAuthority": "", - "oidcClient": "", - "oidcSecret": "", - /* + "oidcName": "OIDC", + "oidcAuthority": "", + "oidcClient": "", + "oidcSecret": "", + /* * Lock new users automatically, the administrator must unlock them. */ - "lockAutomatically": false, - /* + "lockAutomatically": false, + /* * The url to you privacy statements, if you host squidex by yourself. */ - "privacyUrl": "https://squidex.io/privacy" - }, + "privacyUrl": "https://squidex.io/privacy" + }, "news": { /* diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs index dd009aa55..1cbcb18c8 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs @@ -8,9 +8,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.Contents; -using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; using Xunit; @@ -18,10 +17,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { public class TextIndexerGrainTests : IDisposable { - private readonly Schema schema = - new Schema("test") - .AddString(1, "test", Partitioning.Invariant) - .AddString(2, "localized", Partitioning.Language); private readonly Guid schemaId = Guid.NewGuid(); private readonly List ids1 = new List { Guid.NewGuid() }; private readonly List ids2 = new List { Guid.NewGuid() }; @@ -33,10 +28,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { context = new SearchContext { - AppVersion = 1, - Schema = schema, - SchemaVersion = 1, - AppLanguages = new List { "de", "en" } + Languages = new HashSet { "de", "en" } }; sut = new TextIndexerGrain(assetStore); @@ -60,13 +52,11 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { await other.ActivateAsync(schemaId); - var helloIds = await other.SearchAsync("Hello", context); + var foundHello = await other.SearchAsync("Hello", context); + var foundWorld = await other.SearchAsync("World", context); - Assert.Equal(ids1, helloIds); - - var worldIds = await other.SearchAsync("World", context); - - Assert.Equal(ids2, worldIds); + Assert.Equal(ids1, foundHello); + Assert.Equal(ids2, foundWorld); } finally { @@ -79,13 +69,23 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { await AddInvariantContent(); - var helloIds = await sut.SearchAsync("Hello", context); + var foundHello = await sut.SearchAsync("Hello", context); + var foundWorld = await sut.SearchAsync("World", context); - Assert.Equal(ids1, helloIds); + Assert.Equal(ids1, foundHello); + Assert.Equal(ids2, foundWorld); + } - var worldIds = await sut.SearchAsync("World", context); + [Fact] + public async Task Should_index_invariant_content_and_retrieve_with_fuzzy() + { + await AddInvariantContent(); - Assert.Equal(ids2, worldIds); + var foundHello = await sut.SearchAsync("helo~", context); + var foundWorld = await sut.SearchAsync("wold~", context); + + Assert.Equal(ids1, foundHello); + Assert.Equal(ids2, foundWorld); } [Fact] @@ -98,10 +98,9 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text var helloIds = await sut.SearchAsync("Hello", context); - Assert.Empty(helloIds); - var worldIds = await sut.SearchAsync("World", context); + Assert.Empty(helloIds); Assert.Equal(ids2, worldIds); } @@ -117,7 +116,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text Assert.Equal(ids1, german1); Assert.Equal(ids1, german2); - Assert.Equal(ids2, germanStopwordsIds); var english1 = await sut.SearchAsync("City", context); @@ -127,10 +125,17 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text Assert.Equal(ids2, english1); Assert.Equal(ids2, english2); - Assert.Equal(ids1, englishStopwordsIds); } + [Fact] + public async Task Should_throw_exception_for_invalid_query() + { + await AddInvariantContent(); + + await Assert.ThrowsAsync(() => sut.SearchAsync("~hello", context)); + } + private async Task AddLocalizedContent() { var germanData = diff --git a/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs b/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs index 69193a0c2..939b1b6fe 100644 --- a/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs +++ b/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs @@ -35,7 +35,7 @@ namespace Squidex.Domain.Users await sut.UploadAsync(userId, stream); - A.CallTo(() => assetStore.UploadAsync(userId, 0, "picture", stream, CancellationToken.None)).MustHaveHappened(); + A.CallTo(() => assetStore.UploadAsync(userId, 0, "picture", stream, false, CancellationToken.None)).MustHaveHappened(); } [Fact] From 0c37c4de679d5cb5ff6d3d62e9efe721dcd7421c Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 28 Feb 2019 16:55:08 +0100 Subject: [PATCH 30/55] Tests for grain text indexer. --- .../Contents/MongoContentRepository.cs | 2 +- .../MongoContentRepository_SnapshotStore.cs | 9 +- .../Contents/Text/GrainTextIndexer.cs | 52 +++++-- .../Contents/Text/ITextIndexer.cs | 3 +- .../Contents/Text/GrainTextIndexerTests.cs | 144 ++++++++++++++++++ 5 files changed, 194 insertions(+), 16 deletions(-) create mode 100644 tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/GrainTextIndexerTests.cs diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs index 405148b16..cd9ee470e 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs @@ -57,7 +57,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { var useDraft = RequiresPublished(status); - var fullTextIds = await indexer.SearchAsync(query.FullText, app, schema, useDraft); + var fullTextIds = await indexer.SearchAsync(query.FullText, app, schema.Id, useDraft); if (fullTextIds?.Count == 0) { diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs index a1a9620dd..31b46bc64 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs @@ -59,7 +59,14 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents await contents.UpsertAsync(content, oldVersion); - await indexer.IndexAsync(value.SchemaId.Id, value.Id, value.Data, value.DataDraft); + if (value.IsDeleted) + { + await indexer.DeleteAsync(value.SchemaId.Id, value.Id); + } + else + { + await indexer.IndexAsync(value.SchemaId.Id, value.Id, value.Data, value.DataDraft); + } } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs index d54cba803..4dc53ce67 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs @@ -21,46 +21,74 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text public sealed class GrainTextIndexer : ITextIndexer { private readonly IGrainFactory grainFactory; + private readonly ISemanticLog log; - public GrainTextIndexer(IGrainFactory grainFactory) + public GrainTextIndexer(IGrainFactory grainFactory, ISemanticLog log) { Guard.NotNull(grainFactory, nameof(grainFactory)); + Guard.NotNull(log, nameof(log)); this.grainFactory = grainFactory; + + this.log = log; } - public Task DeleteAsync(Guid schemaId, Guid id) + public async Task DeleteAsync(Guid schemaId, Guid id) { var index = grainFactory.GetGrain(schemaId); - return index.DeleteAsync(id); + using (Profiler.TraceMethod()) + { + try + { + await index.DeleteAsync(id); + } + catch (Exception ex) + { + log.LogError(ex, w => w + .WriteProperty("action", "DeleteTextEntry") + .WriteProperty("status", "Failed")); + } + } } public async Task IndexAsync(Guid schemaId, Guid id, NamedContentData data, NamedContentData dataDraft) { var index = grainFactory.GetGrain(schemaId); - if (data != null) + using (Profiler.TraceMethod()) { - await index.IndexAsync(id, new IndexData { Data = data }); - } + try + { + if (data != null) + { + await index.IndexAsync(id, new IndexData { Data = data }); + } - if (dataDraft != null) - { - await index.IndexAsync(id, new IndexData { Data = dataDraft, IsDraft = true }); + if (dataDraft != null) + { + await index.IndexAsync(id, new IndexData { Data = dataDraft, IsDraft = true }); + } + } + catch (Exception ex) + { + log.LogError(ex, w => w + .WriteProperty("action", "UpdateTextEntry") + .WriteProperty("status", "Failed")); + } } } - public async Task> SearchAsync(string queryText, IAppEntity app, ISchemaEntity schema, bool useDraft = false) + public async Task> SearchAsync(string queryText, IAppEntity app, Guid schemaId, bool useDraft = false) { if (string.IsNullOrWhiteSpace(queryText)) { return null; } - var index = grainFactory.GetGrain(schema.Id); + var index = grainFactory.GetGrain(schemaId); - using (Profiler.TraceMethod("SearchAsync")) + using (Profiler.TraceMethod()) { var context = CreateContext(app, useDraft); diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexer.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexer.cs index 51dcf82ed..b350b8ee9 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexer.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/ITextIndexer.cs @@ -10,7 +10,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Apps; -using Squidex.Domain.Apps.Entities.Schemas; namespace Squidex.Domain.Apps.Entities.Contents.Text { @@ -20,6 +19,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text Task IndexAsync(Guid schemaId, Guid id, NamedContentData data, NamedContentData dataDraft); - Task> SearchAsync(string queryText, IAppEntity app, ISchemaEntity schema, bool useDraft = false); + Task> SearchAsync(string queryText, IAppEntity app, Guid schemaId, bool useDraft = false); } } diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/GrainTextIndexerTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/GrainTextIndexerTests.cs new file mode 100644 index 000000000..35ebe6607 --- /dev/null +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/GrainTextIndexerTests.cs @@ -0,0 +1,144 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using FakeItEasy; +using Orleans; +using Squidex.Domain.Apps.Core.Apps; +using Squidex.Domain.Apps.Core.Contents; +using Squidex.Domain.Apps.Entities.Apps; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Log; +using Squidex.Infrastructure.Orleans; +using Xunit; + +namespace Squidex.Domain.Apps.Entities.Contents.Text +{ + public class GrainTextIndexerTests + { + private readonly IGrainFactory grainFactory = A.Fake(); + private readonly ITextIndexerGrain grain = A.Fake(); + private readonly Guid schemaId = Guid.NewGuid(); + private readonly Guid contentId = Guid.NewGuid(); + private readonly GrainTextIndexer sut; + + public GrainTextIndexerTests() + { + A.CallTo(() => grainFactory.GetGrain(schemaId, null)) + .Returns(grain); + + sut = new GrainTextIndexer(grainFactory, A.Fake()); + } + + [Fact] + public async Task Should_call_grain_when_deleting_entry() + { + await sut.DeleteAsync(schemaId, contentId); + + A.CallTo(() => grain.DeleteAsync(contentId)) + .MustHaveHappened(); + } + + [Fact] + public async Task Should_catch_exception_when_deleting_failed() + { + A.CallTo(() => grain.DeleteAsync(contentId)) + .Throws(new InvalidOperationException()); + + await sut.DeleteAsync(schemaId, contentId); + } + + [Fact] + public async Task Should_call_grain_when_indexing_data() + { + var data = new NamedContentData(); + var dataDraft = new NamedContentData(); + + await sut.IndexAsync(schemaId, contentId, data, dataDraft); + + A.CallTo(() => grain.IndexAsync(contentId, A>.That.Matches(x => x.Value.Data == data && !x.Value.IsDraft))) + .MustHaveHappened(); + + A.CallTo(() => grain.IndexAsync(contentId, A>.That.Matches(x => x.Value.Data == dataDraft && x.Value.IsDraft))) + .MustHaveHappened(); + } + + [Fact] + public async Task Should_not_call_grain_when_data_is_null() + { + var dataDraft = new NamedContentData(); + + await sut.IndexAsync(schemaId, contentId, null, dataDraft); + + A.CallTo(() => grain.IndexAsync(contentId, A>.That.Matches(x => !x.Value.IsDraft))) + .MustNotHaveHappened(); + + A.CallTo(() => grain.IndexAsync(contentId, A>.That.Matches(x => x.Value.Data == dataDraft && x.Value.IsDraft))) + .MustHaveHappened(); + } + + [Fact] + public async Task Should_not_call_grain_when_data_draft_is_null() + { + var data = new NamedContentData(); + + await sut.IndexAsync(schemaId, contentId, data, null); + + A.CallTo(() => grain.IndexAsync(contentId, A>.That.Matches(x => x.Value.Data == data && !x.Value.IsDraft))) + .MustHaveHappened(); + + A.CallTo(() => grain.IndexAsync(contentId, A>.That.Matches(x => x.Value.IsDraft))) + .MustNotHaveHappened(); + } + + [Fact] + public async Task Should_catch_exception_when_indexing_failed() + { + var data = new NamedContentData(); + + A.CallTo(() => grain.IndexAsync(contentId, A>.Ignored)) + .Throws(new InvalidOperationException()); + + await sut.IndexAsync(schemaId, contentId, data, null); + } + + [Fact] + public async Task Should_call_grain_when_searching() + { + var foundIds = new List { Guid.NewGuid() }; + + A.CallTo(() => grain.SearchAsync("Search", A.Ignored)) + .Returns(foundIds); + + var ids = await sut.SearchAsync("Search", GetApp(), schemaId, true); + + Assert.Equal(foundIds, ids); + } + + [Fact] + public async Task Should_not_call_grain_when_input_is_empty() + { + var ids = await sut.SearchAsync(string.Empty, GetApp(), schemaId, false); + + Assert.Null(ids); + + A.CallTo(() => grain.SearchAsync(A.Ignored, A.Ignored)) + .MustNotHaveHappened(); + } + + private static IAppEntity GetApp() + { + var app = A.Fake(); + + A.CallTo(() => app.LanguagesConfig).Returns(LanguagesConfig.Build(Language.EN, Language.DE)); + + return app; + } + } +} From e5199a79473585f31832154ac256e95a22586eb4 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 28 Feb 2019 17:56:50 +0100 Subject: [PATCH 31/55] Replace multiple occurrences in interpolator. --- src/Squidex/app/framework/utils/interpolator.spec.ts | 6 ++++++ src/Squidex/app/framework/utils/interpolator.ts | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Squidex/app/framework/utils/interpolator.spec.ts b/src/Squidex/app/framework/utils/interpolator.spec.ts index 58de0557c..6da899ee1 100644 --- a/src/Squidex/app/framework/utils/interpolator.spec.ts +++ b/src/Squidex/app/framework/utils/interpolator.spec.ts @@ -21,6 +21,12 @@ describe('interpolate', () => { expect(result).toEqual('hello world'); }); + it('should interpolate with multiple object values', () => { + const result = interpolate('hello ${string1}${string2}', { string1: 'world', string2: '!' }); + + expect(result).toEqual('hello world!'); + }); + it('should interpolate with array value', () => { const result = interpolate('hello ${1}', ['my', 'world']); diff --git a/src/Squidex/app/framework/utils/interpolator.ts b/src/Squidex/app/framework/utils/interpolator.ts index 6f3f88e00..5ad5de24e 100644 --- a/src/Squidex/app/framework/utils/interpolator.ts +++ b/src/Squidex/app/framework/utils/interpolator.ts @@ -8,7 +8,7 @@ import { DateTime } from './date-time'; import { Types } from './types'; -const regex = /\${[^}]+}/; +const regex = /\${[^}]+}/g; export function interpolate(pattern: string, value?: any, shortcut?: string, fallback = 'undefined'): string { const result = pattern.replace(regex, (match: string) => { From 8834cfb4db7e525d89f7cb0669b4971da11b4b3b Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 1 Mar 2019 17:07:46 +0100 Subject: [PATCH 32/55] Build fix --- .../Contents/Text/TextIndexerGrain.cs | 22 +++++++++++-------- .../EventSourcing/MongoEventStore_Writer.cs | 1 - .../Contents/Text/TextIndexerGrainTests.cs | 12 ++++++++++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs index 5335954ca..b0cc48f22 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs @@ -19,6 +19,7 @@ using Lucene.Net.QueryParsers.Classic; using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Util; +using Squidex.Domain.Apps.Core; using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Json.Objects; @@ -31,6 +32,9 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text private const LuceneVersion Version = LuceneVersion.LUCENE_48; private const int MaxResults = 2000; private const int MaxUpdates = 100; + private const string MetaId = "_id"; + private const string MetaKey = "_key"; + private const string MetaDraft = "_dd"; private static readonly TimeSpan CommitDelay = TimeSpan.FromSeconds(30); private static readonly Analyzer Analyzer = new MultiLanguageAnalyzer(Version); private readonly IAssetStore assetStore; @@ -66,7 +70,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text public Task DeleteAsync(Guid id) { - indexWriter.DeleteDocuments(new Term("id", id.ToString())); + indexWriter.DeleteDocuments(new Term(MetaId, id.ToString())); return TryFlushAsync(); } @@ -79,7 +83,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text var query = new BooleanQuery(); - indexWriter.DeleteDocuments(new Term("key", docKey)); + indexWriter.DeleteDocuments(new Term(MetaKey, docKey)); var languages = new Dictionary(); @@ -112,9 +116,9 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { var document = new Document(); - document.AddStringField("id", docId, Field.Store.YES); - document.AddStringField("key", docKey, Field.Store.YES); - document.AddStringField("draft", docDraft, Field.Store.YES); + document.AddStringField(MetaId, docId, Field.Store.YES); + document.AddStringField(MetaKey, docKey, Field.Store.YES); + document.AddStringField(MetaDraft, docDraft, Field.Store.YES); foreach (var field in languages) { @@ -161,7 +165,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text if (indexReader != null) { - var filter = new TermsFilter(new Term("draft", context.IsDraft.ToString())); + var filter = new TermsFilter(new Term(MetaDraft, context.IsDraft.ToString())); var hits = new IndexSearcher(indexReader).Search(query, filter, MaxResults).ScoreDocs; @@ -169,7 +173,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { var document = indexReader.Document(hit.Doc); - var idField = document.GetField("id")?.GetStringValue(); + var idField = document.GetField(MetaId)?.GetStringValue(); if (idField != null && Guid.TryParse(idField, out var guid)) { @@ -188,7 +192,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { var fields = context.Languages.Select(BuildFieldName) - .Union(Enumerable.Repeat(BuildFieldName("iv"), 1)).ToArray(); + .Union(Enumerable.Repeat(BuildFieldName(InvariantPartitioning.Instance.Master.Key), 1)).ToArray(); queryParser = new MultiFieldQueryParser(Version, fields, Analyzer); @@ -266,7 +270,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text private static string BuildFieldName(string language) { - return $"{language}_field"; + return language; } } } diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs index 7ada79773..29a9de831 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs @@ -18,7 +18,6 @@ namespace Squidex.Infrastructure.EventSourcing { private const int MaxCommitSize = 10; private const int MaxWriteAttempts = 20; - private const int MaxCommitSize = 10; private static readonly BsonTimestamp EmptyTimestamp = new BsonTimestamp(0); public Task DeleteStreamAsync(string streamName) diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs index 1cbcb18c8..b44c3bbbe 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs @@ -104,6 +104,18 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text Assert.Equal(ids2, worldIds); } + [Fact] + public async Task Should_search_by_field() + { + await AddLocalizedContent(); + + var emptyGerman = await sut.SearchAsync("de:City", context); + var emptyEnglish = await sut.SearchAsync("en:Stadt", context); + + Assert.Empty(emptyGerman); + Assert.Empty(emptyEnglish); + } + [Fact] public async Task Should_index_localized_content_and_retrieve() { From b9f78ec4b818950e1c59761eb29c26ac2b66e4f9 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 4 Mar 2019 13:02:00 +0100 Subject: [PATCH 33/55] Indexing improved and migrator. --- .../Contents/Text/PersistenceHelper.cs | 7 +++- .../Contents/Text/TextIndexerGrain.cs | 41 ++++++++++++++----- tools/Migrate_01/MigrationPath.cs | 5 ++- .../Migrations/DeleteContentCollections.cs | 2 + tools/Migrate_01/Rebuilder.cs | 6 ++- 5 files changed, 46 insertions(+), 15 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/PersistenceHelper.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/PersistenceHelper.cs index 621e141c9..d847ccf13 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/PersistenceHelper.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/PersistenceHelper.cs @@ -9,6 +9,7 @@ using System; using System.IO; using System.IO.Compression; using System.Threading.Tasks; +using Lucene.Net.Index; using Squidex.Infrastructure.Assets; namespace Squidex.Domain.Apps.Entities.Contents.Text @@ -18,7 +19,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text private const string ArchiveFile = "Archive.zip"; private const string LockFile = "write.lock"; - public static async Task UploadDirectoryAsync(this IAssetStore assetStore, DirectoryInfo directory) + public static async Task UploadDirectoryAsync(this IAssetStore assetStore, DirectoryInfo directory, IndexCommit commit) { using (var fileStream = new FileStream( Path.Combine(directory.FullName, ArchiveFile), @@ -30,8 +31,10 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { using (var zipArchive = new ZipArchive(fileStream, ZipArchiveMode.Create, true)) { - foreach (var file in directory.GetFiles()) + foreach (var fileName in commit.FileNames) { + var file = new FileInfo(Path.Combine(directory.FullName, fileName)); + try { if (!file.Name.Equals(ArchiveFile, StringComparison.OrdinalIgnoreCase) && diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs index b0cc48f22..5e1f0e57d 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs @@ -37,11 +37,15 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text private const string MetaDraft = "_dd"; private static readonly TimeSpan CommitDelay = TimeSpan.FromSeconds(30); private static readonly Analyzer Analyzer = new MultiLanguageAnalyzer(Version); + private static readonly TermsFilter DraftFilter = new TermsFilter(new Term(MetaDraft, "1")); + private static readonly TermsFilter NoDraftFilter = new TermsFilter(new Term(MetaDraft, "0")); + private readonly SnapshotDeletionPolicy snapshotter = new SnapshotDeletionPolicy(new KeepOnlyLastCommitDeletionPolicy()); private readonly IAssetStore assetStore; private IDisposable timer; private DirectoryInfo directory; private IndexWriter indexWriter; private IndexReader indexReader; + private IndexSearcher indexSearcher; private QueryParser queryParser; private HashSet currentLanguages; private long updates; @@ -64,8 +68,18 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text await assetStore.DownloadAsync(directory); - indexWriter = new IndexWriter(FSDirectory.Open(directory), new IndexWriterConfig(Version, Analyzer)); - indexReader = indexWriter.GetReader(true); + var config = new IndexWriterConfig(Version, Analyzer) + { + IndexDeletionPolicy = snapshotter + }; + + indexWriter = new IndexWriter(FSDirectory.Open(directory), config); + + if (indexWriter.NumDocs > 0) + { + indexReader = indexWriter.GetReader(false); + indexSearcher = new IndexSearcher(indexReader); + } } public Task DeleteAsync(Guid id) @@ -78,11 +92,9 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text public Task IndexAsync(Guid id, J data) { var docId = id.ToString(); - var docDraft = data.Value.IsDraft.ToString(); + var docDraft = data.Value.IsDraft ? "1" : "0"; var docKey = $"{docId}_{docDraft}"; - var query = new BooleanQuery(); - indexWriter.DeleteDocuments(new Term(MetaKey, docKey)); var languages = new Dictionary(); @@ -165,9 +177,9 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text if (indexReader != null) { - var filter = new TermsFilter(new Term(MetaDraft, context.IsDraft.ToString())); + var filter = context.IsDraft ? DraftFilter : NoDraftFilter; - var hits = new IndexSearcher(indexReader).Search(query, filter, MaxResults).ScoreDocs; + var hits = indexSearcher.Search(query, filter, MaxResults).ScoreDocs; foreach (var hit in hits) { @@ -236,13 +248,22 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text { if (updates > 0 && indexWriter != null) { - indexWriter.Flush(true, true); indexWriter.Commit(); + indexWriter.Flush(true, true); indexReader?.Dispose(); - indexReader = indexWriter.GetReader(true); + indexReader = indexWriter.GetReader(false); + indexSearcher = new IndexSearcher(indexReader); - await assetStore.UploadDirectoryAsync(directory); + var commit = snapshotter.Snapshot(); + try + { + await assetStore.UploadDirectoryAsync(directory, commit); + } + finally + { + snapshotter.Release(commit); + } updates = 0; } diff --git a/tools/Migrate_01/MigrationPath.cs b/tools/Migrate_01/MigrationPath.cs index 047afeab2..b67e2f653 100644 --- a/tools/Migrate_01/MigrationPath.cs +++ b/tools/Migrate_01/MigrationPath.cs @@ -16,7 +16,7 @@ namespace Migrate_01 { public sealed class MigrationPath : IMigrationPath { - private const int CurrentVersion = 14; + private const int CurrentVersion = 15; private readonly IServiceProvider serviceProvider; public MigrationPath(IServiceProvider serviceProvider) @@ -72,7 +72,8 @@ namespace Migrate_01 } // Version 11: Introduce content drafts. - if (version < 11) + // Version 15: Introduce custom full text search actors. + if (version < 15) { yield return serviceProvider.GetService(); yield return serviceProvider.GetRequiredService(); diff --git a/tools/Migrate_01/Migrations/DeleteContentCollections.cs b/tools/Migrate_01/Migrations/DeleteContentCollections.cs index 3cb3afe6e..b731e0d57 100644 --- a/tools/Migrate_01/Migrations/DeleteContentCollections.cs +++ b/tools/Migrate_01/Migrations/DeleteContentCollections.cs @@ -24,6 +24,8 @@ namespace Migrate_01.Migrations { await database.DropCollectionAsync("States_Contents"); await database.DropCollectionAsync("States_Contents_Archive"); + await database.DropCollectionAsync("State_Content_Draft"); + await database.DropCollectionAsync("State_Content_Published"); } } } diff --git a/tools/Migrate_01/Rebuilder.cs b/tools/Migrate_01/Rebuilder.cs index ee77eb829..c7a034eff 100644 --- a/tools/Migrate_01/Rebuilder.cs +++ b/tools/Migrate_01/Rebuilder.cs @@ -96,7 +96,11 @@ namespace Migrate_01 { var handledIds = new HashSet(); - var worker = new ActionBlock(action, new ExecutionDataflowBlockOptions { MaxDegreeOfParallelism = 32 }); + var worker = new ActionBlock(action, + new ExecutionDataflowBlockOptions + { + MaxDegreeOfParallelism = 32 + }); await eventStore.QueryAsync(async storedEvent => { From 9fc698f79b7bed4b9673c3d46f51d79db885b8e5 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 7 Mar 2019 07:10:12 +0100 Subject: [PATCH 34/55] Faster migration. --- .../SquidexCoreModel.cs | 2 + .../SquidexCoreOperations.cs | 2 + .../MongoAssetRepository_SnapshotStore.cs | 7 +- .../Contents/MongoContentCollection.cs | 13 +++ .../MongoContentRepository_SnapshotStore.cs | 31 +++--- .../Apps/AppGrain.cs | 5 - .../Apps/State/AppState.cs | 2 +- .../Assets/AssetGrain.cs | 5 - .../Assets/BackupAssets.cs | 4 +- .../Assets/State/AssetState.cs | 2 +- .../Backup/BackupHandlerWithStore.cs | 5 +- .../Comments/State/CommentsState.cs | 6 ++ .../Contents/BackupContents.cs | 2 +- .../Contents/ContentGrain.cs | 5 - .../Contents/State/ContentState.cs | 2 +- .../Contents/Text/GrainTextIndexer.cs | 1 - .../DomainObjectState.cs | 5 +- .../Rules/RuleGrain.cs | 5 - .../Rules/State/RuleState.cs | 2 +- .../Schemas/SchemaGrain.cs | 5 - .../Schemas/State/SchemaState.cs | 2 +- .../SquidexDomainObjectGrain.cs | 2 +- .../SquidexDomainObjectGrainLogSnapshots.cs | 2 +- .../SquidexEntities.cs | 2 + .../SquidexEvents.cs | 2 + .../MongoDb/MongoExtensions.cs | 10 ++ .../States/MongoSnapshotStore.cs | 5 +- .../Commands/DomainObjectGrain.cs | 7 +- .../Commands/DomainObjectGrainBase.cs | 2 +- .../Commands/IDomainState.cs | 6 +- .../Commands/LogSnapshotDomainObjectGrain.cs | 7 +- .../SquidexInfrastructure.cs | 2 + .../States/ISnapshotStore.cs | 3 +- src/Squidex/Config/Domain/EntitiesServices.cs | 3 + src/Squidex/Config/Domain/StoreServices.cs | 6 +- .../DefaultXmlRepositoryTests.cs | 5 +- .../Commands/DomainObjectGrainTests.cs | 37 ------- .../LogSnapshotDomainObjectGrainTests.cs | 40 +------ .../TestHelpers/MyDomainObject.cs | 49 ++++----- .../TestHelpers/MyDomainState.cs | 13 ++- .../TestHelpers/MyGrain.cs | 6 -- tools/Migrate_01/MigrationPath.cs | 11 +- .../Migrations/BuildFullTextIndices.cs | 50 +++++++++ .../{ => MongoDb}/ConvertOldSnapshotStores.cs | 2 +- .../{ => MongoDb}/ConvertRuleEventsJson.cs | 2 +- .../{ => MongoDb}/DeleteContentCollections.cs | 2 +- .../MongoDb/RestructureContentCollection.cs | 39 +++++++ tools/Migrate_01/Rebuilder.cs | 102 ++++++++---------- tools/Migrate_01/SquidexMigrations.cs | 2 + 49 files changed, 291 insertions(+), 241 deletions(-) create mode 100644 tools/Migrate_01/Migrations/BuildFullTextIndices.cs rename tools/Migrate_01/Migrations/{ => MongoDb}/ConvertOldSnapshotStores.cs (97%) rename tools/Migrate_01/Migrations/{ => MongoDb}/ConvertRuleEventsJson.cs (97%) rename tools/Migrate_01/Migrations/{ => MongoDb}/DeleteContentCollections.cs (96%) create mode 100644 tools/Migrate_01/Migrations/MongoDb/RestructureContentCollection.cs diff --git a/src/Squidex.Domain.Apps.Core.Model/SquidexCoreModel.cs b/src/Squidex.Domain.Apps.Core.Model/SquidexCoreModel.cs index 860a9421a..83b058a77 100644 --- a/src/Squidex.Domain.Apps.Core.Model/SquidexCoreModel.cs +++ b/src/Squidex.Domain.Apps.Core.Model/SquidexCoreModel.cs @@ -7,6 +7,8 @@ using System.Reflection; +#pragma warning disable RECS0014 // If all fields, properties and methods members are static, the class can be made static. + namespace Squidex.Domain.Apps.Core { public sealed class SquidexCoreModel diff --git a/src/Squidex.Domain.Apps.Core.Operations/SquidexCoreOperations.cs b/src/Squidex.Domain.Apps.Core.Operations/SquidexCoreOperations.cs index 51c11b47d..38e3c0b0c 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/SquidexCoreOperations.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/SquidexCoreOperations.cs @@ -7,6 +7,8 @@ using System.Reflection; +#pragma warning disable RECS0014 // If all fields, properties and methods members are static, the class can be made static. + namespace Squidex.Domain.Apps.Core { public static class SquidexCoreOperations diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository_SnapshotStore.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository_SnapshotStore.cs index 189f08052..3c51b334b 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository_SnapshotStore.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository_SnapshotStore.cs @@ -6,6 +6,7 @@ // ========================================================================== using System; +using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; using Squidex.Domain.Apps.Entities.Assets.State; @@ -18,7 +19,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets { public sealed partial class MongoAssetRepository : ISnapshotStore { - public async Task<(AssetState Value, long Version)> ReadAsync(Guid key) + async Task<(AssetState Value, long Version)> ISnapshotStore.ReadAsync(Guid key) { using (Profiler.TraceMethod()) { @@ -35,7 +36,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets } } - public async Task WriteAsync(Guid key, AssetState value, long oldVersion, long newVersion) + async Task ISnapshotStore.WriteAsync(Guid key, AssetState value, long oldVersion, long newVersion) { using (Profiler.TraceMethod()) { @@ -48,7 +49,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets } } - Task ISnapshotStore.ReadAllAsync(Func callback) + Task ISnapshotStore.ReadAllAsync(Func callback, CancellationToken ct) { throw new NotSupportedException(); } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs index f3c95069c..c7db4ccaf 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using MongoDB.Bson; using MongoDB.Driver; using NodaTime; using Squidex.Domain.Apps.Core.Contents; @@ -170,6 +171,18 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents return (null, EtagVersion.NotFound); } + public Task ReadAllAsync(Func callback, Func> getSchema, CancellationToken ct = default) + { + return Collection.Find(new BsonDocument()).ForEachPipelineAsync(async contentEntity => + { + var schema = await getSchema(contentEntity.IndexedAppId, contentEntity.IndexedSchemaId); + + contentEntity.ParseData(schema.SchemaDef, Serializer); + + await callback(SimpleMapper.Map(contentEntity, new ContentState()), contentEntity.Version); + }, ct); + } + public Task CleanupAsync(Guid id) { return Collection.UpdateManyAsync( diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs index 31b46bc64..c45d01aa5 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs @@ -6,6 +6,7 @@ // ========================================================================== using System; +using System.Threading; using System.Threading.Tasks; using Squidex.Domain.Apps.Entities.Contents.State; using Squidex.Domain.Apps.Entities.Schemas; @@ -18,7 +19,23 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { public partial class MongoContentRepository : ISnapshotStore { - public async Task<(ContentState Value, long Version)> ReadAsync(Guid key) + async Task ISnapshotStore.RemoveAsync(Guid key) + { + using (Profiler.TraceMethod()) + { + await contents.RemoveAsync(key); + } + } + + async Task ISnapshotStore.ReadAllAsync(Func callback, CancellationToken ct) + { + using (Profiler.TraceMethod()) + { + await contents.ReadAllAsync(callback, GetSchemaAsync, ct); + } + } + + async Task<(ContentState Value, long Version)> ISnapshotStore.ReadAsync(Guid key) { using (Profiler.TraceMethod()) { @@ -26,7 +43,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents } } - public async Task WriteAsync(Guid key, ContentState value, long oldVersion, long newVersion) + async Task ISnapshotStore.WriteAsync(Guid key, ContentState value, long oldVersion, long newVersion) { using (Profiler.TraceMethod()) { @@ -81,15 +98,5 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents return schema; } - - Task ISnapshotStore.RemoveAsync(Guid key) - { - throw new NotSupportedException(); - } - - Task ISnapshotStore.ReadAllAsync(Func callback) - { - throw new NotSupportedException(); - } } } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs b/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs index c1ee42557..d91a5ff4f 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs @@ -369,11 +369,6 @@ namespace Squidex.Domain.Apps.Entities.Apps return new AppContributorAssigned { ContributorId = actor.Identifier, Role = Role.Owner }; } - protected override AppState OnEvent(Envelope @event) - { - return Snapshot.Apply(@event); - } - public Task> GetStateAsync() { return J.AsTask(Snapshot); diff --git a/src/Squidex.Domain.Apps.Entities/Apps/State/AppState.cs b/src/Squidex.Domain.Apps.Entities/Apps/State/AppState.cs index 36d8ce960..ff4f8c293 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/State/AppState.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/State/AppState.cs @@ -142,7 +142,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.State IsArchived = true; } - public AppState Apply(Envelope @event) + public override AppState Apply(Envelope @event) { var payload = (SquidexEvent)@event.Payload; diff --git a/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs b/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs index 8173494e3..7ba5ea4ab 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs @@ -165,11 +165,6 @@ namespace Squidex.Domain.Apps.Entities.Assets } } - protected override AssetState OnEvent(Envelope @event) - { - return Snapshot.Apply(@event); - } - public Task> GetStateAsync(long version = EtagVersion.Any) { return J.AsTask(GetSnapshot(version)); diff --git a/src/Squidex.Domain.Apps.Entities/Assets/BackupAssets.cs b/src/Squidex.Domain.Apps.Entities/Assets/BackupAssets.cs index 6e6ca7dae..928fc292d 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/BackupAssets.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/BackupAssets.cs @@ -77,7 +77,7 @@ namespace Squidex.Domain.Apps.Entities.Assets { await RestoreTagsAsync(appId, reader); - await RebuildManyAsync(assetIds, id => RebuildAsync(id, (e, s) => s.Apply(e))); + await RebuildManyAsync(assetIds, id => RebuildAsync(id)); } private async Task RestoreTagsAsync(Guid appId, BackupReader reader) @@ -110,7 +110,7 @@ namespace Squidex.Domain.Apps.Entities.Assets { try { - await assetStore.UploadAsync(assetId.ToString(), fileVersion, null, stream); + await assetStore.UploadAsync(assetId.ToString(), fileVersion, null, stream, true); } catch (AssetAlreadyExistsException) { diff --git a/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs b/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs index e9ebd33ec..278c4e666 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs @@ -89,7 +89,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.State IsDeleted = true; } - public AssetState Apply(Envelope @event) + public override AssetState Apply(Envelope @event) { var payload = (SquidexEvent)@event.Payload; diff --git a/src/Squidex.Domain.Apps.Entities/Backup/BackupHandlerWithStore.cs b/src/Squidex.Domain.Apps.Entities/Backup/BackupHandlerWithStore.cs index 3c2cb4354..6e711347e 100644 --- a/src/Squidex.Domain.Apps.Entities/Backup/BackupHandlerWithStore.cs +++ b/src/Squidex.Domain.Apps.Entities/Backup/BackupHandlerWithStore.cs @@ -10,7 +10,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.States; namespace Squidex.Domain.Apps.Entities.Backup @@ -39,7 +38,7 @@ namespace Squidex.Domain.Apps.Entities.Backup } } - protected async Task RebuildAsync(Guid key, Func, TState, TState> func) where TState : IDomainState, new() + protected async Task RebuildAsync(Guid key) where TState : IDomainState, new() { var state = new TState { @@ -48,7 +47,7 @@ namespace Squidex.Domain.Apps.Entities.Backup var persistence = store.WithSnapshotsAndEventSourcing(typeof(TGrain), key, (TState s) => state = s, e => { - state = func(e, state); + state = state.Apply(e); state.Version++; }); diff --git a/src/Squidex.Domain.Apps.Entities/Comments/State/CommentsState.cs b/src/Squidex.Domain.Apps.Entities/Comments/State/CommentsState.cs index c5e8184ac..b9f9eb62e 100644 --- a/src/Squidex.Domain.Apps.Entities/Comments/State/CommentsState.cs +++ b/src/Squidex.Domain.Apps.Entities/Comments/State/CommentsState.cs @@ -5,9 +5,15 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using Squidex.Infrastructure.EventSourcing; + namespace Squidex.Domain.Apps.Entities.Comments.State { public sealed class CommentsState : DomainObjectState { + public override CommentsState Apply(Envelope @event) + { + return this; + } } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/BackupContents.cs b/src/Squidex.Domain.Apps.Entities/Contents/BackupContents.cs index 5f4bef81d..d62e9c54c 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/BackupContents.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/BackupContents.cs @@ -50,7 +50,7 @@ namespace Squidex.Domain.Apps.Entities.Contents { var contentIds = contentIdsBySchemaId.Values.SelectMany(x => x); - return RebuildManyAsync(contentIds, id => RebuildAsync(id, (e, s) => s.Apply(e))); + return RebuildManyAsync(contentIds, id => RebuildAsync(id)); } } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentGrain.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentGrain.cs index f934c0deb..5adf76236 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentGrain.cs @@ -296,11 +296,6 @@ namespace Squidex.Domain.Apps.Entities.Contents } } - protected override ContentState OnEvent(Envelope @event) - { - return Snapshot.Apply(@event); - } - private async Task CreateContext(Guid appId, Guid schemaId, Guid contentId, Func message) { var operationContext = diff --git a/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs b/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs index 56936bb0a..fd375704b 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs @@ -111,7 +111,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.State IsDeleted = true; } - public ContentState Apply(Envelope @event) + public override ContentState Apply(Envelope @event) { var payload = (SquidexEvent)@event.Payload; diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs index 4dc53ce67..e5bcfa60c 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs @@ -12,7 +12,6 @@ using System.Threading.Tasks; using Orleans; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Apps; -using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Infrastructure.Log; diff --git a/src/Squidex.Domain.Apps.Entities/DomainObjectState.cs b/src/Squidex.Domain.Apps.Entities/DomainObjectState.cs index 58b6341b5..7bafa9c44 100644 --- a/src/Squidex.Domain.Apps.Entities/DomainObjectState.cs +++ b/src/Squidex.Domain.Apps.Entities/DomainObjectState.cs @@ -10,11 +10,12 @@ using System.Runtime.Serialization; using NodaTime; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; +using Squidex.Infrastructure.EventSourcing; namespace Squidex.Domain.Apps.Entities { public abstract class DomainObjectState : Cloneable, - IDomainState, + IDomainState, IEntity, IEntityWithCreatedBy, IEntityWithLastModifiedBy, @@ -42,6 +43,8 @@ namespace Squidex.Domain.Apps.Entities [DataMember] public long Version { get; set; } = EtagVersion.Empty; + public abstract T Apply(Envelope @event); + public T Clone() { return Clone(x => { }); diff --git a/src/Squidex.Domain.Apps.Entities/Rules/RuleGrain.cs b/src/Squidex.Domain.Apps.Entities/Rules/RuleGrain.cs index 248b09542..f6073a4f6 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/RuleGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/RuleGrain.cs @@ -123,11 +123,6 @@ namespace Squidex.Domain.Apps.Entities.Rules } } - protected override RuleState OnEvent(Envelope @event) - { - return Snapshot.Apply(@event); - } - public Task> GetStateAsync() { return J.AsTask(Snapshot); diff --git a/src/Squidex.Domain.Apps.Entities/Rules/State/RuleState.cs b/src/Squidex.Domain.Apps.Entities/Rules/State/RuleState.cs index a12f9a744..48e354328 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/State/RuleState.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/State/RuleState.cs @@ -64,7 +64,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.State IsDeleted = true; } - public RuleState Apply(Envelope @event) + public override RuleState Apply(Envelope @event) { var payload = (SquidexEvent)@event.Payload; diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs index 167971a34..5905b66fd 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs @@ -381,11 +381,6 @@ namespace Squidex.Domain.Apps.Entities.Schemas } } - protected override SchemaState OnEvent(Envelope @event) - { - return Snapshot.Apply(@event); - } - public Task> GetStateAsync() { return J.AsTask(Snapshot); diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs b/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs index 800a41687..922da11a3 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs @@ -137,7 +137,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.State IsDeleted = true; } - public SchemaState Apply(Envelope @event) + public override SchemaState Apply(Envelope @event) { var payload = (SquidexEvent)@event.Payload; diff --git a/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrain.cs b/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrain.cs index bf9c58327..6d452a60f 100644 --- a/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrain.cs @@ -14,7 +14,7 @@ using Squidex.Infrastructure.States; namespace Squidex.Domain.Apps.Entities { - public abstract class SquidexDomainObjectGrain : DomainObjectGrain where T : IDomainState, new() + public abstract class SquidexDomainObjectGrain : DomainObjectGrain where T : IDomainState, new() { protected SquidexDomainObjectGrain(IStore store, ISemanticLog log) : base(store, log) diff --git a/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrainLogSnapshots.cs b/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrainLogSnapshots.cs index 425bdc4d6..56df2b4a0 100644 --- a/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrainLogSnapshots.cs +++ b/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrainLogSnapshots.cs @@ -14,7 +14,7 @@ using Squidex.Infrastructure.States; namespace Squidex.Domain.Apps.Entities { - public abstract class SquidexDomainObjectGrainLogSnapshots : LogSnapshotDomainObjectGrain where T : IDomainState, new() + public abstract class SquidexDomainObjectGrainLogSnapshots : LogSnapshotDomainObjectGrain where T : IDomainState, new() { protected SquidexDomainObjectGrainLogSnapshots(IStore store, ISemanticLog log) : base(store, log) diff --git a/src/Squidex.Domain.Apps.Entities/SquidexEntities.cs b/src/Squidex.Domain.Apps.Entities/SquidexEntities.cs index 8d82fce42..4bf944913 100644 --- a/src/Squidex.Domain.Apps.Entities/SquidexEntities.cs +++ b/src/Squidex.Domain.Apps.Entities/SquidexEntities.cs @@ -7,6 +7,8 @@ using System.Reflection; +#pragma warning disable RECS0014 // If all fields, properties and methods members are static, the class can be made static. + namespace Squidex.Domain.Apps.Entities { public static class SquidexEntities diff --git a/src/Squidex.Domain.Apps.Events/SquidexEvents.cs b/src/Squidex.Domain.Apps.Events/SquidexEvents.cs index 7f85deb57..e90815bfd 100644 --- a/src/Squidex.Domain.Apps.Events/SquidexEvents.cs +++ b/src/Squidex.Domain.Apps.Events/SquidexEvents.cs @@ -7,6 +7,8 @@ using System.Reflection; +#pragma warning disable RECS0014 // If all fields, properties and methods members are static, the class can be made static. + namespace Squidex.Domain.Apps.Events { public sealed class SquidexEvents diff --git a/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoExtensions.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoExtensions.cs index 631727d92..ec0a29528 100644 --- a/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoExtensions.cs +++ b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoExtensions.cs @@ -22,6 +22,16 @@ namespace Squidex.Infrastructure.MongoDb { private static readonly UpdateOptions Upsert = new UpdateOptions { IsUpsert = true }; + public static async Task CollectionExistsAsync(this IMongoDatabase database, string collectionName) + { + var options = new ListCollectionNamesOptions + { + Filter = new BsonDocument("name", collectionName) + }; + + return (await database.ListCollectionNamesAsync(options)).Any(); + } + public static async Task InsertOneIfNotExistsAsync(this IMongoCollection collection, T document) { try diff --git a/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs b/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs index 2b6cd2643..61afdd1cf 100644 --- a/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs +++ b/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs @@ -7,6 +7,7 @@ using System; using System.Linq; +using System.Threading; using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; @@ -60,11 +61,11 @@ namespace Squidex.Infrastructure.States } } - public async Task ReadAllAsync(Func callback) + public async Task ReadAllAsync(Func callback, CancellationToken ct = default) { using (Profiler.TraceMethod>()) { - await Collection.Find(new BsonDocument()).ForEachAsync(x => callback(x.Doc, x.Version)); + await Collection.Find(new BsonDocument()).ForEachPipelineAsync(x => callback(x.Doc, x.Version), ct); } } diff --git a/src/Squidex.Infrastructure/Commands/DomainObjectGrain.cs b/src/Squidex.Infrastructure/Commands/DomainObjectGrain.cs index 16da5a476..21d4a7436 100644 --- a/src/Squidex.Infrastructure/Commands/DomainObjectGrain.cs +++ b/src/Squidex.Infrastructure/Commands/DomainObjectGrain.cs @@ -13,7 +13,7 @@ using Squidex.Infrastructure.States; namespace Squidex.Infrastructure.Commands { - public abstract class DomainObjectGrain : DomainObjectGrainBase where T : IDomainState, new() + public abstract class DomainObjectGrain : DomainObjectGrainBase where T : IDomainState, new() { private readonly IStore store; private T snapshot = new T { Version = EtagVersion.Empty }; @@ -66,6 +66,9 @@ namespace Squidex.Infrastructure.Commands } } - protected abstract T OnEvent(Envelope @event); + protected T OnEvent(Envelope @event) + { + return Snapshot.Apply(@event); + } } } \ No newline at end of file diff --git a/src/Squidex.Infrastructure/Commands/DomainObjectGrainBase.cs b/src/Squidex.Infrastructure/Commands/DomainObjectGrainBase.cs index 61501f7ac..5c3b0d717 100644 --- a/src/Squidex.Infrastructure/Commands/DomainObjectGrainBase.cs +++ b/src/Squidex.Infrastructure/Commands/DomainObjectGrainBase.cs @@ -15,7 +15,7 @@ using Squidex.Infrastructure.Tasks; namespace Squidex.Infrastructure.Commands { - public abstract class DomainObjectGrainBase : GrainOfGuid, IDomainObjectGrain where T : IDomainState, new() + public abstract class DomainObjectGrainBase : GrainOfGuid, IDomainObjectGrain where T : IDomainState, new() { private readonly List> uncomittedEvents = new List>(); private readonly ISemanticLog log; diff --git a/src/Squidex.Infrastructure/Commands/IDomainState.cs b/src/Squidex.Infrastructure/Commands/IDomainState.cs index ee6891fe4..f20f14ce8 100644 --- a/src/Squidex.Infrastructure/Commands/IDomainState.cs +++ b/src/Squidex.Infrastructure/Commands/IDomainState.cs @@ -5,10 +5,14 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using Squidex.Infrastructure.EventSourcing; + namespace Squidex.Infrastructure.Commands { - public interface IDomainState + public interface IDomainState { long Version { get; set; } + + T Apply(Envelope @event); } } diff --git a/src/Squidex.Infrastructure/Commands/LogSnapshotDomainObjectGrain.cs b/src/Squidex.Infrastructure/Commands/LogSnapshotDomainObjectGrain.cs index 10ab25586..8e820282f 100644 --- a/src/Squidex.Infrastructure/Commands/LogSnapshotDomainObjectGrain.cs +++ b/src/Squidex.Infrastructure/Commands/LogSnapshotDomainObjectGrain.cs @@ -15,7 +15,7 @@ using Squidex.Infrastructure.States; namespace Squidex.Infrastructure.Commands { - public abstract class LogSnapshotDomainObjectGrain : DomainObjectGrainBase where T : IDomainState, new() + public abstract class LogSnapshotDomainObjectGrain : DomainObjectGrainBase where T : IDomainState, new() { private readonly IStore store; private readonly List snapshots = new List { new T { Version = EtagVersion.Empty } }; @@ -88,6 +88,9 @@ namespace Squidex.Infrastructure.Commands } } - protected abstract T OnEvent(Envelope @event); + protected T OnEvent(Envelope @event) + { + return Snapshot.Apply(@event); + } } } \ No newline at end of file diff --git a/src/Squidex.Infrastructure/SquidexInfrastructure.cs b/src/Squidex.Infrastructure/SquidexInfrastructure.cs index 20444d138..a76b688dc 100644 --- a/src/Squidex.Infrastructure/SquidexInfrastructure.cs +++ b/src/Squidex.Infrastructure/SquidexInfrastructure.cs @@ -7,6 +7,8 @@ using System.Reflection; +#pragma warning disable RECS0014 // If all fields, properties and methods members are static, the class can be made static. + namespace Squidex.Infrastructure { public sealed class SquidexInfrastructure diff --git a/src/Squidex.Infrastructure/States/ISnapshotStore.cs b/src/Squidex.Infrastructure/States/ISnapshotStore.cs index 38646e64f..68243db74 100644 --- a/src/Squidex.Infrastructure/States/ISnapshotStore.cs +++ b/src/Squidex.Infrastructure/States/ISnapshotStore.cs @@ -6,6 +6,7 @@ // ========================================================================== using System; +using System.Threading; using System.Threading.Tasks; namespace Squidex.Infrastructure.States @@ -20,6 +21,6 @@ namespace Squidex.Infrastructure.States Task RemoveAsync(TKey key); - Task ReadAllAsync(Func callback); + Task ReadAllAsync(Func callback, CancellationToken ct = default); } } diff --git a/src/Squidex/Config/Domain/EntitiesServices.cs b/src/Squidex/Config/Domain/EntitiesServices.cs index 26d62ef32..d29a8c256 100644 --- a/src/Squidex/Config/Domain/EntitiesServices.cs +++ b/src/Squidex/Config/Domain/EntitiesServices.cs @@ -249,6 +249,9 @@ namespace Squidex.Config.Domain services.AddTransientAs() .As(); + services.AddTransientAs() + .As(); + services.AddTransientAs() .As(); diff --git a/src/Squidex/Config/Domain/StoreServices.cs b/src/Squidex/Config/Domain/StoreServices.cs index 5f61cf9d4..218f124a0 100644 --- a/src/Squidex/Config/Domain/StoreServices.cs +++ b/src/Squidex/Config/Domain/StoreServices.cs @@ -10,8 +10,7 @@ using IdentityServer4.Stores; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; -using Migrate_01.Migrations; +using Migrate_01.Migrations.MongoDb; using MongoDB.Driver; using Squidex.Domain.Apps.Entities; using Squidex.Domain.Apps.Entities.Assets.Repositories; @@ -66,6 +65,9 @@ namespace Squidex.Config.Domain services.AddTransientAs(c => new DeleteContentCollections(c.GetRequiredService().GetDatabase(mongoContentDatabaseName))) .As(); + services.AddTransientAs(c => new RestructureContentCollection(c.GetRequiredService().GetDatabase(mongoContentDatabaseName))) + .As(); + services.AddSingletonAs() .As(); diff --git a/tests/Squidex.Domain.Users.Tests/DefaultXmlRepositoryTests.cs b/tests/Squidex.Domain.Users.Tests/DefaultXmlRepositoryTests.cs index 9ab5ba0ee..eb3720cc7 100644 --- a/tests/Squidex.Domain.Users.Tests/DefaultXmlRepositoryTests.cs +++ b/tests/Squidex.Domain.Users.Tests/DefaultXmlRepositoryTests.cs @@ -7,6 +7,7 @@ using System; using System.Linq; +using System.Threading; using System.Threading.Tasks; using System.Xml.Linq; using FakeItEasy; @@ -38,8 +39,8 @@ namespace Squidex.Domain.Users [Fact] public void Should_return_items_from_store() { - A.CallTo(() => store.ReadAllAsync(A>.Ignored)) - .Invokes((Func callback) => + A.CallTo(() => store.ReadAllAsync(A>.Ignored, A.Ignored)) + .Invokes((Func callback, CancellationToken ct) => { callback(new DefaultXmlRepository.State { Xml = "" }, EtagVersion.Any); callback(new DefaultXmlRepository.State { Xml = "" }, EtagVersion.Any); diff --git a/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectGrainTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectGrainTests.cs index 4810221d3..dcca158c0 100644 --- a/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectGrainTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectGrainTests.cs @@ -26,38 +26,6 @@ namespace Squidex.Infrastructure.Commands private readonly Guid id = Guid.NewGuid(); private readonly MyDomainObject sut; - public sealed class MyDomainState : IDomainState - { - public long Version { get; set; } - - public int Value { get; set; } - } - - public sealed class ValueChanged : IEvent - { - public int Value { get; set; } - } - - public sealed class CreateAuto : MyCommand - { - public int Value { get; set; } - } - - public sealed class CreateCustom : MyCommand - { - public int Value { get; set; } - } - - public sealed class UpdateAuto : MyCommand - { - public int Value { get; set; } - } - - public sealed class UpdateCustom : MyCommand - { - public int Value { get; set; } - } - public sealed class MyDomainObject : DomainObjectGrain { public MyDomainObject(IStore store) @@ -100,11 +68,6 @@ namespace Squidex.Infrastructure.Commands return Task.FromResult(null); } - - protected override MyDomainState OnEvent(Envelope @event) - { - return new MyDomainState { Value = ((ValueChanged)@event.Payload).Value }; - } } public DomainObjectGrainTests() diff --git a/tests/Squidex.Infrastructure.Tests/Commands/LogSnapshotDomainObjectGrainTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/LogSnapshotDomainObjectGrainTests.cs index 68ed4cf06..2940c5bf3 100644 --- a/tests/Squidex.Infrastructure.Tests/Commands/LogSnapshotDomainObjectGrainTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Commands/LogSnapshotDomainObjectGrainTests.cs @@ -26,36 +26,11 @@ namespace Squidex.Infrastructure.Commands private readonly ISnapshotStore snapshotStore = A.Fake>(); private readonly IPersistence persistence = A.Fake(); private readonly Guid id = Guid.NewGuid(); - private readonly MyDomainObject sut; + private readonly MyLogDomainObject sut; - public sealed class ValueChanged : IEvent + public sealed class MyLogDomainObject : LogSnapshotDomainObjectGrain { - public int Value { get; set; } - } - - public sealed class CreateAuto : MyCommand - { - public int Value { get; set; } - } - - public sealed class CreateCustom : MyCommand - { - public int Value { get; set; } - } - - public sealed class UpdateAuto : MyCommand - { - public int Value { get; set; } - } - - public sealed class UpdateCustom : MyCommand - { - public int Value { get; set; } - } - - public sealed class MyDomainObject : LogSnapshotDomainObjectGrain - { - public MyDomainObject(IStore store) + public MyLogDomainObject(IStore store) : base(store, A.Dummy()) { } @@ -95,22 +70,17 @@ namespace Squidex.Infrastructure.Commands return Task.FromResult(null); } - - protected override MyDomainState OnEvent(Envelope @event) - { - return new MyDomainState { Value = ((ValueChanged)@event.Payload).Value }; - } } public LogSnapshotDomainObjectGrainTests() { - A.CallTo(() => store.WithEventSourcing(typeof(MyDomainObject), id, A.Ignored)) + A.CallTo(() => store.WithEventSourcing(typeof(MyLogDomainObject), id, A.Ignored)) .Returns(persistence); A.CallTo(() => store.GetSnapshotStore()) .Returns(snapshotStore); - sut = new MyDomainObject(store); + sut = new MyLogDomainObject(store); } [Fact] diff --git a/tests/Squidex.Infrastructure.Tests/TestHelpers/MyDomainObject.cs b/tests/Squidex.Infrastructure.Tests/TestHelpers/MyDomainObject.cs index e1ba8453f..2202d2b1b 100644 --- a/tests/Squidex.Infrastructure.Tests/TestHelpers/MyDomainObject.cs +++ b/tests/Squidex.Infrastructure.Tests/TestHelpers/MyDomainObject.cs @@ -9,7 +9,6 @@ using System; using System.Threading.Tasks; using FakeItEasy; using Squidex.Infrastructure.Commands; -using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.States; @@ -17,31 +16,6 @@ namespace Squidex.Infrastructure.TestHelpers { public sealed class MyDomainObject : DomainObjectGrain { - public sealed class ValueChanged : IEvent - { - public int Value { get; set; } - } - - public sealed class CreateAuto : MyCommand - { - public int Value { get; set; } - } - - public sealed class CreateCustom : MyCommand - { - public int Value { get; set; } - } - - public sealed class UpdateAuto : MyCommand - { - public int Value { get; set; } - } - - public sealed class UpdateCustom : MyCommand - { - public int Value { get; set; } - } - public MyDomainObject(IStore store) : base(store, A.Dummy()) { @@ -82,10 +56,25 @@ namespace Squidex.Infrastructure.TestHelpers return Task.FromResult(null); } + } - protected override MyDomainState OnEvent(Envelope @event) - { - return new MyDomainState { Value = ((ValueChanged)@event.Payload).Value }; - } + public sealed class CreateAuto : MyCommand + { + public int Value { get; set; } + } + + public sealed class CreateCustom : MyCommand + { + public int Value { get; set; } + } + + public sealed class UpdateAuto : MyCommand + { + public int Value { get; set; } + } + + public sealed class UpdateCustom : MyCommand + { + public int Value { get; set; } } } diff --git a/tests/Squidex.Infrastructure.Tests/TestHelpers/MyDomainState.cs b/tests/Squidex.Infrastructure.Tests/TestHelpers/MyDomainState.cs index 2ca95b098..7af864c86 100644 --- a/tests/Squidex.Infrastructure.Tests/TestHelpers/MyDomainState.cs +++ b/tests/Squidex.Infrastructure.Tests/TestHelpers/MyDomainState.cs @@ -6,13 +6,24 @@ // ========================================================================== using Squidex.Infrastructure.Commands; +using Squidex.Infrastructure.EventSourcing; namespace Squidex.Infrastructure.TestHelpers { - public sealed class MyDomainState : IDomainState + public sealed class MyDomainState : IDomainState { public long Version { get; set; } public int Value { get; set; } + + public MyDomainState Apply(Envelope @event) + { + return new MyDomainState { Value = ((ValueChanged)@event.Payload).Value }; + } + } + + public sealed class ValueChanged : IEvent + { + public int Value { get; set; } } } diff --git a/tests/Squidex.Infrastructure.Tests/TestHelpers/MyGrain.cs b/tests/Squidex.Infrastructure.Tests/TestHelpers/MyGrain.cs index 3bec4b7c6..6f9c0717c 100644 --- a/tests/Squidex.Infrastructure.Tests/TestHelpers/MyGrain.cs +++ b/tests/Squidex.Infrastructure.Tests/TestHelpers/MyGrain.cs @@ -9,7 +9,6 @@ using System; using System.Threading.Tasks; using FakeItEasy; using Squidex.Infrastructure.Commands; -using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.States; @@ -26,10 +25,5 @@ namespace Squidex.Infrastructure.TestHelpers { return Task.FromResult(null); } - - protected override MyDomainState OnEvent(Envelope @event) - { - return Snapshot; - } } } diff --git a/tools/Migrate_01/MigrationPath.cs b/tools/Migrate_01/MigrationPath.cs index b67e2f653..4879a20d4 100644 --- a/tools/Migrate_01/MigrationPath.cs +++ b/tools/Migrate_01/MigrationPath.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.DependencyInjection; using Migrate_01.Migrations; +using Migrate_01.Migrations.MongoDb; using Squidex.Infrastructure.Migrations; namespace Migrate_01 @@ -72,8 +73,7 @@ namespace Migrate_01 } // Version 11: Introduce content drafts. - // Version 15: Introduce custom full text search actors. - if (version < 15) + if (version < 11) { yield return serviceProvider.GetService(); yield return serviceProvider.GetRequiredService(); @@ -97,6 +97,13 @@ namespace Migrate_01 yield return serviceProvider.GetRequiredService(); } + // Version 15: Introduce custom full text search actors. + if (version < 15) + { + yield return serviceProvider.GetService(); + yield return serviceProvider.GetService(); + } + yield return serviceProvider.GetRequiredService(); } } diff --git a/tools/Migrate_01/Migrations/BuildFullTextIndices.cs b/tools/Migrate_01/Migrations/BuildFullTextIndices.cs new file mode 100644 index 000000000..b4f2dbb7a --- /dev/null +++ b/tools/Migrate_01/Migrations/BuildFullTextIndices.cs @@ -0,0 +1,50 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Threading.Tasks; +using System.Threading.Tasks.Dataflow; +using Squidex.Domain.Apps.Entities.Contents.State; +using Squidex.Domain.Apps.Entities.Contents.Text; +using Squidex.Infrastructure.Migrations; +using Squidex.Infrastructure.States; + +namespace Migrate_01.Migrations +{ + public sealed class BuildFullTextIndices : IMigration + { + private readonly ITextIndexer textIndexer; + private readonly IStore store; + + public BuildFullTextIndices(ITextIndexer textIndexer, IStore store) + { + this.textIndexer = textIndexer; + + this.store = store; + } + + public async Task UpdateAsync() + { + var snapshotStore = store.GetSnapshotStore(); + + var worker = new ActionBlock(state => + { + return textIndexer.IndexAsync(state.SchemaId.Id, state.Id, state.Data, state.DataDraft); + }, + new ExecutionDataflowBlockOptions + { + MaxDegreeOfParallelism = Environment.ProcessorCount * 2 + }); + + await snapshotStore.ReadAllAsync((state, version) => worker.SendAsync(state)); + + worker.Complete(); + + await worker.Completion; + } + } +} diff --git a/tools/Migrate_01/Migrations/ConvertOldSnapshotStores.cs b/tools/Migrate_01/Migrations/MongoDb/ConvertOldSnapshotStores.cs similarity index 97% rename from tools/Migrate_01/Migrations/ConvertOldSnapshotStores.cs rename to tools/Migrate_01/Migrations/MongoDb/ConvertOldSnapshotStores.cs index 58c3f8643..2fd0cdf3f 100644 --- a/tools/Migrate_01/Migrations/ConvertOldSnapshotStores.cs +++ b/tools/Migrate_01/Migrations/MongoDb/ConvertOldSnapshotStores.cs @@ -14,7 +14,7 @@ using Squidex.Infrastructure.Migrations; using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.Tasks; -namespace Migrate_01.Migrations +namespace Migrate_01.Migrations.MongoDb { public sealed class ConvertOldSnapshotStores : IMigration { diff --git a/tools/Migrate_01/Migrations/ConvertRuleEventsJson.cs b/tools/Migrate_01/Migrations/MongoDb/ConvertRuleEventsJson.cs similarity index 97% rename from tools/Migrate_01/Migrations/ConvertRuleEventsJson.cs rename to tools/Migrate_01/Migrations/MongoDb/ConvertRuleEventsJson.cs index 4a287e975..220e01942 100644 --- a/tools/Migrate_01/Migrations/ConvertRuleEventsJson.cs +++ b/tools/Migrate_01/Migrations/MongoDb/ConvertRuleEventsJson.cs @@ -10,7 +10,7 @@ using MongoDB.Bson; using MongoDB.Driver; using Squidex.Infrastructure.Migrations; -namespace Migrate_01.Migrations +namespace Migrate_01.Migrations.MongoDb { public sealed class ConvertRuleEventsJson : IMigration { diff --git a/tools/Migrate_01/Migrations/DeleteContentCollections.cs b/tools/Migrate_01/Migrations/MongoDb/DeleteContentCollections.cs similarity index 96% rename from tools/Migrate_01/Migrations/DeleteContentCollections.cs rename to tools/Migrate_01/Migrations/MongoDb/DeleteContentCollections.cs index b731e0d57..cafa08eac 100644 --- a/tools/Migrate_01/Migrations/DeleteContentCollections.cs +++ b/tools/Migrate_01/Migrations/MongoDb/DeleteContentCollections.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using MongoDB.Driver; using Squidex.Infrastructure.Migrations; -namespace Migrate_01.Migrations +namespace Migrate_01.Migrations.MongoDb { public sealed class DeleteContentCollections : IMigration { diff --git a/tools/Migrate_01/Migrations/MongoDb/RestructureContentCollection.cs b/tools/Migrate_01/Migrations/MongoDb/RestructureContentCollection.cs new file mode 100644 index 000000000..38987dc2b --- /dev/null +++ b/tools/Migrate_01/Migrations/MongoDb/RestructureContentCollection.cs @@ -0,0 +1,39 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Threading.Tasks; +using MongoDB.Bson; +using MongoDB.Driver; +using Squidex.Infrastructure.Migrations; +using Squidex.Infrastructure.MongoDb; + +namespace Migrate_01.Migrations.MongoDb +{ + public sealed class RestructureContentCollection : IMigration + { + private readonly IMongoDatabase contentDatabase; + + public RestructureContentCollection(IMongoDatabase contentDatabase) + { + this.contentDatabase = contentDatabase; + } + + public async Task UpdateAsync() + { + if (await contentDatabase.CollectionExistsAsync("State_Content_Draft")) + { + await contentDatabase.DropCollectionAsync("State_Contents"); + await contentDatabase.DropCollectionAsync("State_Content_Published"); + await contentDatabase.RenameCollectionAsync("State_Content_Draft", "State_Contents"); + + var collection = contentDatabase.GetCollection("State_Content"); + + await collection.UpdateManyAsync(new BsonDocument(), Builders.Update.Unset("dt")); + } + } + } +} diff --git a/tools/Migrate_01/Rebuilder.cs b/tools/Migrate_01/Rebuilder.cs index c7a034eff..7a3a81811 100644 --- a/tools/Migrate_01/Rebuilder.cs +++ b/tools/Migrate_01/Rebuilder.cs @@ -7,7 +7,6 @@ using System; using System.Collections.Generic; -using System.Threading; using System.Threading.Tasks; using System.Threading.Tasks.Dataflow; using Squidex.Domain.Apps.Entities.Apps; @@ -44,97 +43,82 @@ namespace Migrate_01 this.store = store; } - public async Task RebuildAppsAsync() + public Task RebuildAppsAsync() { - await store.GetSnapshotStore().ClearAsync(); - - await RebuildManyAsync("^app\\-", id => RebuildAsync(id, (e, s) => s.Apply(e))); + return RebuildManyAsync("^app\\-"); } - public async Task RebuildSchemasAsync() + public Task RebuildSchemasAsync() { - await store.GetSnapshotStore().ClearAsync(); - - await RebuildManyAsync("^schema\\-", id => RebuildAsync(id, (e, s) => s.Apply(e))); + return RebuildManyAsync("^schema\\-"); } - public async Task RebuildRulesAsync() + public Task RebuildRulesAsync() { - await store.GetSnapshotStore().ClearAsync(); - - await RebuildManyAsync("^rule\\-", id => RebuildAsync(id, (e, s) => s.Apply(e))); + return RebuildManyAsync("^rule\\-"); } - public async Task RebuildAssetsAsync() + public Task RebuildAssetsAsync() { - await store.GetSnapshotStore().ClearAsync(); + return RebuildManyAsync("^asset\\-"); + } - await RebuildManyAsync("^asset\\-", id => RebuildAsync(id, (e, s) => s.Apply(e))); + public Task RebuildContentAsync() + { + return RebuildManyAsync("^content\\-"); } - public async Task RebuildContentAsync() + private async Task RebuildManyAsync(string filter) where TState : IDomainState, new() { - using (localCache.StartContext()) - { - await store.GetSnapshotStore().ClearAsync(); + var handledIds = new HashSet(); - await RebuildManyAsync("^content\\-", async id => + var worker = new ActionBlock(async id => { try { - await RebuildAsync(id, (e, s) => s.Apply(e)); + var state = new TState + { + Version = EtagVersion.Empty + }; + + var persistence = store.WithSnapshotsAndEventSourcing(typeof(TGrain), id, (TState s) => state = s, e => + { + state = state.Apply(e); + + state.Version++; + }); + + await persistence.ReadAsync(); + await persistence.WriteSnapshotAsync(state); } catch (DomainObjectNotFoundException) { return; } - }); - } - } - - private async Task RebuildManyAsync(string filter, Func action) - { - var handledIds = new HashSet(); - - var worker = new ActionBlock(action, + }, new ExecutionDataflowBlockOptions { - MaxDegreeOfParallelism = 32 + MaxDegreeOfParallelism = Environment.ProcessorCount * 2 }); - await eventStore.QueryAsync(async storedEvent => + using (localCache.StartContext()) { - var headers = storedEvent.Data.Headers; + await store.GetSnapshotStore().ClearAsync(); - var id = headers.AggregateId(); - - if (handledIds.Add(id)) + await eventStore.QueryAsync(async storedEvent => { - await worker.SendAsync(id); - } - }, filter, ct: CancellationToken.None); - - worker.Complete(); - - await worker.Completion; - } + var id = storedEvent.Data.Headers.AggregateId(); - private async Task RebuildAsync(Guid key, Func, TState, TState> func) where TState : IDomainState, new() - { - var state = new TState - { - Version = EtagVersion.Empty - }; - - var persistence = store.WithSnapshotsAndEventSourcing(typeof(TGrain), key, (TState s) => state = s, e => - { - state = func(e, state); + if (handledIds.Add(id)) + { + await worker.SendAsync(id); + } + }, filter); - state.Version++; - }); + worker.Complete(); - await persistence.ReadAsync(); - await persistence.WriteSnapshotAsync(state); + await worker.Completion; + } } } } \ No newline at end of file diff --git a/tools/Migrate_01/SquidexMigrations.cs b/tools/Migrate_01/SquidexMigrations.cs index 87fe65348..9ca97bdc6 100644 --- a/tools/Migrate_01/SquidexMigrations.cs +++ b/tools/Migrate_01/SquidexMigrations.cs @@ -7,6 +7,8 @@ using System.Reflection; +#pragma warning disable RECS0014 // If all fields, properties and methods members are static, the class can be made static. + namespace Migrate_01 { public sealed class SquidexMigrations From d56fc32ca6fe025f6906c8299d2d856c526b8733 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 7 Mar 2019 12:19:55 +0100 Subject: [PATCH 35/55] Performance improvement. --- .../Contents/MongoContentCollection.cs | 11 ++++---- .../Contents/MongoContentRepository.cs | 28 ++++++------------- .../Contents/Visitors/FilterFactory.cs | 6 ++++ 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs index c7db4ccaf..85de85c82 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs @@ -56,7 +56,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents return "State_Contents"; } - public async Task> QueryAsync(IAppEntity app, ISchemaEntity schema, Query query, List ids, Status[] status = null, bool useDraft = false) + public async Task> QueryAsync(IAppEntity app, ISchemaEntity schema, Query query, List ids, Status[] status, bool useDraft) { try { @@ -67,6 +67,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents var contentCount = Collection.Find(filter).CountDocumentsAsync(); var contentItems = Collection.Find(filter) + .WithoutDraft(useDraft) .ContentTake(query) .ContentSkip(query) .ContentSort(query) @@ -94,11 +95,11 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents } } - public async Task> QueryAsync(IAppEntity app, ISchemaEntity schema, HashSet ids, Status[] status = null) + public async Task> QueryAsync(IAppEntity app, ISchemaEntity schema, HashSet ids, Status[] status, bool useDraft) { var find = Collection.Find(FilterFactory.Build(schema.Id, ids, status)); - var contentItems = find.ToListAsync(); + var contentItems = find.WithoutDraft(useDraft).ToListAsync(); var contentCount = find.CountDocumentsAsync(); await Task.WhenAll(contentItems, contentCount); @@ -111,11 +112,11 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents return ResultList.Create(contentCount.Result, contentItems.Result); } - public async Task FindContentAsync(IAppEntity app, ISchemaEntity schema, Guid id, Status[] status = null) + public async Task FindContentAsync(IAppEntity app, ISchemaEntity schema, Guid id, Status[] status, bool useDraft) { var find = Collection.Find(FilterFactory.Build(schema.Id, id, status)); - var contentEntity = await find.FirstOrDefaultAsync(); + var contentEntity = await find.WithoutDraft(useDraft).FirstOrDefaultAsync(); contentEntity?.ParseData(schema.SchemaDef, Serializer); diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs index cd9ee470e..19f46be3a 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs @@ -55,7 +55,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { using (Profiler.TraceMethod("QueryAsyncByQuery")) { - var useDraft = RequiresPublished(status); + var useDraft = UseDraft(status); var fullTextIds = await indexer.SearchAsync(query.FullText, app, schema.Id, useDraft); @@ -72,14 +72,9 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { using (Profiler.TraceMethod("QueryAsyncByIds")) { - if (RequiresPublished(status)) - { - return await contents.QueryAsync(app, schema, ids); - } - else - { - return await contents.QueryAsync(app, schema, ids, status); - } + var useDraft = UseDraft(status); + + return await contents.QueryAsync(app, schema, ids, status, useDraft); } } @@ -87,14 +82,9 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { using (Profiler.TraceMethod()) { - if (RequiresPublished(status)) - { - return await contents.FindContentAsync(app, schema, id); - } - else - { - return await contents.FindContentAsync(app, schema, id, status); - } + var useDraft = UseDraft(status); + + return await contents.FindContentAsync(app, schema, id, status, useDraft); } } @@ -132,9 +122,9 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents return database.DropCollectionAsync("States_Contents_Archive"); } - private static bool RequiresPublished(Status[] status) + private static bool UseDraft(Status[] status) { - return status?.Length == 1 && status[0] == Status.Published; + return !(status?.Length == 1 && status[0] == Status.Published); } } } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FilterFactory.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FilterFactory.cs index 152e98b87..1da6bf8d9 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FilterFactory.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FilterFactory.cs @@ -14,6 +14,7 @@ using MongoDB.Driver; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Core.GenerateEdmSchema; using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.MongoDb.Queries; using Squidex.Infrastructure.Queries; @@ -109,6 +110,11 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Visitors return cursor.Skip(query); } + public static IFindFluent WithoutDraft(this IFindFluent cursor, bool useDraft) + { + return !useDraft ? cursor.Not(x => x.DataDraftByIds, x => x.IsDeleted) : cursor; + } + public static FilterDefinition Build(Guid schemaId, Guid id, Status[] status) { return CreateFilter(schemaId, new List { id }, status, null); From e482bf93fe4b9a0d7e8dfcd7470afb431a753582 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Fri, 8 Mar 2019 13:31:23 +0100 Subject: [PATCH 36/55] Migration improved. --- .../DependencyInjectionExtensions.cs | 9 ++++- .../IBackgroundProcess.cs | 17 +++++++++ .../{Bootstrap.cs => GrainBootstrap.cs} | 6 +-- src/Squidex/Config/Domain/EntitiesServices.cs | 14 +++++-- .../Config/Domain/InfrastructureServices.cs | 9 +++++ src/Squidex/Config/Orleans/OrleansServices.cs | 8 ---- src/Squidex/Config/Startup/BackgroundHost.cs | 38 +++++++++++++++++++ src/Squidex/WebStartup.cs | 1 + .../Orleans/BootstrapTests.cs | 4 +- .../MongoDb/RestructureContentCollection.cs | 5 ++- 10 files changed, 92 insertions(+), 19 deletions(-) create mode 100644 src/Squidex.Infrastructure/IBackgroundProcess.cs rename src/Squidex.Infrastructure/Orleans/{Bootstrap.cs => GrainBootstrap.cs} (85%) create mode 100644 src/Squidex/Config/Startup/BackgroundHost.cs diff --git a/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs b/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs index 13f245759..9ee638ac0 100644 --- a/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs +++ b/src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs @@ -83,10 +83,17 @@ namespace Microsoft.Extensions.DependencyInjection private static void RegisterDefaults(IServiceCollection services) where T : class { - if (typeof(T).GetInterfaces().Contains(typeof(IInitializable))) + var interfaces = typeof(T).GetInterfaces(); + + if (interfaces.Contains(typeof(IInitializable))) { services.AddSingleton(typeof(IInitializable), c => c.GetRequiredService()); } + + if (interfaces.Contains(typeof(IBackgroundProcess))) + { + services.AddSingleton(typeof(IBackgroundProcess), c => c.GetRequiredService()); + } } } } diff --git a/src/Squidex.Infrastructure/IBackgroundProcess.cs b/src/Squidex.Infrastructure/IBackgroundProcess.cs new file mode 100644 index 000000000..38003910c --- /dev/null +++ b/src/Squidex.Infrastructure/IBackgroundProcess.cs @@ -0,0 +1,17 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Threading; +using System.Threading.Tasks; + +namespace Squidex.Infrastructure +{ + public interface IBackgroundProcess + { + Task StartAsync(CancellationToken ct); + } +} diff --git a/src/Squidex.Infrastructure/Orleans/Bootstrap.cs b/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs similarity index 85% rename from src/Squidex.Infrastructure/Orleans/Bootstrap.cs rename to src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs index 5a3bb7a19..fd2e4d1f3 100644 --- a/src/Squidex.Infrastructure/Orleans/Bootstrap.cs +++ b/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs @@ -12,19 +12,19 @@ using Orleans.Runtime; namespace Squidex.Infrastructure.Orleans { - public sealed class Bootstrap : IStartupTask where T : IBackgroundGrain + public sealed class GrainBootstrap : IBackgroundProcess where T : IBackgroundGrain { private const int NumTries = 10; private readonly IGrainFactory grainFactory; - public Bootstrap(IGrainFactory grainFactory) + public GrainBootstrap(IGrainFactory grainFactory) { Guard.NotNull(grainFactory, nameof(grainFactory)); this.grainFactory = grainFactory; } - public async Task Execute(CancellationToken cancellationToken) + public async Task StartAsync(CancellationToken ct) { for (var i = 1; i <= NumTries; i++) { diff --git a/src/Squidex/Config/Domain/EntitiesServices.cs b/src/Squidex/Config/Domain/EntitiesServices.cs index d29a8c256..0ae7ce401 100644 --- a/src/Squidex/Config/Domain/EntitiesServices.cs +++ b/src/Squidex/Config/Domain/EntitiesServices.cs @@ -44,7 +44,9 @@ using Squidex.Domain.Apps.Entities.Tags; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.EventSourcing; +using Squidex.Infrastructure.EventSourcing.Grains; using Squidex.Infrastructure.Migrations; +using Squidex.Infrastructure.Orleans; using Squidex.Pipeline; using Squidex.Pipeline.CommandMiddlewares; @@ -63,12 +65,10 @@ namespace Squidex.Config.Domain .As().As().As(); services.AddSingletonAs() - .As() - .As(); + .As().As(); services.AddSingletonAs() - .As() - .As(); + .As().As(); services.AddSingletonAs() .As(); @@ -118,6 +118,12 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .AsOptional(); + services.AddSingletonAs>() + .AsSelf(); + + services.AddSingletonAs>() + .AsSelf(); + services.AddCommandPipeline(); services.AddBackupHandlers(); diff --git a/src/Squidex/Config/Domain/InfrastructureServices.cs b/src/Squidex/Config/Domain/InfrastructureServices.cs index 310f33d2e..915dd035a 100644 --- a/src/Squidex/Config/Domain/InfrastructureServices.cs +++ b/src/Squidex/Config/Domain/InfrastructureServices.cs @@ -14,9 +14,12 @@ using Microsoft.Extensions.DependencyInjection; using NodaTime; using Squidex.Areas.Api.Controllers.News.Service; using Squidex.Domain.Apps.Entities.Apps.Diagnostics; +using Squidex.Domain.Apps.Entities.Rules.UsageTracking; using Squidex.Domain.Users; using Squidex.Infrastructure.Caching; using Squidex.Infrastructure.Diagnostics; +using Squidex.Infrastructure.EventSourcing.Grains; +using Squidex.Infrastructure.Orleans; using Squidex.Infrastructure.Translations; using Squidex.Infrastructure.UsageTracking; using Squidex.Shared.Users; @@ -48,6 +51,12 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .AsSelf(); + services.AddSingletonAs>() + .AsSelf(); + + services.AddSingletonAs>() + .AsSelf(); + services.AddSingletonAs() .As(); diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs index 36c3cdc71..b6672f004 100644 --- a/src/Squidex/Config/Orleans/OrleansServices.cs +++ b/src/Squidex/Config/Orleans/OrleansServices.cs @@ -12,10 +12,6 @@ using Microsoft.Extensions.DependencyInjection; using Orleans; using Orleans.Configuration; using Orleans.Hosting; -using Squidex.Domain.Apps.Entities.Contents; -using Squidex.Domain.Apps.Entities.Rules; -using Squidex.Domain.Apps.Entities.Rules.UsageTracking; -using Squidex.Infrastructure.EventSourcing.Grains; using Squidex.Infrastructure.Orleans; namespace Squidex.Config.Orleans @@ -45,10 +41,6 @@ namespace Squidex.Config.Orleans .UseDashboardEx() .EnableDirectClient() .AddIncomingGrainCallFilter() - .AddStartupTask>() - .AddStartupTask>() - .AddStartupTask>() - .AddStartupTask>() .ConfigureApplicationParts(builder => { builder.AddMyParts(); diff --git a/src/Squidex/Config/Startup/BackgroundHost.cs b/src/Squidex/Config/Startup/BackgroundHost.cs new file mode 100644 index 000000000..e16e6fe9b --- /dev/null +++ b/src/Squidex/Config/Startup/BackgroundHost.cs @@ -0,0 +1,38 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Log; + +namespace Squidex.Config.Startup +{ + public sealed class BackgroundHost : SafeHostedService + { + private readonly IEnumerable targets; + + public BackgroundHost(IEnumerable targets, IApplicationLifetime lifetime, ISemanticLog log) + : base(lifetime, log) + { + this.targets = targets; + } + + protected override async Task StartAsync(ISemanticLog log, CancellationToken ct) + { + foreach (var target in targets.Distinct()) + { + await target.StartAsync(ct); + + log.LogInformation(w => w.WriteProperty("backgroundSystem", target.GetType().Name)); + } + } + } +} diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs index a23db7df9..115dbcb31 100644 --- a/src/Squidex/WebStartup.cs +++ b/src/Squidex/WebStartup.cs @@ -103,6 +103,7 @@ namespace Squidex var provider = services.AddAndBuildOrleans(configuration, afterServices => { afterServices.AddHostedService(); + afterServices.AddHostedService(); }); return provider; diff --git a/tests/Squidex.Infrastructure.Tests/Orleans/BootstrapTests.cs b/tests/Squidex.Infrastructure.Tests/Orleans/BootstrapTests.cs index b2fb54fd8..4efe764e3 100644 --- a/tests/Squidex.Infrastructure.Tests/Orleans/BootstrapTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Orleans/BootstrapTests.cs @@ -19,13 +19,13 @@ namespace Squidex.Infrastructure.Orleans public class BootstrapTests { private readonly IBackgroundGrain grain = A.Fake(); - private readonly Bootstrap sut; + private readonly GrainBootstrap sut; public BootstrapTests() { var factory = A.Fake(); - sut = new Bootstrap(factory); + sut = new GrainBootstrap(factory); A.CallTo(() => factory.GetGrain("Default", null)) .Returns(grain); diff --git a/tools/Migrate_01/Migrations/MongoDb/RestructureContentCollection.cs b/tools/Migrate_01/Migrations/MongoDb/RestructureContentCollection.cs index 38987dc2b..ea5511052 100644 --- a/tools/Migrate_01/Migrations/MongoDb/RestructureContentCollection.cs +++ b/tools/Migrate_01/Migrations/MongoDb/RestructureContentCollection.cs @@ -29,8 +29,11 @@ namespace Migrate_01.Migrations.MongoDb await contentDatabase.DropCollectionAsync("State_Contents"); await contentDatabase.DropCollectionAsync("State_Content_Published"); await contentDatabase.RenameCollectionAsync("State_Content_Draft", "State_Contents"); + } - var collection = contentDatabase.GetCollection("State_Content"); + if (await contentDatabase.CollectionExistsAsync("State_Contents")) + { + var collection = contentDatabase.GetCollection("State_Contents"); await collection.UpdateManyAsync(new BsonDocument(), Builders.Update.Unset("dt")); } From 9522750b96cd4e0a70886e795db08d6609feafa1 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sat, 16 Mar 2019 13:09:31 +0100 Subject: [PATCH 37/55] Tests improved. --- src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs | 2 +- .../Orleans/BootstrapTests.cs | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs b/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs index fd2e4d1f3..9f1843f73 100644 --- a/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs +++ b/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs @@ -24,7 +24,7 @@ namespace Squidex.Infrastructure.Orleans this.grainFactory = grainFactory; } - public async Task StartAsync(CancellationToken ct) + public async Task StartAsync(CancellationToken ct = CancellationToken.None) { for (var i = 1; i <= NumTries; i++) { diff --git a/tests/Squidex.Infrastructure.Tests/Orleans/BootstrapTests.cs b/tests/Squidex.Infrastructure.Tests/Orleans/BootstrapTests.cs index 4efe764e3..7cf9af454 100644 --- a/tests/Squidex.Infrastructure.Tests/Orleans/BootstrapTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Orleans/BootstrapTests.cs @@ -7,7 +7,6 @@ // ========================================================================== using System; -using System.Threading; using System.Threading.Tasks; using FakeItEasy; using Orleans; @@ -34,7 +33,7 @@ namespace Squidex.Infrastructure.Orleans [Fact] public async Task Should_activate_grain_on_run() { - await sut.Execute(CancellationToken.None); + await sut.StartAsync(); A.CallTo(() => grain.ActivateAsync()) .MustHaveHappened(); @@ -46,7 +45,7 @@ namespace Squidex.Infrastructure.Orleans A.CallTo(() => grain.ActivateAsync()) .Throws(new InvalidOperationException()); - await Assert.ThrowsAsync(() => sut.Execute(CancellationToken.None)); + await Assert.ThrowsAsync(() => sut.StartAsync()); } [Fact] @@ -55,7 +54,7 @@ namespace Squidex.Infrastructure.Orleans A.CallTo(() => grain.ActivateAsync()) .Throws(new OrleansException()).Once(); - await sut.Execute(CancellationToken.None); + await sut.StartAsync(); A.CallTo(() => grain.ActivateAsync()) .MustHaveHappened(2, Times.Exactly); @@ -67,7 +66,7 @@ namespace Squidex.Infrastructure.Orleans A.CallTo(() => grain.ActivateAsync()) .Throws(new OrleansException()); - await Assert.ThrowsAsync(() => sut.Execute(CancellationToken.None)); + await Assert.ThrowsAsync(() => sut.StartAsync()); A.CallTo(() => grain.ActivateAsync()) .MustHaveHappened(10, Times.Exactly); From 7a593e76c688359c76703dedcf24e834186dfaa9 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 17 Mar 2019 17:34:16 +0100 Subject: [PATCH 38/55] Build fixed. --- src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs b/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs index 9f1843f73..7177e4fbe 100644 --- a/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs +++ b/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs @@ -24,7 +24,7 @@ namespace Squidex.Infrastructure.Orleans this.grainFactory = grainFactory; } - public async Task StartAsync(CancellationToken ct = CancellationToken.None) + public async Task StartAsync(CancellationToken ct = default) { for (var i = 1; i <= NumTries; i++) { From 096eb72d40b376ffb0bd2aa68cf081c83d996a62 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sat, 23 Mar 2019 15:31:40 +0100 Subject: [PATCH 39/55] Migration to newer packages. --- .../Actions/Algolia/AlgoliaPlugin.cs | 2 +- .../Actions/AzureQueue/AzureQueuePlugin.cs | 2 +- .../Actions/Discourse/DiscoursePlugin.cs | 2 +- .../ElasticSearch/ElasticSearchPlugin.cs | 2 +- .../Actions/Email/EmailPlugin.cs | 2 +- .../Actions/Fastly/FastlyPlugin.cs | 2 +- .../Actions/Medium/MediumPlugin.cs | 2 +- .../Actions/Prerender/PrerenderPlugin.cs | 2 +- .../Actions/Slack/SlackPlugin.cs | 2 +- .../Actions/Twitter/TwitterPlugin.cs | 4 +- .../Actions/Webhook/WebhookPlugin.cs | 2 +- .../Samples/MemoryAssetStorePlugin.cs | 4 +- .../Squidex.Extensions.csproj | 2 +- ...Squidex.Domain.Apps.Core.Operations.csproj | 2 +- ...quidex.Domain.Apps.Entities.MongoDb.csproj | 2 +- .../Squidex.Domain.Apps.Entities.csproj | 4 +- .../Squidex.Domain.Users.MongoDb.csproj | 4 +- .../Squidex.Infrastructure.Azure.csproj | 2 +- .../Squidex.Infrastructure.MongoDb.csproj | 4 +- src/Squidex.Infrastructure/Plugins/IPlugin.cs | 2 +- .../Plugins/PluginManager.cs | 6 +- .../Squidex.Infrastructure.csproj | 6 +- .../Config/Orleans/EnvironmentWrapper.cs | 47 ++++++++++++ src/Squidex/Config/Orleans/Extensions.cs | 57 --------------- src/Squidex/Config/Orleans/OrleansServices.cs | 50 ++++++------- .../Config/Orleans/SiloServiceBuilder.cs | 73 +++++++++++++++++++ .../Pipeline/Plugins/PluginExtensions.cs | 6 +- src/Squidex/Squidex.csproj | 24 +++--- src/Squidex/WebStartup.cs | 23 +++--- .../Squidex.Domain.Apps.Core.Tests.csproj | 2 +- .../Squidex.Domain.Apps.Entities.Tests.csproj | 4 +- .../Squidex.Domain.Users.Tests.csproj | 2 +- .../Squidex.Infrastructure.Tests.csproj | 2 +- tests/Squidex.Tests/Squidex.Tests.csproj | 8 +- tools/Migrate_00/Migrate_00.csproj | 2 +- 35 files changed, 212 insertions(+), 150 deletions(-) create mode 100644 src/Squidex/Config/Orleans/EnvironmentWrapper.cs delete mode 100644 src/Squidex/Config/Orleans/Extensions.cs create mode 100644 src/Squidex/Config/Orleans/SiloServiceBuilder.cs diff --git a/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaPlugin.cs b/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaPlugin.cs index 9ef4538c9..c668ba003 100644 --- a/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaPlugin.cs @@ -13,7 +13,7 @@ namespace Squidex.Extensions.Actions.Algolia { public sealed class AlgoliaPlugin : IPlugin { - public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + public void ConfigureServices(IServiceCollection services, IConfiguration config) { services.AddRuleAction(); } diff --git a/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueuePlugin.cs b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueuePlugin.cs index 43c84e857..4dce57e2b 100644 --- a/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueuePlugin.cs +++ b/extensions/Squidex.Extensions/Actions/AzureQueue/AzureQueuePlugin.cs @@ -13,7 +13,7 @@ namespace Squidex.Extensions.Actions.AzureQueue { public sealed class AzureQueuePlugin : IPlugin { - public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + public void ConfigureServices(IServiceCollection services, IConfiguration config) { services.AddRuleAction(); } diff --git a/extensions/Squidex.Extensions/Actions/Discourse/DiscoursePlugin.cs b/extensions/Squidex.Extensions/Actions/Discourse/DiscoursePlugin.cs index fb1105657..e78e04d54 100644 --- a/extensions/Squidex.Extensions/Actions/Discourse/DiscoursePlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Discourse/DiscoursePlugin.cs @@ -13,7 +13,7 @@ namespace Squidex.Extensions.Actions.Discourse { public sealed class DiscoursePlugin : IPlugin { - public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + public void ConfigureServices(IServiceCollection services, IConfiguration config) { services.AddRuleAction(); } diff --git a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchPlugin.cs b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchPlugin.cs index 50bdf12d4..a40f610b0 100644 --- a/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchPlugin.cs @@ -13,7 +13,7 @@ namespace Squidex.Extensions.Actions.ElasticSearch { public sealed class ElasticSearchPlugin : IPlugin { - public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + public void ConfigureServices(IServiceCollection services, IConfiguration config) { services.AddRuleAction(); } diff --git a/extensions/Squidex.Extensions/Actions/Email/EmailPlugin.cs b/extensions/Squidex.Extensions/Actions/Email/EmailPlugin.cs index aeed28445..dd9140866 100644 --- a/extensions/Squidex.Extensions/Actions/Email/EmailPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Email/EmailPlugin.cs @@ -13,7 +13,7 @@ namespace Squidex.Extensions.Actions.Email { public sealed class EmailPlugin : IPlugin { - public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + public void ConfigureServices(IServiceCollection services, IConfiguration config) { services.AddRuleAction(); } diff --git a/extensions/Squidex.Extensions/Actions/Fastly/FastlyPlugin.cs b/extensions/Squidex.Extensions/Actions/Fastly/FastlyPlugin.cs index f6802dde3..d5e4f76b9 100644 --- a/extensions/Squidex.Extensions/Actions/Fastly/FastlyPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Fastly/FastlyPlugin.cs @@ -13,7 +13,7 @@ namespace Squidex.Extensions.Actions.Fastly { public sealed class FastlyPlugin : IPlugin { - public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + public void ConfigureServices(IServiceCollection services, IConfiguration config) { services.AddRuleAction(); } diff --git a/extensions/Squidex.Extensions/Actions/Medium/MediumPlugin.cs b/extensions/Squidex.Extensions/Actions/Medium/MediumPlugin.cs index b2664ac3b..5d8839f89 100644 --- a/extensions/Squidex.Extensions/Actions/Medium/MediumPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Medium/MediumPlugin.cs @@ -13,7 +13,7 @@ namespace Squidex.Extensions.Actions.Medium { public sealed class MediumPlugin : IPlugin { - public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + public void ConfigureServices(IServiceCollection services, IConfiguration config) { services.AddRuleAction(); } diff --git a/extensions/Squidex.Extensions/Actions/Prerender/PrerenderPlugin.cs b/extensions/Squidex.Extensions/Actions/Prerender/PrerenderPlugin.cs index fcf623e3f..608cb32d4 100644 --- a/extensions/Squidex.Extensions/Actions/Prerender/PrerenderPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Prerender/PrerenderPlugin.cs @@ -13,7 +13,7 @@ namespace Squidex.Extensions.Actions.Prerender { public sealed class PrerenderPlugin : IPlugin { - public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + public void ConfigureServices(IServiceCollection services, IConfiguration config) { services.AddRuleAction(); } diff --git a/extensions/Squidex.Extensions/Actions/Slack/SlackPlugin.cs b/extensions/Squidex.Extensions/Actions/Slack/SlackPlugin.cs index f0463c87e..15549a349 100644 --- a/extensions/Squidex.Extensions/Actions/Slack/SlackPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Slack/SlackPlugin.cs @@ -13,7 +13,7 @@ namespace Squidex.Extensions.Actions.Slack { public sealed class SlackPlugin : IPlugin { - public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + public void ConfigureServices(IServiceCollection services, IConfiguration config) { services.AddRuleAction(); } diff --git a/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs b/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs index fd59ec980..2d987b3c4 100644 --- a/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Twitter/TwitterPlugin.cs @@ -13,10 +13,10 @@ namespace Squidex.Extensions.Actions.Twitter { public sealed class TwitterPlugin : IPlugin { - public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + public void ConfigureServices(IServiceCollection services, IConfiguration config) { services.Configure( - configuration.GetSection("twitter")); + config.GetSection("twitter")); services.AddRuleAction(); } diff --git a/extensions/Squidex.Extensions/Actions/Webhook/WebhookPlugin.cs b/extensions/Squidex.Extensions/Actions/Webhook/WebhookPlugin.cs index d729f1b5e..e25857123 100644 --- a/extensions/Squidex.Extensions/Actions/Webhook/WebhookPlugin.cs +++ b/extensions/Squidex.Extensions/Actions/Webhook/WebhookPlugin.cs @@ -13,7 +13,7 @@ namespace Squidex.Extensions.Actions.Webhook { public sealed class WebhookPlugin : IPlugin { - public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + public void ConfigureServices(IServiceCollection services, IConfiguration config) { services.AddRuleAction(); } diff --git a/extensions/Squidex.Extensions/Samples/MemoryAssetStorePlugin.cs b/extensions/Squidex.Extensions/Samples/MemoryAssetStorePlugin.cs index b4a018ed5..bf586a836 100644 --- a/extensions/Squidex.Extensions/Samples/MemoryAssetStorePlugin.cs +++ b/extensions/Squidex.Extensions/Samples/MemoryAssetStorePlugin.cs @@ -15,9 +15,9 @@ namespace Squidex.Extensions.Samples { public sealed class MemoryAssetStorePlugin : IPlugin { - public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + public void ConfigureServices(IServiceCollection services, IConfiguration config) { - var storeType = configuration.GetValue("assetStore:type"); + var storeType = config.GetValue("assetStore:type"); if (string.Equals(storeType, "Memory", StringComparison.OrdinalIgnoreCase)) { diff --git a/extensions/Squidex.Extensions/Squidex.Extensions.csproj b/extensions/Squidex.Extensions/Squidex.Extensions.csproj index d365c5a6d..d9b24aa1f 100644 --- a/extensions/Squidex.Extensions/Squidex.Extensions.csproj +++ b/extensions/Squidex.Extensions/Squidex.Extensions.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj b/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj index 4e12cdabd..333692707 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj +++ b/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj b/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj index bae5d32f0..b8c6ea495 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj b/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj index 7b7db6907..46f190489 100644 --- a/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj +++ b/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj @@ -20,11 +20,11 @@ - + all runtime; build; native; contentfiles; analyzers - + diff --git a/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj b/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj index 351faafbf..a314a3872 100644 --- a/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj +++ b/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj @@ -14,10 +14,10 @@ - + - + diff --git a/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj b/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj index 32ea4d0ad..5351ea162 100644 --- a/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj +++ b/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj b/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj index 683baf450..0acd60699 100644 --- a/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj +++ b/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/Squidex.Infrastructure/Plugins/IPlugin.cs b/src/Squidex.Infrastructure/Plugins/IPlugin.cs index 2c8fc4674..9d5a2618e 100644 --- a/src/Squidex.Infrastructure/Plugins/IPlugin.cs +++ b/src/Squidex.Infrastructure/Plugins/IPlugin.cs @@ -12,6 +12,6 @@ namespace Squidex.Infrastructure.Plugins { public interface IPlugin { - void ConfigureServices(IServiceCollection services, IConfiguration configuration); + void ConfigureServices(IServiceCollection services, IConfiguration config); } } diff --git a/src/Squidex.Infrastructure/Plugins/PluginManager.cs b/src/Squidex.Infrastructure/Plugins/PluginManager.cs index aa9fa477d..34c809c69 100644 --- a/src/Squidex.Infrastructure/Plugins/PluginManager.cs +++ b/src/Squidex.Infrastructure/Plugins/PluginManager.cs @@ -59,14 +59,14 @@ namespace Squidex.Infrastructure.Plugins exceptions.Add((plugin, action, exception)); } - public void ConfigureServices(IServiceCollection services, IConfiguration configuration) + public void ConfigureServices(IServiceCollection services, IConfiguration config) { Guard.NotNull(services, nameof(services)); - Guard.NotNull(configuration, nameof(configuration)); + Guard.NotNull(config, nameof(config)); foreach (var plugin in loadedPlugins) { - plugin.ConfigureServices(services, configuration); + plugin.ConfigureServices(services, config); } } diff --git a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj index 5e50220ae..2ac2b92d0 100644 --- a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj +++ b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj @@ -13,12 +13,12 @@ - + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/src/Squidex/Config/Orleans/EnvironmentWrapper.cs b/src/Squidex/Config/Orleans/EnvironmentWrapper.cs new file mode 100644 index 000000000..3e462ac92 --- /dev/null +++ b/src/Squidex/Config/Orleans/EnvironmentWrapper.cs @@ -0,0 +1,47 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Microsoft.Extensions.FileProviders; +using Microsoft.Extensions.Hosting; +using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment; + +namespace Squidex.Config.Orleans +{ + public sealed class EnvironmentWrapper : IHostingEnvironment + { + private readonly IWebHostEnvironment nested; + + public string EnvironmentName + { + get => nested.EnvironmentName; + set => nested.EnvironmentName = value; + } + + public string ApplicationName + { + get => nested.ApplicationName; + set => nested.ApplicationName = value; + } + + public string ContentRootPath + { + get => nested.ContentRootPath; + set => nested.ContentRootPath = value; + } + + public IFileProvider ContentRootFileProvider + { + get => nested.ContentRootFileProvider; + set => nested.ContentRootFileProvider = value; + } + + public EnvironmentWrapper(IWebHostEnvironment nested) + { + this.nested = nested; + } + } +} diff --git a/src/Squidex/Config/Orleans/Extensions.cs b/src/Squidex/Config/Orleans/Extensions.cs deleted file mode 100644 index 4ecbd022f..000000000 --- a/src/Squidex/Config/Orleans/Extensions.cs +++ /dev/null @@ -1,57 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using Orleans; -using Orleans.ApplicationParts; -using Orleans.Configuration; -using Orleans.Hosting; -using OrleansDashboard; -using OrleansDashboard.Client; -using OrleansDashboard.Metrics; -using Squidex.Domain.Apps.Entities; -using Squidex.Infrastructure; - -namespace Squidex.Config.Orleans -{ - public static class Extensions - { - public static void AddMyParts(this IApplicationPartManager builder) - { - builder.AddApplicationPart(SquidexEntities.Assembly); - builder.AddApplicationPart(SquidexInfrastructure.Assembly); - } - - public static void Configure(this ClusterOptions options) - { - options.ClusterId = Constants.OrleansClusterId; - options.ServiceId = Constants.OrleansClusterId; - } - - public static ISiloHostBuilder UseDashboardEx(this ISiloHostBuilder builder, Action configurator = null) - { - builder.AddStartupTask(); - - builder.ConfigureApplicationParts(appParts => - appParts - .AddFrameworkPart(typeof(Dashboard).Assembly) - .AddFrameworkPart(typeof(DashboardClient).Assembly)); - - builder.ConfigureServices(services => - { - services.AddDashboard(options => - { - options.HostSelf = false; - }); - }); - - builder.AddIncomingGrainCallFilter(); - - return builder; - } - } -} diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs index b6672f004..7c0cf278f 100644 --- a/src/Squidex/Config/Orleans/OrleansServices.cs +++ b/src/Squidex/Config/Orleans/OrleansServices.cs @@ -5,20 +5,22 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Net; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Orleans; using Orleans.Configuration; using Orleans.Hosting; +using Squidex.Domain.Apps.Entities; +using Squidex.Infrastructure; using Squidex.Infrastructure.Orleans; +using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment; namespace Squidex.Config.Orleans { public static class OrleansServices { - public static IServiceProvider AddAndBuildOrleans(this IServiceCollection services, IConfiguration config, Action afterServices) + public static IServiceCollection AddOrleans(this IServiceCollection services, IConfiguration config, IWebHostEnvironment environment) { services.Configure(options => { @@ -35,16 +37,20 @@ namespace Squidex.Config.Orleans options.HideTrace = true; }); - services.AddHostedService(); + services.AddSingleton(); - var hostBuilder = new SiloHostBuilder() - .UseDashboardEx() - .EnableDirectClient() - .AddIncomingGrainCallFilter() - .ConfigureApplicationParts(builder => - { - builder.AddMyParts(); - }); + var hostBuilder = new SiloServiceBuilder(config, environment); + + hostBuilder.UseDashboard(options => + { + options.HostSelf = false; + }); + + hostBuilder.ConfigureApplicationParts(builder => + { + builder.AddApplicationPart(SquidexEntities.Assembly); + builder.AddApplicationPart(SquidexInfrastructure.Assembly); + }); var gatewayPort = config.GetOptionalValue("orleans:gatewayPort", 40000); @@ -89,23 +95,15 @@ namespace Squidex.Config.Orleans } }); - IServiceProvider provider = null; + hostBuilder.Build(services); - hostBuilder.UseServiceProviderFactory((siloServices) => - { - foreach (var descriptor in services) - { - siloServices.Add(descriptor); - } - - afterServices(siloServices); - - provider = siloServices.BuildServiceProvider(); - - return provider; - }).Build(); + return services; + } - return provider; + public static void Configure(this ClusterOptions options) + { + options.ClusterId = Constants.OrleansClusterId; + options.ServiceId = Constants.OrleansClusterId; } } } diff --git a/src/Squidex/Config/Orleans/SiloServiceBuilder.cs b/src/Squidex/Config/Orleans/SiloServiceBuilder.cs new file mode 100644 index 000000000..081c0ea6d --- /dev/null +++ b/src/Squidex/Config/Orleans/SiloServiceBuilder.cs @@ -0,0 +1,73 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Orleans; +using Orleans.Hosting; +using Squidex.Infrastructure; +using HostingBuilderContext = Microsoft.Extensions.Hosting.HostBuilderContext; +using WebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment; + +namespace Squidex.Config.Orleans +{ + public sealed class SiloServiceBuilder : ISiloBuilder + { + private readonly HostingBuilderContext context = new HostingBuilderContext(new Dictionary()); + private readonly List> configureSiloDelegates = new List>(); + private readonly List> configureServicesDelegates = new List>(); + + public IDictionary Properties + { + get { return context.Properties; } + } + + public SiloServiceBuilder(IConfiguration config, WebHostEnvironment environment) + { + context.Configuration = config; + context.HostingEnvironment = new EnvironmentWrapper(environment); + } + + public void Build(IServiceCollection serviceCollection) + { + foreach (var configurationDelegate in configureSiloDelegates) + { + configurationDelegate(context, this); + } + + serviceCollection.AddHostedService(); + + this.ConfigureDefaults(); + this.ConfigureApplicationParts(parts => parts.ConfigureDefaults()); + + foreach (var configurationDelegate in configureServicesDelegates) + { + configurationDelegate(context, serviceCollection); + } + } + + public ISiloBuilder ConfigureSilo(Action configureDelegate) + { + Guard.NotNull(configureDelegate, nameof(configureDelegate)); + + configureSiloDelegates.Add(configureDelegate); + + return this; + } + + public ISiloBuilder ConfigureServices(Action configureDelegate) + { + Guard.NotNull(configureDelegate, nameof(configureDelegate)); + + configureServicesDelegates.Add(configureDelegate); + + return this; + } + } +} diff --git a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs index 0ba06a608..42a07e18d 100644 --- a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs +++ b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs @@ -35,11 +35,11 @@ namespace Squidex.Pipeline.Plugins typeof(SquidexInfrastructure) }; - public static IMvcBuilder AddMyPlugins(this IMvcBuilder mvcBuilder, IConfiguration configuration) + public static IMvcBuilder AddMyPlugins(this IMvcBuilder mvcBuilder, IConfiguration config) { var pluginManager = new PluginManager(); - var options = configuration.Get(); + var options = config.Get(); if (options.Plugins != null) { @@ -74,7 +74,7 @@ namespace Squidex.Pipeline.Plugins } } - pluginManager.ConfigureServices(mvcBuilder.Services, configuration); + pluginManager.ConfigureServices(mvcBuilder.Services, config); mvcBuilder.Services.AddSingleton(pluginManager); diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index 8149d5ae7..f53191dbd 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -43,9 +43,9 @@ - + - + @@ -61,18 +61,18 @@ - - - - - - - + + + + + + + - - + + - + diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs index 115dbcb31..cc317832f 100644 --- a/src/Squidex/WebStartup.cs +++ b/src/Squidex/WebStartup.cs @@ -7,6 +7,7 @@ using System; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Areas.Api; @@ -37,17 +38,18 @@ namespace Squidex { public sealed class WebStartup { - private readonly IConfiguration configuration; + private readonly IConfiguration config; + private readonly IHostingEnvironment environment; - public WebStartup(IConfiguration configuration) + public WebStartup(IConfiguration config, IHostingEnvironment environment) { - this.configuration = configuration; + this.config = config; + + this.environment = environment; } public IServiceProvider ConfigureServices(IServiceCollection services) { - var config = configuration; - services.AddHttpClient(); services.AddLogging(); services.AddMemoryCache(); @@ -100,13 +102,12 @@ namespace Squidex services.AddHostedService(); - var provider = services.AddAndBuildOrleans(configuration, afterServices => - { - afterServices.AddHostedService(); - afterServices.AddHostedService(); - }); + services.AddOrleans(config, environment); + + services.AddHostedService(); + services.AddHostedService(); - return provider; + return services.BuildServiceProvider(); } public void Configure(IApplicationBuilder app) diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj b/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj index eeea458b7..bd553242c 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj +++ b/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj b/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj index 8c1f11e25..4c48bcdba 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj b/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj index 5053a1dc5..23cf6dbe4 100644 --- a/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj +++ b/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj index 5bf9da847..c5d586c5c 100644 --- a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj +++ b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj @@ -19,7 +19,7 @@ - + diff --git a/tests/Squidex.Tests/Squidex.Tests.csproj b/tests/Squidex.Tests/Squidex.Tests.csproj index a3b850682..cd75c2a1c 100644 --- a/tests/Squidex.Tests/Squidex.Tests.csproj +++ b/tests/Squidex.Tests/Squidex.Tests.csproj @@ -13,10 +13,10 @@ - - - - + + + + diff --git a/tools/Migrate_00/Migrate_00.csproj b/tools/Migrate_00/Migrate_00.csproj index 9c13dd95d..ca15a7163 100644 --- a/tools/Migrate_00/Migrate_00.csproj +++ b/tools/Migrate_00/Migrate_00.csproj @@ -6,7 +6,7 @@ 7.3 - + From 682bffda6f048d17d2b5f7aa1ad5eff6825d5fc1 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sat, 23 Mar 2019 20:27:24 +0100 Subject: [PATCH 40/55] WebHost compatibility pack. --- .../Config/Orleans/EnvironmentWrapper.cs | 47 ------- src/Squidex/Config/Orleans/OrleansServices.cs | 122 +++++++++--------- src/Squidex/Config/Orleans/SiloHost.cs | 51 -------- .../Config/Orleans/SiloServiceBuilder.cs | 73 ----------- 4 files changed, 63 insertions(+), 230 deletions(-) delete mode 100644 src/Squidex/Config/Orleans/EnvironmentWrapper.cs delete mode 100644 src/Squidex/Config/Orleans/SiloHost.cs delete mode 100644 src/Squidex/Config/Orleans/SiloServiceBuilder.cs diff --git a/src/Squidex/Config/Orleans/EnvironmentWrapper.cs b/src/Squidex/Config/Orleans/EnvironmentWrapper.cs deleted file mode 100644 index 3e462ac92..000000000 --- a/src/Squidex/Config/Orleans/EnvironmentWrapper.cs +++ /dev/null @@ -1,47 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using Microsoft.Extensions.FileProviders; -using Microsoft.Extensions.Hosting; -using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment; - -namespace Squidex.Config.Orleans -{ - public sealed class EnvironmentWrapper : IHostingEnvironment - { - private readonly IWebHostEnvironment nested; - - public string EnvironmentName - { - get => nested.EnvironmentName; - set => nested.EnvironmentName = value; - } - - public string ApplicationName - { - get => nested.ApplicationName; - set => nested.ApplicationName = value; - } - - public string ContentRootPath - { - get => nested.ContentRootPath; - set => nested.ContentRootPath = value; - } - - public IFileProvider ContentRootFileProvider - { - get => nested.ContentRootFileProvider; - set => nested.ContentRootFileProvider = value; - } - - public EnvironmentWrapper(IWebHostEnvironment nested) - { - this.nested = nested; - } - } -} diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs index 7c0cf278f..aacb5fbdb 100644 --- a/src/Squidex/Config/Orleans/OrleansServices.cs +++ b/src/Squidex/Config/Orleans/OrleansServices.cs @@ -8,9 +8,11 @@ using System.Net; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using Orleans; using Orleans.Configuration; using Orleans.Hosting; +using OrleansDashboard; using Squidex.Domain.Apps.Entities; using Squidex.Infrastructure; using Squidex.Infrastructure.Orleans; @@ -22,81 +24,83 @@ namespace Squidex.Config.Orleans { public static IServiceCollection AddOrleans(this IServiceCollection services, IConfiguration config, IWebHostEnvironment environment) { - services.Configure(options => + services.AddOrleans(config, environment, builder => { - options.Configure(); - }); - - services.Configure(options => - { - options.FastKillOnProcessExit = false; - }); + builder.ConfigureServices(siloServices => + { + siloServices.Configure(options => + { + options.Configure(); + }); - services.AddServicesForSelfHostedDashboard(null, options => - { - options.HideTrace = true; - }); + siloServices.Configure(options => + { + options.FastKillOnProcessExit = false; + }); - services.AddSingleton(); + siloServices.Configure(options => + { + options.HideTrace = true; + }); - var hostBuilder = new SiloServiceBuilder(config, environment); + siloServices.AddSingleton(); + }); - hostBuilder.UseDashboard(options => - { - options.HostSelf = false; - }); + builder.ConfigureApplicationParts(parts => + { + parts.AddApplicationPart(SquidexEntities.Assembly); + parts.AddApplicationPart(SquidexInfrastructure.Assembly); + }); - hostBuilder.ConfigureApplicationParts(builder => - { - builder.AddApplicationPart(SquidexEntities.Assembly); - builder.AddApplicationPart(SquidexInfrastructure.Assembly); - }); + builder.UseDashboard(options => + { + options.HostSelf = false; + }); - var gatewayPort = config.GetOptionalValue("orleans:gatewayPort", 40000); + var gatewayPort = config.GetOptionalValue("orleans:gatewayPort", 40000); - var siloPort = config.GetOptionalValue("orleans:siloPort", 11111); + var siloPort = config.GetOptionalValue("orleans:siloPort", 11111); - config.ConfigureByOption("orleans:clustering", new Alternatives - { - ["MongoDB"] = () => + config.ConfigureByOption("orleans:clustering", new Alternatives { - hostBuilder.ConfigureEndpoints(Dns.GetHostName(), siloPort, gatewayPort, listenOnAnyHostAddress: true); - - var mongoConfiguration = config.GetRequiredValue("store:mongoDb:configuration"); - var mongoDatabaseName = config.GetRequiredValue("store:mongoDb:database"); - - hostBuilder.UseMongoDBClustering(options => + ["MongoDB"] = () => { - options.ConnectionString = mongoConfiguration; - options.CollectionPrefix = "Orleans_"; - options.DatabaseName = mongoDatabaseName; - }); - }, - ["Development"] = () => - { - hostBuilder.UseLocalhostClustering(siloPort, gatewayPort, null, Constants.OrleansClusterId, Constants.OrleansClusterId); - hostBuilder.Configure(options => options.ExpectedClusterSize = 1); - } - }); + builder.ConfigureEndpoints(Dns.GetHostName(), siloPort, gatewayPort, listenOnAnyHostAddress: true); + + var mongoConfiguration = config.GetRequiredValue("store:mongoDb:configuration"); + var mongoDatabaseName = config.GetRequiredValue("store:mongoDb:database"); + + builder.UseMongoDBClustering(options => + { + options.ConnectionString = mongoConfiguration; + options.CollectionPrefix = "Orleans_"; + options.DatabaseName = mongoDatabaseName; + }); + }, + ["Development"] = () => + { + builder.UseLocalhostClustering(siloPort, gatewayPort, null, Constants.OrleansClusterId, Constants.OrleansClusterId); + builder.Configure(options => options.ExpectedClusterSize = 1); + } + }); - config.ConfigureByOption("store:type", new Alternatives - { - ["MongoDB"] = () => + config.ConfigureByOption("store:type", new Alternatives { - var mongoConfiguration = config.GetRequiredValue("store:mongoDb:configuration"); - var mongoDatabaseName = config.GetRequiredValue("store:mongoDb:database"); - - hostBuilder.UseMongoDBReminders(options => + ["MongoDB"] = () => { - options.ConnectionString = mongoConfiguration; - options.CollectionPrefix = "Orleans_"; - options.DatabaseName = mongoDatabaseName; - }); - } + var mongoConfiguration = config.GetRequiredValue("store:mongoDb:configuration"); + var mongoDatabaseName = config.GetRequiredValue("store:mongoDb:database"); + + builder.UseMongoDBReminders(options => + { + options.ConnectionString = mongoConfiguration; + options.CollectionPrefix = "Orleans_"; + options.DatabaseName = mongoDatabaseName; + }); + } + }); }); - hostBuilder.Build(services); - return services; } diff --git a/src/Squidex/Config/Orleans/SiloHost.cs b/src/Squidex/Config/Orleans/SiloHost.cs deleted file mode 100644 index 1817dfa12..000000000 --- a/src/Squidex/Config/Orleans/SiloHost.cs +++ /dev/null @@ -1,51 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using Orleans.Hosting; -using Squidex.Config.Startup; -using Squidex.Infrastructure; -using Squidex.Infrastructure.Log; - -namespace Squidex.Config.Orleans -{ - public sealed class SiloHost : SafeHostedService - { - private readonly ISiloHost silo; - - public SiloHost(ISiloHost silo, ISemanticLog log, IApplicationLifetime lifetime) - : base(lifetime, log) - { - this.silo = silo; - } - - protected override async Task StartAsync(ISemanticLog log, CancellationToken ct) - { - var watch = ValueStopwatch.StartNew(); - try - { - await silo.StartAsync(ct); - } - finally - { - var elapsedMs = watch.Stop(); - - log.LogInformation(w => w - .WriteProperty("message", "Silo started") - .WriteProperty("elapsedMs", elapsedMs)); - } - } - - protected override async Task StopAsync(ISemanticLog log, CancellationToken ct) - { - await silo.StopAsync(); - } - } -} diff --git a/src/Squidex/Config/Orleans/SiloServiceBuilder.cs b/src/Squidex/Config/Orleans/SiloServiceBuilder.cs deleted file mode 100644 index 081c0ea6d..000000000 --- a/src/Squidex/Config/Orleans/SiloServiceBuilder.cs +++ /dev/null @@ -1,73 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using System.Collections.Generic; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Orleans; -using Orleans.Hosting; -using Squidex.Infrastructure; -using HostingBuilderContext = Microsoft.Extensions.Hosting.HostBuilderContext; -using WebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment; - -namespace Squidex.Config.Orleans -{ - public sealed class SiloServiceBuilder : ISiloBuilder - { - private readonly HostingBuilderContext context = new HostingBuilderContext(new Dictionary()); - private readonly List> configureSiloDelegates = new List>(); - private readonly List> configureServicesDelegates = new List>(); - - public IDictionary Properties - { - get { return context.Properties; } - } - - public SiloServiceBuilder(IConfiguration config, WebHostEnvironment environment) - { - context.Configuration = config; - context.HostingEnvironment = new EnvironmentWrapper(environment); - } - - public void Build(IServiceCollection serviceCollection) - { - foreach (var configurationDelegate in configureSiloDelegates) - { - configurationDelegate(context, this); - } - - serviceCollection.AddHostedService(); - - this.ConfigureDefaults(); - this.ConfigureApplicationParts(parts => parts.ConfigureDefaults()); - - foreach (var configurationDelegate in configureServicesDelegates) - { - configurationDelegate(context, serviceCollection); - } - } - - public ISiloBuilder ConfigureSilo(Action configureDelegate) - { - Guard.NotNull(configureDelegate, nameof(configureDelegate)); - - configureSiloDelegates.Add(configureDelegate); - - return this; - } - - public ISiloBuilder ConfigureServices(Action configureDelegate) - { - Guard.NotNull(configureDelegate, nameof(configureDelegate)); - - configureServicesDelegates.Add(configureDelegate); - - return this; - } - } -} From 03beabb2442b4d79d4945ab14a44cd01ad718be2 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Mar 2019 12:13:52 +0100 Subject: [PATCH 41/55] Forgotten to push stuff. --- src/Squidex/Config/Orleans/OrleansServices.cs | 1 - src/Squidex/Config/Startup/BackgroundHost.cs | 1 + src/Squidex/Squidex.csproj | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs index aacb5fbdb..a3d33227e 100644 --- a/src/Squidex/Config/Orleans/OrleansServices.cs +++ b/src/Squidex/Config/Orleans/OrleansServices.cs @@ -8,7 +8,6 @@ using System.Net; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Orleans; using Orleans.Configuration; using Orleans.Hosting; diff --git a/src/Squidex/Config/Startup/BackgroundHost.cs b/src/Squidex/Config/Startup/BackgroundHost.cs index e16e6fe9b..3691ba676 100644 --- a/src/Squidex/Config/Startup/BackgroundHost.cs +++ b/src/Squidex/Config/Startup/BackgroundHost.cs @@ -3,6 +3,7 @@ // ========================================================================== // Copyright (c) Squidex UG (haftungsbeschraenkt) // All rights reserved. Licensed under the MIT license. + // ========================================================================== using System.Collections.Generic; diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index f53191dbd..6ee1e41d3 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -70,6 +70,7 @@ + From efef6b63cb4891dfde5103ecfe293591919a80c3 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Mar 2019 13:08:39 +0100 Subject: [PATCH 42/55] Separate project for web dependencies to give them access in the plugin. --- Squidex.sln | 46 ++++++++------ src/Squidex.Web/ApiController.cs | 60 +++++++++++++++++++ .../ApiCostsAttribute.cs | 3 +- .../ApiExceptionFilterAttribute.cs | 2 +- .../ApiModelValidationAttribute.cs | 2 +- .../ApiPermissionAttribute.cs | 5 +- .../AssetRequestSizeLimitAttribute.cs | 2 +- .../ETagCommandMiddleware.cs | 2 +- .../EnrichWithActorCommandMiddleware.cs | 2 +- .../EnrichWithAppIdCommandMiddleware.cs | 2 +- .../EnrichWithSchemaIdCommandMiddleware.cs | 2 +- .../Config => Squidex.Web}/Constants.cs | 6 +- .../ETagExtensions.cs | 2 +- .../Pipeline => Squidex.Web}/ETagFilter.cs | 2 +- .../Pipeline => Squidex.Web}/ETagOptions.cs | 2 +- .../EntityCreatedDto.cs | 12 ++-- .../Pipeline => Squidex.Web}/ErrorDto.cs | 18 ++---- .../Pipeline => Squidex.Web}/Extensions.cs | 3 +- .../FileCallbackResult.cs | 3 +- .../IApiCostsFeature.cs | 2 +- .../Pipeline => Squidex.Web}/IAppFeature.cs | 2 +- .../Pipeline => Squidex.Web}/IGenerateEtag.cs | 2 +- .../MeasureResultFilter.cs | 2 +- .../MyJsonInheritanceConverter.cs | 2 +- .../Pipeline/ActionContextLogAppender.cs | 6 +- .../Pipeline/ApiCostsFilter.cs | 2 +- .../Pipeline/ApiPermissionUnifier.cs | 2 +- .../Pipeline/AppResolver.cs | 2 +- .../Pipeline/CleanupHostMiddleware.cs | 2 +- .../Pipeline/EnforceHttpsMiddleware.cs | 7 +-- .../Pipeline/FileCallbackResultExecutor.cs | 2 +- .../Pipeline/LocalCacheMiddleware.cs | 2 +- .../RequestLogPerformanceMiddleware.cs | 2 +- .../Services}/UrlGenerator.cs | 7 +-- src/Squidex.Web/Squidex.Web.csproj | 23 +++++++ .../UrlsOptions.cs} | 4 +- .../UsageOptions.cs} | 4 +- .../Api/Config/Swagger/ScopesProcessor.cs | 3 +- .../Api/Config/Swagger/SecurityProcessor.cs | 6 +- .../Api/Config/Swagger/ThemeProcessor.cs | 4 +- .../Areas/Api/Controllers/ApiController.cs | 2 +- .../Controllers/Apps/AppClientsController.cs | 2 +- .../Apps/AppContributorsController.cs | 2 +- .../Apps/AppLanguagesController.cs | 2 +- .../Controllers/Apps/AppPatternsController.cs | 2 +- .../Controllers/Apps/AppRolesController.cs | 2 +- .../Api/Controllers/Apps/AppsController.cs | 2 +- .../Api/Controllers/Apps/Models/AppDto.cs | 2 +- .../Assets/AssetContentController.cs | 2 +- .../Controllers/Assets/AssetsController.cs | 2 +- .../Api/Controllers/Assets/Models/AssetDto.cs | 2 +- .../Backups/BackupContentController.cs | 2 +- .../Controllers/Backups/BackupsController.cs | 2 +- .../Controllers/Backups/RestoreController.cs | 2 +- .../Comments/CommentsController.cs | 2 +- .../Contents/ContentSwaggerController.cs | 2 +- .../Contents/ContentsController.cs | 2 +- .../Generator/SchemaSwaggerGenerator.cs | 2 +- .../Generator/SchemasSwaggerGenerator.cs | 6 +- .../Controllers/Contents/Models/ContentDto.cs | 2 +- .../EventConsumersController.cs | 2 +- .../Controllers/History/HistoryController.cs | 2 +- .../Languages/LanguagesController.cs | 2 +- .../Api/Controllers/News/NewsController.cs | 2 +- .../Api/Controllers/Ping/PingController.cs | 2 +- .../Controllers/Plans/AppPlansController.cs | 2 +- .../Rules/Models/RuleActionConverter.cs | 1 + .../Api/Controllers/Rules/Models/RuleDto.cs | 2 +- .../Rules/Models/RuleTriggerDto.cs | 1 + .../Api/Controllers/Rules/RulesController.cs | 2 +- .../Schemas/Models/FieldPropertiesDto.cs | 1 + .../Controllers/Schemas/Models/SchemaDto.cs | 2 +- .../Schemas/SchemaFieldsController.cs | 2 +- .../Controllers/Schemas/SchemasController.cs | 2 +- .../Statistics/UsagesController.cs | 7 +-- .../Translations/TranslationsController.cs | 2 +- .../Api/Controllers/UI}/MyUIOptions.cs | 2 +- .../Areas/Api/Controllers/UI/UIController.cs | 3 +- .../Users/UserManagementController.cs | 2 +- .../Api/Controllers/Users/UsersController.cs | 2 +- src/Squidex/Areas/Api/Startup.cs | 2 +- .../Config/IdentityServerServices.cs | 2 +- .../IdentityServer/Config/LazyClientStore.cs | 8 +-- src/Squidex/Areas/IdentityServer/Startup.cs | 2 +- src/Squidex/Areas/OrleansDashboard/Startup.cs | 2 +- src/Squidex/Areas/Portal/Startup.cs | 2 +- .../Authentication/IdentityServerServices.cs | 3 +- .../Config/Authentication/OidcServices.cs | 1 + src/Squidex/Config/Domain/EntitiesServices.cs | 9 +-- src/Squidex/Config/Domain/LoggingServices.cs | 2 +- .../Config/Domain/SubscriptionServices.cs | 3 +- src/Squidex/Config/Orleans/OrleansServices.cs | 1 + src/Squidex/Config/Web/WebExtensions.cs | 2 +- src/Squidex/Config/Web/WebServices.cs | 3 +- src/Squidex/Pipeline/Swagger/NSwagHelper.cs | 4 +- src/Squidex/Squidex.csproj | 1 + src/Squidex/WebStartup.cs | 11 ++-- src/Squidex/appsettings.json | 52 ++++++++-------- .../ETagCommandMiddlewareTests.cs | 2 +- .../EnrichWithActorCommandMiddlewareTests.cs | 2 +- .../EnrichWithAppIdCommandMiddlewareTests.cs | 3 +- ...nrichWithSchemaIdCommandMiddlewareTests.cs | 3 +- .../Pipeline/ApiCostsFilterTests.cs | 2 +- .../Pipeline/ETagFilterTests.cs | 2 +- .../Pipeline/EnforceHttpsMiddlewareTests.cs | 5 +- .../Squidex.Web.Tests.csproj} | 3 +- 106 files changed, 287 insertions(+), 196 deletions(-) create mode 100644 src/Squidex.Web/ApiController.cs rename src/{Squidex/Pipeline => Squidex.Web}/ApiCostsAttribute.cs (93%) rename src/{Squidex/Pipeline => Squidex.Web}/ApiExceptionFilterAttribute.cs (99%) rename src/{Squidex/Pipeline => Squidex.Web}/ApiModelValidationAttribute.cs (98%) rename src/{Squidex/Pipeline => Squidex.Web}/ApiPermissionAttribute.cs (92%) rename src/{Squidex/Pipeline => Squidex.Web}/AssetRequestSizeLimitAttribute.cs (98%) rename src/{Squidex/Pipeline => Squidex.Web}/CommandMiddlewares/ETagCommandMiddleware.cs (97%) rename src/{Squidex/Pipeline => Squidex.Web}/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs (97%) rename src/{Squidex/Pipeline => Squidex.Web}/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs (97%) rename src/{Squidex/Pipeline => Squidex.Web}/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs (98%) rename src/{Squidex/Config => Squidex.Web}/Constants.cs (94%) rename src/{Squidex/Pipeline => Squidex.Web}/ETagExtensions.cs (98%) rename src/{Squidex/Pipeline => Squidex.Web}/ETagFilter.cs (98%) rename src/{Squidex/Pipeline => Squidex.Web}/ETagOptions.cs (94%) rename src/{Squidex/Pipeline => Squidex.Web}/EntityCreatedDto.cs (80%) rename src/{Squidex/Pipeline => Squidex.Web}/ErrorDto.cs (69%) rename src/{Squidex/Pipeline => Squidex.Web}/Extensions.cs (96%) rename src/{Squidex/Pipeline => Squidex.Web}/FileCallbackResult.cs (93%) rename src/{Squidex/Pipeline => Squidex.Web}/IApiCostsFeature.cs (94%) rename src/{Squidex/Pipeline => Squidex.Web}/IAppFeature.cs (94%) rename src/{Squidex/Pipeline => Squidex.Web}/IGenerateEtag.cs (94%) rename src/{Squidex/Pipeline => Squidex.Web}/MeasureResultFilter.cs (97%) rename src/{Squidex/Areas/Api/Controllers => Squidex.Web}/MyJsonInheritanceConverter.cs (98%) rename src/{Squidex => Squidex.Web}/Pipeline/ActionContextLogAppender.cs (93%) rename src/{Squidex => Squidex.Web}/Pipeline/ApiCostsFilter.cs (98%) rename src/{Squidex => Squidex.Web}/Pipeline/ApiPermissionUnifier.cs (97%) rename src/{Squidex => Squidex.Web}/Pipeline/AppResolver.cs (99%) rename src/{Squidex => Squidex.Web}/Pipeline/CleanupHostMiddleware.cs (97%) rename src/{Squidex => Squidex.Web}/Pipeline/EnforceHttpsMiddleware.cs (88%) rename src/{Squidex => Squidex.Web}/Pipeline/FileCallbackResultExecutor.cs (97%) rename src/{Squidex => Squidex.Web}/Pipeline/LocalCacheMiddleware.cs (97%) rename src/{Squidex => Squidex.Web}/Pipeline/RequestLogPerformanceMiddleware.cs (98%) rename src/{Squidex/Pipeline => Squidex.Web/Services}/UrlGenerator.cs (92%) create mode 100644 src/Squidex.Web/Squidex.Web.csproj rename src/{Squidex/Config/MyUrlsOptions.cs => Squidex.Web/UrlsOptions.cs} (93%) rename src/{Squidex/Config/MyUsageOptions.cs => Squidex.Web/UsageOptions.cs} (89%) rename src/Squidex/{Config => Areas/Api/Controllers/UI}/MyUIOptions.cs (95%) rename tests/{Squidex.Tests/Pipeline => Squidex.Web.Tests}/CommandMiddlewares/ETagCommandMiddlewareTests.cs (98%) rename tests/{Squidex.Tests/Pipeline => Squidex.Web.Tests}/CommandMiddlewares/EnrichWithActorCommandMiddlewareTests.cs (98%) rename tests/{Squidex.Tests/Pipeline => Squidex.Web.Tests}/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs (98%) rename tests/{Squidex.Tests/Pipeline => Squidex.Web.Tests}/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs (98%) rename tests/{Squidex.Tests => Squidex.Web.Tests}/Pipeline/ApiCostsFilterTests.cs (99%) rename tests/{Squidex.Tests => Squidex.Web.Tests}/Pipeline/ETagFilterTests.cs (99%) rename tests/{Squidex.Tests => Squidex.Web.Tests}/Pipeline/EnforceHttpsMiddlewareTests.cs (95%) rename tests/{Squidex.Tests/Squidex.Tests.csproj => Squidex.Web.Tests/Squidex.Web.Tests.csproj} (94%) diff --git a/Squidex.sln b/Squidex.sln index 6d8cfb71d..26a5f4eeb 100644 --- a/Squidex.sln +++ b/Squidex.sln @@ -30,10 +30,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Migrate_00", "tools\Migrate EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Shared", "src\Squidex.Shared\Squidex.Shared.csproj", "{5E75AB7D-6F01-4313-AFF1-7F7128FFD71F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "apps", "apps", "{C9809D59-6665-471E-AD87-5AC624C65892}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "users", "users", "{C0D540F0-9158-4528-BFD8-BEAE6EAE45EA}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Domain.Users", "src\Squidex.Domain.Users\Squidex.Domain.Users.csproj", "{F7771E22-47BD-45C4-A133-FD7F1DE27CA0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Domain.Users.MongoDb", "src\Squidex.Domain.Users.MongoDb\Squidex.Domain.Users.MongoDb.csproj", "{27CF800D-890F-4882-BF05-44EC3233537D}" @@ -61,12 +57,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Domain.Apps.Entitie EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Migrate_01", "tools\Migrate_01\Migrate_01.csproj", "{A4823E14-C0E5-4A4D-B28F-27424C25C3C7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Tests", "tests\Squidex.Tests\Squidex.Tests.csproj", "{7E8CC864-4C6E-496F-A672-9F9AD8874835}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Web.Tests", "tests\Squidex.Web.Tests\Squidex.Web.Tests.csproj", "{7E8CC864-4C6E-496F-A672-9F9AD8874835}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "extensions", "extensions", "{FB8BC3A2-2010-4C3C-A87D-D4A98C05EE52}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Extensions", "extensions\Squidex.Extensions\Squidex.Extensions.csproj", "{F3C41B82-6A67-409A-B7FE-54543EE4F38B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{7EDE8CF1-B1E4-4005-B154-834B944E0D7A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Web", "src\Squidex.Web\Squidex.Web.csproj", "{5B2D251F-46E3-486A-AE16-E3FE06B559ED}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -337,35 +337,47 @@ Global {F3C41B82-6A67-409A-B7FE-54543EE4F38B}.Release|x64.Build.0 = Release|Any CPU {F3C41B82-6A67-409A-B7FE-54543EE4F38B}.Release|x86.ActiveCfg = Release|Any CPU {F3C41B82-6A67-409A-B7FE-54543EE4F38B}.Release|x86.Build.0 = Release|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Debug|x64.ActiveCfg = Debug|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Debug|x64.Build.0 = Debug|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Debug|x86.ActiveCfg = Debug|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Debug|x86.Build.0 = Debug|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Release|Any CPU.Build.0 = Release|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Release|x64.ActiveCfg = Release|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Release|x64.Build.0 = Release|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Release|x86.ActiveCfg = Release|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} - {25F66C64-058A-4D44-BC0C-F12A054F9A91} = {C9809D59-6665-471E-AD87-5AC624C65892} + {25F66C64-058A-4D44-BC0C-F12A054F9A91} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} {7FD0A92B-7862-4BB1-932B-B52A9CACB56B} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} - {FD0AFD44-7A93-4F9E-B5ED-72582392E435} = {C9809D59-6665-471E-AD87-5AC624C65892} + {FD0AFD44-7A93-4F9E-B5ED-72582392E435} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} {6A811927-3C37-430A-90F4-503E37123956} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} {D7166C56-178A-4457-B56A-C615C7450DEE} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} {C1E5BBB6-6B6A-4DE5-B19D-0538304DE343} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} {945871B1-77B8-43FB-B53C-27CF385AB756} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} {B51126A8-0D75-4A79-867D-10724EC6AC84} = {94207AA6-4923-4183-A558-E0F8196B8CA3} {5E75AB7D-6F01-4313-AFF1-7F7128FFD71F} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} - {C9809D59-6665-471E-AD87-5AC624C65892} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} - {C0D540F0-9158-4528-BFD8-BEAE6EAE45EA} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} - {F7771E22-47BD-45C4-A133-FD7F1DE27CA0} = {C0D540F0-9158-4528-BFD8-BEAE6EAE45EA} - {27CF800D-890F-4882-BF05-44EC3233537D} = {C0D540F0-9158-4528-BFD8-BEAE6EAE45EA} - {42184546-E3CB-4D4F-9495-43979B9C63B9} = {C0D540F0-9158-4528-BFD8-BEAE6EAE45EA} + {F7771E22-47BD-45C4-A133-FD7F1DE27CA0} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A} + {27CF800D-890F-4882-BF05-44EC3233537D} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A} + {42184546-E3CB-4D4F-9495-43979B9C63B9} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A} {EF75E488-1324-4E18-A1BD-D3A05AE67B1F} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} {7931187E-A1E6-4F89-8BC8-20A1E445579F} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} - {F0A83301-50A5-40EA-A1A2-07C7858F5A3F} = {C9809D59-6665-471E-AD87-5AC624C65892} - {6B3F75B6-5888-468E-BA4F-4FC725DAEF31} = {C9809D59-6665-471E-AD87-5AC624C65892} - {79FEF326-CA5E-4698-B2BA-C16A4580B4D5} = {C9809D59-6665-471E-AD87-5AC624C65892} - {AA003372-CD8D-4DBC-962C-F61E0C93CF05} = {C9809D59-6665-471E-AD87-5AC624C65892} - {7DA5B308-D950-4496-93D5-21D6C4D91644} = {C9809D59-6665-471E-AD87-5AC624C65892} + {F0A83301-50A5-40EA-A1A2-07C7858F5A3F} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} + {6B3F75B6-5888-468E-BA4F-4FC725DAEF31} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} + {79FEF326-CA5E-4698-B2BA-C16A4580B4D5} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} + {AA003372-CD8D-4DBC-962C-F61E0C93CF05} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} + {7DA5B308-D950-4496-93D5-21D6C4D91644} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} {A4823E14-C0E5-4A4D-B28F-27424C25C3C7} = {94207AA6-4923-4183-A558-E0F8196B8CA3} + {7E8CC864-4C6E-496F-A672-9F9AD8874835} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A} {F3C41B82-6A67-409A-B7FE-54543EE4F38B} = {FB8BC3A2-2010-4C3C-A87D-D4A98C05EE52} + {5B2D251F-46E3-486A-AE16-E3FE06B559ED} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {02F2E872-3141-44F5-BD6A-33CD84E9FE08} diff --git a/src/Squidex.Web/ApiController.cs b/src/Squidex.Web/ApiController.cs new file mode 100644 index 000000000..5eb10a7bf --- /dev/null +++ b/src/Squidex.Web/ApiController.cs @@ -0,0 +1,60 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; +using Squidex.Domain.Apps.Entities.Apps; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Commands; + +namespace Squidex.Web +{ + [Area("Api")] + [ApiController] + [ApiExceptionFilter] + [ApiModelValidation(false)] + public abstract class ApiController : Controller + { + protected ICommandBus CommandBus { get; } + + protected IAppEntity App + { + get + { + var appFeature = HttpContext.Features.Get(); + + if (appFeature == null) + { + throw new InvalidOperationException("Not in a app context."); + } + + return appFeature.App; + } + } + + protected Guid AppId + { + get { return App.Id; } + } + + protected ApiController(ICommandBus commandBus) + { + Guard.NotNull(commandBus, nameof(commandBus)); + + CommandBus = commandBus; + } + + public override void OnActionExecuting(ActionExecutingContext context) + { + if (!context.HttpContext.Request.PathBase.StartsWithSegments("/api")) + { + context.Result = new RedirectResult("/"); + } + } + } +} diff --git a/src/Squidex/Pipeline/ApiCostsAttribute.cs b/src/Squidex.Web/ApiCostsAttribute.cs similarity index 93% rename from src/Squidex/Pipeline/ApiCostsAttribute.cs rename to src/Squidex.Web/ApiCostsAttribute.cs index 07cc48f18..0b07afc23 100644 --- a/src/Squidex/Pipeline/ApiCostsAttribute.cs +++ b/src/Squidex.Web/ApiCostsAttribute.cs @@ -7,8 +7,9 @@ using System; using Microsoft.AspNetCore.Mvc; +using Squidex.Web.Pipeline; -namespace Squidex.Pipeline +namespace Squidex.Web { [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)] public sealed class ApiCostsAttribute : ServiceFilterAttribute, IApiCostsFeature diff --git a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs b/src/Squidex.Web/ApiExceptionFilterAttribute.cs similarity index 99% rename from src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs rename to src/Squidex.Web/ApiExceptionFilterAttribute.cs index a681860ad..65c6e8ac0 100644 --- a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs +++ b/src/Squidex.Web/ApiExceptionFilterAttribute.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Squidex.Infrastructure; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class ApiExceptionFilterAttribute : ActionFilterAttribute, IExceptionFilter { diff --git a/src/Squidex/Pipeline/ApiModelValidationAttribute.cs b/src/Squidex.Web/ApiModelValidationAttribute.cs similarity index 98% rename from src/Squidex/Pipeline/ApiModelValidationAttribute.cs rename to src/Squidex.Web/ApiModelValidationAttribute.cs index 41bb86156..df1a5a994 100644 --- a/src/Squidex/Pipeline/ApiModelValidationAttribute.cs +++ b/src/Squidex.Web/ApiModelValidationAttribute.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Newtonsoft.Json; using Squidex.Infrastructure; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class ApiModelValidationAttribute : ActionFilterAttribute { diff --git a/src/Squidex/Pipeline/ApiPermissionAttribute.cs b/src/Squidex.Web/ApiPermissionAttribute.cs similarity index 92% rename from src/Squidex/Pipeline/ApiPermissionAttribute.cs rename to src/Squidex.Web/ApiPermissionAttribute.cs index 48cd75e62..1df4fd5e2 100644 --- a/src/Squidex/Pipeline/ApiPermissionAttribute.cs +++ b/src/Squidex.Web/ApiPermissionAttribute.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using System.Threading.Tasks; -using IdentityServer4.AccessTokenValidation; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; @@ -15,7 +14,7 @@ using Squidex.Infrastructure.Security; using Squidex.Infrastructure.Tasks; using Squidex.Shared.Identity; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class ApiPermissionAttribute : AuthorizeAttribute, IAsyncActionFilter { @@ -28,7 +27,7 @@ namespace Squidex.Pipeline public ApiPermissionAttribute(params string[] ids) { - AuthenticationSchemes = IdentityServerAuthenticationDefaults.AuthenticationScheme; + AuthenticationSchemes = "Bearer"; permissionIds = ids; } diff --git a/src/Squidex/Pipeline/AssetRequestSizeLimitAttribute.cs b/src/Squidex.Web/AssetRequestSizeLimitAttribute.cs similarity index 98% rename from src/Squidex/Pipeline/AssetRequestSizeLimitAttribute.cs rename to src/Squidex.Web/AssetRequestSizeLimitAttribute.cs index 17236e81a..2cc5479c4 100644 --- a/src/Squidex/Pipeline/AssetRequestSizeLimitAttribute.cs +++ b/src/Squidex.Web/AssetRequestSizeLimitAttribute.cs @@ -12,7 +12,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Squidex.Domain.Apps.Entities.Assets; -namespace Squidex.Pipeline +namespace Squidex.Web { [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)] public sealed class AssetRequestSizeLimitAttribute : Attribute, IFilterFactory, IOrderedFilter diff --git a/src/Squidex/Pipeline/CommandMiddlewares/ETagCommandMiddleware.cs b/src/Squidex.Web/CommandMiddlewares/ETagCommandMiddleware.cs similarity index 97% rename from src/Squidex/Pipeline/CommandMiddlewares/ETagCommandMiddleware.cs rename to src/Squidex.Web/CommandMiddlewares/ETagCommandMiddleware.cs index ef14a8bb0..0ebb669f3 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/ETagCommandMiddleware.cs +++ b/src/Squidex.Web/CommandMiddlewares/ETagCommandMiddleware.cs @@ -13,7 +13,7 @@ using Microsoft.Net.Http.Headers; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public class ETagCommandMiddleware : ICommandMiddleware { diff --git a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs b/src/Squidex.Web/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs similarity index 97% rename from src/Squidex/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs rename to src/Squidex.Web/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs index 4baf4b814..0bff3a6c5 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs +++ b/src/Squidex.Web/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs @@ -13,7 +13,7 @@ using Squidex.Domain.Apps.Entities; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Security; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public class EnrichWithActorCommandMiddleware : ICommandMiddleware { diff --git a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs b/src/Squidex.Web/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs similarity index 97% rename from src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs rename to src/Squidex.Web/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs index f41214737..06e050784 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs +++ b/src/Squidex.Web/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs @@ -13,7 +13,7 @@ using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public sealed class EnrichWithAppIdCommandMiddleware : ICommandMiddleware { diff --git a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs b/src/Squidex.Web/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs similarity index 98% rename from src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs rename to src/Squidex.Web/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs index f2d5ae42b..672a16b74 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs +++ b/src/Squidex.Web/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs @@ -14,7 +14,7 @@ using Squidex.Domain.Apps.Entities.Schemas.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public sealed class EnrichWithSchemaIdCommandMiddleware : ICommandMiddleware { diff --git a/src/Squidex/Config/Constants.cs b/src/Squidex.Web/Constants.cs similarity index 94% rename from src/Squidex/Config/Constants.cs rename to src/Squidex.Web/Constants.cs index 84cd529e3..23535e548 100644 --- a/src/Squidex/Config/Constants.cs +++ b/src/Squidex.Web/Constants.cs @@ -5,9 +5,9 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using IdentityServer4.Models; +using Squidex.Infrastructure; -namespace Squidex.Config +namespace Squidex.Web { public static class Constants { @@ -33,7 +33,7 @@ namespace Squidex.Config public static readonly string InternalClientId = "squidex-internal"; - public static readonly string InternalClientSecret = "squidex-internal".Sha256(); + public static readonly string InternalClientSecret = "squidex-internal".Sha256Base64(); public static readonly string IdentityServerPrefix = "/identity-server"; } diff --git a/src/Squidex/Pipeline/ETagExtensions.cs b/src/Squidex.Web/ETagExtensions.cs similarity index 98% rename from src/Squidex/Pipeline/ETagExtensions.cs rename to src/Squidex.Web/ETagExtensions.cs index d9f1d726c..5ee961a9d 100644 --- a/src/Squidex/Pipeline/ETagExtensions.cs +++ b/src/Squidex.Web/ETagExtensions.cs @@ -11,7 +11,7 @@ using System.Text; using Squidex.Infrastructure; using Squidex.Infrastructure.Log; -namespace Squidex.Pipeline +namespace Squidex.Web { public static class ETagExtensions { diff --git a/src/Squidex/Pipeline/ETagFilter.cs b/src/Squidex.Web/ETagFilter.cs similarity index 98% rename from src/Squidex/Pipeline/ETagFilter.cs rename to src/Squidex.Web/ETagFilter.cs index d14561734..b76772ad3 100644 --- a/src/Squidex/Pipeline/ETagFilter.cs +++ b/src/Squidex.Web/ETagFilter.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class ETagFilter : IAsyncActionFilter { diff --git a/src/Squidex/Pipeline/ETagOptions.cs b/src/Squidex.Web/ETagOptions.cs similarity index 94% rename from src/Squidex/Pipeline/ETagOptions.cs rename to src/Squidex.Web/ETagOptions.cs index c54288e77..8e832dbca 100644 --- a/src/Squidex/Pipeline/ETagOptions.cs +++ b/src/Squidex.Web/ETagOptions.cs @@ -5,7 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class ETagOptions { diff --git a/src/Squidex/Pipeline/EntityCreatedDto.cs b/src/Squidex.Web/EntityCreatedDto.cs similarity index 80% rename from src/Squidex/Pipeline/EntityCreatedDto.cs rename to src/Squidex.Web/EntityCreatedDto.cs index 9b768e652..95738823d 100644 --- a/src/Squidex/Pipeline/EntityCreatedDto.cs +++ b/src/Squidex.Web/EntityCreatedDto.cs @@ -8,19 +8,15 @@ using System.ComponentModel.DataAnnotations; using Squidex.Infrastructure.Commands; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class EntityCreatedDto { - /// - /// Id of the created entity. - /// [Required] + [Display(Description = "Id of the created entity.")] public string Id { get; set; } - - /// - /// The new version of the entity. - /// + + [Display(Description = "The new version of the entity.")] public long Version { get; set; } public static EntityCreatedDto FromResult(EntityCreatedResult result) diff --git a/src/Squidex/Pipeline/ErrorDto.cs b/src/Squidex.Web/ErrorDto.cs similarity index 69% rename from src/Squidex/Pipeline/ErrorDto.cs rename to src/Squidex.Web/ErrorDto.cs index 535a9e602..2d3e8f6be 100644 --- a/src/Squidex/Pipeline/ErrorDto.cs +++ b/src/Squidex.Web/ErrorDto.cs @@ -7,24 +7,18 @@ using System.ComponentModel.DataAnnotations; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class ErrorDto { - /// - /// Error message. - /// [Required] + [Display(Description = "Error message.")] public string Message { get; set; } - - /// - /// Detailed error messages. - /// + + [Display(Description = "Detailed error messages.")] public string[] Details { get; set; } - - /// - /// Status code of the http response. - /// + + [Display(Description = "Status code of the http response.")] public int? StatusCode { get; set; } = 400; } } diff --git a/src/Squidex/Pipeline/Extensions.cs b/src/Squidex.Web/Extensions.cs similarity index 96% rename from src/Squidex/Pipeline/Extensions.cs rename to src/Squidex.Web/Extensions.cs index 98f693727..b7f7594bf 100644 --- a/src/Squidex/Pipeline/Extensions.cs +++ b/src/Squidex.Web/Extensions.cs @@ -6,10 +6,9 @@ // ========================================================================== using System.Security.Claims; -using Squidex.Config; using Squidex.Infrastructure.Security; -namespace Squidex.Pipeline +namespace Squidex.Web { public static class Extensions { diff --git a/src/Squidex/Pipeline/FileCallbackResult.cs b/src/Squidex.Web/FileCallbackResult.cs similarity index 93% rename from src/Squidex/Pipeline/FileCallbackResult.cs rename to src/Squidex.Web/FileCallbackResult.cs index 5cc764a99..5ca752eea 100644 --- a/src/Squidex/Pipeline/FileCallbackResult.cs +++ b/src/Squidex.Web/FileCallbackResult.cs @@ -10,8 +10,9 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; +using Squidex.Web.Pipeline; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class FileCallbackResult : FileResult { diff --git a/src/Squidex/Pipeline/IApiCostsFeature.cs b/src/Squidex.Web/IApiCostsFeature.cs similarity index 94% rename from src/Squidex/Pipeline/IApiCostsFeature.cs rename to src/Squidex.Web/IApiCostsFeature.cs index f4cfa1b97..9f1e380f5 100644 --- a/src/Squidex/Pipeline/IApiCostsFeature.cs +++ b/src/Squidex.Web/IApiCostsFeature.cs @@ -5,7 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -namespace Squidex.Pipeline +namespace Squidex.Web { public interface IApiCostsFeature { diff --git a/src/Squidex/Pipeline/IAppFeature.cs b/src/Squidex.Web/IAppFeature.cs similarity index 94% rename from src/Squidex/Pipeline/IAppFeature.cs rename to src/Squidex.Web/IAppFeature.cs index d8a23b925..a798da598 100644 --- a/src/Squidex/Pipeline/IAppFeature.cs +++ b/src/Squidex.Web/IAppFeature.cs @@ -7,7 +7,7 @@ using Squidex.Domain.Apps.Entities.Apps; -namespace Squidex.Pipeline +namespace Squidex.Web { public interface IAppFeature { diff --git a/src/Squidex/Pipeline/IGenerateEtag.cs b/src/Squidex.Web/IGenerateEtag.cs similarity index 94% rename from src/Squidex/Pipeline/IGenerateEtag.cs rename to src/Squidex.Web/IGenerateEtag.cs index e1f0c8789..6986f1acc 100644 --- a/src/Squidex/Pipeline/IGenerateEtag.cs +++ b/src/Squidex.Web/IGenerateEtag.cs @@ -7,7 +7,7 @@ using System; -namespace Squidex.Pipeline +namespace Squidex.Web { public interface IGenerateETag { diff --git a/src/Squidex/Pipeline/MeasureResultFilter.cs b/src/Squidex.Web/MeasureResultFilter.cs similarity index 97% rename from src/Squidex/Pipeline/MeasureResultFilter.cs rename to src/Squidex.Web/MeasureResultFilter.cs index 2d22afd65..de2220f32 100644 --- a/src/Squidex/Pipeline/MeasureResultFilter.cs +++ b/src/Squidex.Web/MeasureResultFilter.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Filters; using Squidex.Infrastructure.Log; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class MeasureResultFilter : IAsyncResultFilter, IAsyncActionFilter { diff --git a/src/Squidex/Areas/Api/Controllers/MyJsonInheritanceConverter.cs b/src/Squidex.Web/MyJsonInheritanceConverter.cs similarity index 98% rename from src/Squidex/Areas/Api/Controllers/MyJsonInheritanceConverter.cs rename to src/Squidex.Web/MyJsonInheritanceConverter.cs index ed16e20b3..ff3a1854e 100644 --- a/src/Squidex/Areas/Api/Controllers/MyJsonInheritanceConverter.cs +++ b/src/Squidex.Web/MyJsonInheritanceConverter.cs @@ -16,7 +16,7 @@ using Squidex.Infrastructure; #pragma warning disable RECS0108 // Warns about static fields in generic types -namespace Squidex.Areas.Api.Controllers +namespace Squidex.Web { public class MyJsonInheritanceConverter : JsonInheritanceConverter { diff --git a/src/Squidex/Pipeline/ActionContextLogAppender.cs b/src/Squidex.Web/Pipeline/ActionContextLogAppender.cs similarity index 93% rename from src/Squidex/Pipeline/ActionContextLogAppender.cs rename to src/Squidex.Web/Pipeline/ActionContextLogAppender.cs index 97c6060b3..8db6973d1 100644 --- a/src/Squidex/Pipeline/ActionContextLogAppender.cs +++ b/src/Squidex.Web/Pipeline/ActionContextLogAppender.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Infrastructure; using Squidex.Infrastructure.Log; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class ActionContextLogAppender : ILogAppender { @@ -57,9 +57,9 @@ namespace Squidex.Pipeline { w.WriteObject("routeValues", actionContext.ActionDescriptor.RouteValues, (routeValues, r) => { - foreach (var (key, val) in routeValues) + foreach (var kvp in routeValues) { - r.WriteProperty(key, val); + r.WriteProperty(kvp.Key, kvp.Value); } }); } diff --git a/src/Squidex/Pipeline/ApiCostsFilter.cs b/src/Squidex.Web/Pipeline/ApiCostsFilter.cs similarity index 98% rename from src/Squidex/Pipeline/ApiCostsFilter.cs rename to src/Squidex.Web/Pipeline/ApiCostsFilter.cs index 2dc93f326..0859a26c3 100644 --- a/src/Squidex/Pipeline/ApiCostsFilter.cs +++ b/src/Squidex.Web/Pipeline/ApiCostsFilter.cs @@ -15,7 +15,7 @@ using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Security; using Squidex.Infrastructure.UsageTracking; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class ApiCostsFilter : IAsyncActionFilter, IFilterContainer { diff --git a/src/Squidex/Pipeline/ApiPermissionUnifier.cs b/src/Squidex.Web/Pipeline/ApiPermissionUnifier.cs similarity index 97% rename from src/Squidex/Pipeline/ApiPermissionUnifier.cs rename to src/Squidex.Web/Pipeline/ApiPermissionUnifier.cs index 98be130af..1751b1241 100644 --- a/src/Squidex/Pipeline/ApiPermissionUnifier.cs +++ b/src/Squidex.Web/Pipeline/ApiPermissionUnifier.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Authentication; using Squidex.Shared; using Squidex.Shared.Identity; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class ApiPermissionUnifier : IClaimsTransformation { diff --git a/src/Squidex/Pipeline/AppResolver.cs b/src/Squidex.Web/Pipeline/AppResolver.cs similarity index 99% rename from src/Squidex/Pipeline/AppResolver.cs rename to src/Squidex.Web/Pipeline/AppResolver.cs index 705bfae79..bafbbe24c 100644 --- a/src/Squidex/Pipeline/AppResolver.cs +++ b/src/Squidex.Web/Pipeline/AppResolver.cs @@ -17,7 +17,7 @@ using Squidex.Infrastructure.Security; using Squidex.Shared; using Squidex.Shared.Identity; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class AppResolver : IAsyncActionFilter { diff --git a/src/Squidex/Pipeline/CleanupHostMiddleware.cs b/src/Squidex.Web/Pipeline/CleanupHostMiddleware.cs similarity index 97% rename from src/Squidex/Pipeline/CleanupHostMiddleware.cs rename to src/Squidex.Web/Pipeline/CleanupHostMiddleware.cs index 504a5a455..82c98ad21 100644 --- a/src/Squidex/Pipeline/CleanupHostMiddleware.cs +++ b/src/Squidex.Web/Pipeline/CleanupHostMiddleware.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public class CleanupHostMiddleware { diff --git a/src/Squidex/Pipeline/EnforceHttpsMiddleware.cs b/src/Squidex.Web/Pipeline/EnforceHttpsMiddleware.cs similarity index 88% rename from src/Squidex/Pipeline/EnforceHttpsMiddleware.cs rename to src/Squidex.Web/Pipeline/EnforceHttpsMiddleware.cs index 4f4c6158e..499b683f2 100644 --- a/src/Squidex/Pipeline/EnforceHttpsMiddleware.cs +++ b/src/Squidex.Web/Pipeline/EnforceHttpsMiddleware.cs @@ -9,15 +9,14 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; -using Squidex.Config; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class EnforceHttpsMiddleware : IMiddleware { - private readonly IOptions urls; + private readonly IOptions urls; - public EnforceHttpsMiddleware(IOptions urls) + public EnforceHttpsMiddleware(IOptions urls) { this.urls = urls; } diff --git a/src/Squidex/Pipeline/FileCallbackResultExecutor.cs b/src/Squidex.Web/Pipeline/FileCallbackResultExecutor.cs similarity index 97% rename from src/Squidex/Pipeline/FileCallbackResultExecutor.cs rename to src/Squidex.Web/Pipeline/FileCallbackResultExecutor.cs index 5033af37f..fc8b011d7 100644 --- a/src/Squidex/Pipeline/FileCallbackResultExecutor.cs +++ b/src/Squidex.Web/Pipeline/FileCallbackResultExecutor.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.Extensions.Logging; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class FileCallbackResultExecutor : FileResultExecutorBase { diff --git a/src/Squidex/Pipeline/LocalCacheMiddleware.cs b/src/Squidex.Web/Pipeline/LocalCacheMiddleware.cs similarity index 97% rename from src/Squidex/Pipeline/LocalCacheMiddleware.cs rename to src/Squidex.Web/Pipeline/LocalCacheMiddleware.cs index 064e6a520..b9f050191 100644 --- a/src/Squidex/Pipeline/LocalCacheMiddleware.cs +++ b/src/Squidex.Web/Pipeline/LocalCacheMiddleware.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Http; using Squidex.Infrastructure; using Squidex.Infrastructure.Caching; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class LocalCacheMiddleware : IMiddleware { diff --git a/src/Squidex/Pipeline/RequestLogPerformanceMiddleware.cs b/src/Squidex.Web/Pipeline/RequestLogPerformanceMiddleware.cs similarity index 98% rename from src/Squidex/Pipeline/RequestLogPerformanceMiddleware.cs rename to src/Squidex.Web/Pipeline/RequestLogPerformanceMiddleware.cs index 87915019a..c2e3c7006 100644 --- a/src/Squidex/Pipeline/RequestLogPerformanceMiddleware.cs +++ b/src/Squidex.Web/Pipeline/RequestLogPerformanceMiddleware.cs @@ -11,7 +11,7 @@ using Squidex.Infrastructure; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Security; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class RequestLogPerformanceMiddleware : IMiddleware { diff --git a/src/Squidex/Pipeline/UrlGenerator.cs b/src/Squidex.Web/Services/UrlGenerator.cs similarity index 92% rename from src/Squidex/Pipeline/UrlGenerator.cs rename to src/Squidex.Web/Services/UrlGenerator.cs index d2c1266e7..ef2bab32d 100644 --- a/src/Squidex/Pipeline/UrlGenerator.cs +++ b/src/Squidex.Web/Services/UrlGenerator.cs @@ -7,7 +7,6 @@ using System; using Microsoft.Extensions.Options; -using Squidex.Config; using Squidex.Domain.Apps.Core.ConvertContent; using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Entities.Apps; @@ -18,16 +17,16 @@ using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; -namespace Squidex.Pipeline +namespace Squidex.Web.Services { public sealed class UrlGenerator : IGraphQLUrlGenerator, IRuleUrlGenerator, IAssetUrlGenerator { private readonly IAssetStore assetStore; - private readonly MyUrlsOptions urlsOptions; + private readonly UrlsOptions urlsOptions; public bool CanGenerateAssetSourceUrl { get; } - public UrlGenerator(IOptions urlsOptions, IAssetStore assetStore, bool allowAssetSourceUrl) + public UrlGenerator(IOptions urlsOptions, IAssetStore assetStore, bool allowAssetSourceUrl) { this.assetStore = assetStore; this.urlsOptions = urlsOptions.Value; diff --git a/src/Squidex.Web/Squidex.Web.csproj b/src/Squidex.Web/Squidex.Web.csproj new file mode 100644 index 000000000..bbe645f13 --- /dev/null +++ b/src/Squidex.Web/Squidex.Web.csproj @@ -0,0 +1,23 @@ + + + netstandard2.0 + 7.3 + + + full + True + + + + + + + + + + ..\..\Squidex.ruleset + + + + + diff --git a/src/Squidex/Config/MyUrlsOptions.cs b/src/Squidex.Web/UrlsOptions.cs similarity index 93% rename from src/Squidex/Config/MyUrlsOptions.cs rename to src/Squidex.Web/UrlsOptions.cs index 32e4022c0..b45390301 100644 --- a/src/Squidex/Config/MyUrlsOptions.cs +++ b/src/Squidex.Web/UrlsOptions.cs @@ -7,9 +7,9 @@ using Squidex.Infrastructure; -namespace Squidex.Config +namespace Squidex.Web { - public sealed class MyUrlsOptions + public sealed class UrlsOptions { public bool EnforceHTTPS { get; set; } diff --git a/src/Squidex/Config/MyUsageOptions.cs b/src/Squidex.Web/UsageOptions.cs similarity index 89% rename from src/Squidex/Config/MyUsageOptions.cs rename to src/Squidex.Web/UsageOptions.cs index 339c665bc..c9502e38e 100644 --- a/src/Squidex/Config/MyUsageOptions.cs +++ b/src/Squidex.Web/UsageOptions.cs @@ -7,9 +7,9 @@ using Squidex.Domain.Apps.Entities.Apps.Services.Implementations; -namespace Squidex.Config +namespace Squidex.Web { - public class MyUsageOptions + public sealed class UsageOptions { public ConfigAppLimitsPlan[] Plans { get; set; } } diff --git a/src/Squidex/Areas/Api/Config/Swagger/ScopesProcessor.cs b/src/Squidex/Areas/Api/Config/Swagger/ScopesProcessor.cs index e0d01097e..9bd4f0b70 100644 --- a/src/Squidex/Areas/Api/Config/Swagger/ScopesProcessor.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/ScopesProcessor.cs @@ -13,9 +13,8 @@ using Microsoft.AspNetCore.Authorization; using NSwag; using NSwag.SwaggerGeneration.Processors; using NSwag.SwaggerGeneration.Processors.Contexts; -using Squidex.Config; using Squidex.Infrastructure.Tasks; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Config.Swagger { diff --git a/src/Squidex/Areas/Api/Config/Swagger/SecurityProcessor.cs b/src/Squidex/Areas/Api/Config/Swagger/SecurityProcessor.cs index 9133a2e86..2b5b5b24c 100644 --- a/src/Squidex/Areas/Api/Config/Swagger/SecurityProcessor.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/SecurityProcessor.cs @@ -9,19 +9,19 @@ using System.Collections.Generic; using Microsoft.Extensions.Options; using NSwag; using NSwag.SwaggerGeneration.Processors.Security; -using Squidex.Config; using Squidex.Pipeline.Swagger; +using Squidex.Web; namespace Squidex.Areas.Api.Config.Swagger { public class SecurityProcessor : SecurityDefinitionAppender { - public SecurityProcessor(IOptions urlOptions) + public SecurityProcessor(IOptions urlOptions) : base(Constants.SecurityDefinition, CreateOAuthSchema(urlOptions.Value)) { } - private static SwaggerSecurityScheme CreateOAuthSchema(MyUrlsOptions urlOptions) + private static SwaggerSecurityScheme CreateOAuthSchema(UrlsOptions urlOptions) { var securityScheme = new SwaggerSecurityScheme(); diff --git a/src/Squidex/Areas/Api/Config/Swagger/ThemeProcessor.cs b/src/Squidex/Areas/Api/Config/Swagger/ThemeProcessor.cs index b69e54972..bc5106af9 100644 --- a/src/Squidex/Areas/Api/Config/Swagger/ThemeProcessor.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/ThemeProcessor.cs @@ -10,8 +10,8 @@ using System.Threading.Tasks; using Microsoft.Extensions.Options; using NSwag.SwaggerGeneration.Processors; using NSwag.SwaggerGeneration.Processors.Contexts; -using Squidex.Config; using Squidex.Infrastructure.Tasks; +using Squidex.Web; namespace Squidex.Areas.Api.Config.Swagger { @@ -21,7 +21,7 @@ namespace Squidex.Areas.Api.Config.Swagger private readonly string url; - public ThemeProcessor(IOptions urlOptions) + public ThemeProcessor(IOptions urlOptions) { url = urlOptions.Value.BuildUrl("images/logo-white.png", false); } diff --git a/src/Squidex/Areas/Api/Controllers/ApiController.cs b/src/Squidex/Areas/Api/Controllers/ApiController.cs index e991604c3..03ccc89c1 100644 --- a/src/Squidex/Areas/Api/Controllers/ApiController.cs +++ b/src/Squidex/Areas/Api/Controllers/ApiController.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs index 085170779..f60427864 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs @@ -12,8 +12,8 @@ using Microsoft.Net.Http.Headers; using Squidex.Areas.Api.Controllers.Apps.Models; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs index 571d9be66..d8af9f53b 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs @@ -13,8 +13,8 @@ using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs index 4165652f7..17ce8c320 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs @@ -13,8 +13,8 @@ using Squidex.Areas.Api.Controllers.Apps.Models; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs index a31267774..29783a09e 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs @@ -13,8 +13,8 @@ using Microsoft.Net.Http.Headers; using Squidex.Areas.Api.Controllers.Apps.Models; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs index a8aacc1ba..e146c90b3 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs @@ -13,8 +13,8 @@ using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs index fb765658c..4219f42dd 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs @@ -16,9 +16,9 @@ using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Security; -using Squidex.Pipeline; using Squidex.Shared; using Squidex.Shared.Identity; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs index e2245fb41..7fe96d7bc 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs @@ -14,8 +14,8 @@ using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Infrastructure; using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Security; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs index a83185c66..9475c951d 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs @@ -15,7 +15,7 @@ using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Log; -using Squidex.Pipeline; +using Squidex.Web; #pragma warning disable 1573 diff --git a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs index d467d6543..0d00940d3 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs @@ -23,8 +23,8 @@ using Squidex.Domain.Apps.Entities.Assets.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Assets { diff --git a/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs b/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs index e0ce409c5..733a3ab18 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs @@ -12,7 +12,7 @@ using NodaTime; using Squidex.Domain.Apps.Entities.Assets; using Squidex.Infrastructure; using Squidex.Infrastructure.Reflection; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Assets.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs b/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs index ba2dbe410..25c965033 100644 --- a/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs +++ b/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Backups { diff --git a/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs b/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs index 3c433fbdb..0198fa186 100644 --- a/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs @@ -15,8 +15,8 @@ using Squidex.Domain.Apps.Entities.Backup; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Tasks; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Backups { diff --git a/src/Squidex/Areas/Api/Controllers/Backups/RestoreController.cs b/src/Squidex/Areas/Api/Controllers/Backups/RestoreController.cs index d564e8d11..6ad1cf1c0 100644 --- a/src/Squidex/Areas/Api/Controllers/Backups/RestoreController.cs +++ b/src/Squidex/Areas/Api/Controllers/Backups/RestoreController.cs @@ -13,8 +13,8 @@ using Squidex.Domain.Apps.Entities.Backup; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Orleans; using Squidex.Infrastructure.Security; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Backups { diff --git a/src/Squidex/Areas/Api/Controllers/Comments/CommentsController.cs b/src/Squidex/Areas/Api/Controllers/Comments/CommentsController.cs index 281c63f67..5603ec207 100644 --- a/src/Squidex/Areas/Api/Controllers/Comments/CommentsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Comments/CommentsController.cs @@ -15,8 +15,8 @@ using Squidex.Domain.Apps.Entities.Comments; using Squidex.Domain.Apps.Entities.Comments.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Comments { diff --git a/src/Squidex/Areas/Api/Controllers/Contents/ContentSwaggerController.cs b/src/Squidex/Areas/Api/Controllers/Contents/ContentSwaggerController.cs index aaf2aadf3..c06a178c5 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/ContentSwaggerController.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/ContentSwaggerController.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc; using Squidex.Areas.Api.Controllers.Contents.Generator; using Squidex.Domain.Apps.Entities; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Contents { diff --git a/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs b/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs index 4ea013deb..ec36149e1 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs @@ -20,9 +20,9 @@ using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Domain.Apps.Entities.Contents.GraphQL; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; using Squidex.Shared.Identity; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Contents { diff --git a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs index 6f5812945..7809731b0 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs @@ -10,13 +10,13 @@ using System.Collections.Generic; using System.Linq; using NJsonSchema; using NSwag; -using Squidex.Config; using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.GenerateJsonSchema; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Infrastructure; using Squidex.Pipeline.Swagger; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Contents.Generator { diff --git a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasSwaggerGenerator.cs b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasSwaggerGenerator.cs index 0ab353afb..e2e7a8d2c 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasSwaggerGenerator.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasSwaggerGenerator.cs @@ -18,23 +18,23 @@ using NSwag.SwaggerGeneration; using NSwag.SwaggerGeneration.Processors; using NSwag.SwaggerGeneration.Processors.Contexts; using Squidex.Areas.Api.Config.Swagger; -using Squidex.Config; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Pipeline.Swagger; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Contents.Generator { public sealed class SchemasSwaggerGenerator { - private readonly MyUrlsOptions urlOptions; + private readonly UrlsOptions urlOptions; private readonly SwaggerDocumentSettings settings = new SwaggerDocumentSettings(); private SwaggerJsonSchemaGenerator schemaGenerator; private SwaggerDocument document; private JsonSchemaResolver schemaResolver; - public SchemasSwaggerGenerator(IOptions urlOptions, IEnumerable documentProcessors) + public SchemasSwaggerGenerator(IOptions urlOptions, IEnumerable documentProcessors) { this.urlOptions = urlOptions.Value; diff --git a/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs b/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs index 12fdd6cb4..5e896298b 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs @@ -16,7 +16,7 @@ using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Reflection; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Contents.Models { diff --git a/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs b/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs index f8a2c9d0d..1369eb9c7 100644 --- a/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs +++ b/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs @@ -13,8 +13,8 @@ using Squidex.Areas.Api.Controllers.EventConsumers.Models; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.EventSourcing.Grains; using Squidex.Infrastructure.Orleans; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.EventConsumers { diff --git a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs index e09a2aa94..bb5b5fc57 100644 --- a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs +++ b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs @@ -11,8 +11,8 @@ using Squidex.Areas.Api.Controllers.History.Models; using Squidex.Domain.Apps.Entities.History; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.History { diff --git a/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs b/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs index 77ca6fed2..85f5c5133 100644 --- a/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Net.Http.Headers; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Languages { diff --git a/src/Squidex/Areas/Api/Controllers/News/NewsController.cs b/src/Squidex/Areas/Api/Controllers/News/NewsController.cs index e80dc19b7..f163227f0 100644 --- a/src/Squidex/Areas/Api/Controllers/News/NewsController.cs +++ b/src/Squidex/Areas/Api/Controllers/News/NewsController.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc; using Squidex.Areas.Api.Controllers.News.Models; using Squidex.Areas.Api.Controllers.News.Service; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.News { diff --git a/src/Squidex/Areas/Api/Controllers/Ping/PingController.cs b/src/Squidex/Areas/Api/Controllers/Ping/PingController.cs index c27e14477..22a0254ad 100644 --- a/src/Squidex/Areas/Api/Controllers/Ping/PingController.cs +++ b/src/Squidex/Areas/Api/Controllers/Ping/PingController.cs @@ -7,8 +7,8 @@ using Microsoft.AspNetCore.Mvc; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Ping { diff --git a/src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs b/src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs index 5b5a8fe65..9490a4f48 100644 --- a/src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs +++ b/src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs @@ -11,8 +11,8 @@ using Microsoft.Net.Http.Headers; using Squidex.Areas.Api.Controllers.Plans.Models; using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Plans { diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs index 50b4446e0..8f1da7b9e 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using Squidex.Domain.Apps.Core.Rules; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Rules.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs index a782c9e2d..4ee256530 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs @@ -14,7 +14,7 @@ using Squidex.Domain.Apps.Core.Rules; using Squidex.Domain.Apps.Entities.Rules; using Squidex.Infrastructure; using Squidex.Infrastructure.Reflection; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Rules.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleTriggerDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleTriggerDto.cs index 7671db829..9ac6cd699 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleTriggerDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleTriggerDto.cs @@ -10,6 +10,7 @@ using System.Linq; using System.Runtime.Serialization; using Newtonsoft.Json; using Squidex.Domain.Apps.Core.Rules; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Rules.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs index edecc7b6f..b657ef1cf 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs @@ -19,8 +19,8 @@ using Squidex.Domain.Apps.Entities.Rules.Commands; using Squidex.Domain.Apps.Entities.Rules.Repositories; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Rules { diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldPropertiesDto.cs index afb21c6b9..02376143b 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldPropertiesDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldPropertiesDto.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Runtime.Serialization; using Newtonsoft.Json; using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Schemas.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs index 73794552f..f66d64d23 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs @@ -11,7 +11,7 @@ using NodaTime; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Infrastructure.Reflection; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Schemas.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs b/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs index 048607c97..74a36f916 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs @@ -10,8 +10,8 @@ using Microsoft.AspNetCore.Mvc; using Squidex.Areas.Api.Controllers.Schemas.Models; using Squidex.Domain.Apps.Entities.Schemas.Commands; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Schemas { diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs b/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs index 777495ffd..1fb64ec83 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs @@ -15,8 +15,8 @@ using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Domain.Apps.Entities.Schemas.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Schemas { diff --git a/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs b/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs index 86287b9b0..d7a7f4eaa 100644 --- a/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs @@ -13,14 +13,13 @@ using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using Squidex.Areas.Api.Controllers.Statistics.Models; -using Squidex.Config; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Domain.Apps.Entities.Assets; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.UsageTracking; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Statistics { @@ -35,7 +34,7 @@ namespace Squidex.Areas.Api.Controllers.Statistics private readonly IAppPlansProvider appPlansProvider; private readonly IAssetUsageTracker assetStatsRepository; private readonly IDataProtector dataProtector; - private readonly MyUrlsOptions urlsOptions; + private readonly UrlsOptions urlsOptions; public UsagesController( ICommandBus commandBus, @@ -44,7 +43,7 @@ namespace Squidex.Areas.Api.Controllers.Statistics IAppPlansProvider appPlansProvider, IAssetUsageTracker assetStatsRepository, IDataProtectionProvider dataProtection, - IOptions urlsOptions) + IOptions urlsOptions) : base(commandBus) { this.usageTracker = usageTracker; diff --git a/src/Squidex/Areas/Api/Controllers/Translations/TranslationsController.cs b/src/Squidex/Areas/Api/Controllers/Translations/TranslationsController.cs index e5fbe040e..5fc5cd8e4 100644 --- a/src/Squidex/Areas/Api/Controllers/Translations/TranslationsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Translations/TranslationsController.cs @@ -10,8 +10,8 @@ using Microsoft.AspNetCore.Mvc; using Squidex.Areas.Api.Controllers.Translations.Models; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Translations; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Translations { diff --git a/src/Squidex/Config/MyUIOptions.cs b/src/Squidex/Areas/Api/Controllers/UI/MyUIOptions.cs similarity index 95% rename from src/Squidex/Config/MyUIOptions.cs rename to src/Squidex/Areas/Api/Controllers/UI/MyUIOptions.cs index 5ac51ece4..5d87d6df8 100644 --- a/src/Squidex/Config/MyUIOptions.cs +++ b/src/Squidex/Areas/Api/Controllers/UI/MyUIOptions.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; -namespace Squidex.Config +namespace Squidex.Areas.Api.Controllers.UI { public sealed class MyUIOptions { diff --git a/src/Squidex/Areas/Api/Controllers/UI/UIController.cs b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs index 635f620ac..1de619114 100644 --- a/src/Squidex/Areas/Api/Controllers/UI/UIController.cs +++ b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs @@ -10,11 +10,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using Orleans; using Squidex.Areas.Api.Controllers.UI.Models; -using Squidex.Config; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Orleans; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.UI { diff --git a/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs b/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs index ef7e8cb65..7d547be14 100644 --- a/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs +++ b/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs @@ -15,8 +15,8 @@ using Squidex.Domain.Users; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Security; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Users { diff --git a/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs b/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs index ea9cc4de7..406510caf 100644 --- a/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs +++ b/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs @@ -15,8 +15,8 @@ using Squidex.Areas.Api.Controllers.Users.Models; using Squidex.Domain.Users; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Log; -using Squidex.Pipeline; using Squidex.Shared.Users; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Users { diff --git a/src/Squidex/Areas/Api/Startup.cs b/src/Squidex/Areas/Api/Startup.cs index 5d2cefaa6..55e2383fc 100644 --- a/src/Squidex/Areas/Api/Startup.cs +++ b/src/Squidex/Areas/Api/Startup.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Builder; using Squidex.Areas.Api.Config.Swagger; -using Squidex.Config; +using Squidex.Web; namespace Squidex.Areas.Api { diff --git a/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs b/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs index ef07a13b6..8ede8a1bb 100644 --- a/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs +++ b/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs @@ -16,9 +16,9 @@ using Microsoft.AspNetCore.DataProtection.Repositories; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Squidex.Config; using Squidex.Domain.Users; using Squidex.Shared.Identity; +using Squidex.Web; namespace Squidex.Areas.IdentityServer.Config { diff --git a/src/Squidex/Areas/IdentityServer/Config/LazyClientStore.cs b/src/Squidex/Areas/IdentityServer/Config/LazyClientStore.cs index af60dc5e3..c4b619466 100644 --- a/src/Squidex/Areas/IdentityServer/Config/LazyClientStore.cs +++ b/src/Squidex/Areas/IdentityServer/Config/LazyClientStore.cs @@ -17,9 +17,9 @@ using Squidex.Config; using Squidex.Domain.Apps.Core.Apps; using Squidex.Domain.Apps.Entities; using Squidex.Infrastructure; -using Squidex.Pipeline; using Squidex.Shared; using Squidex.Shared.Identity; +using Squidex.Web; namespace Squidex.Areas.IdentityServer.Config { @@ -29,7 +29,7 @@ namespace Squidex.Areas.IdentityServer.Config private readonly Dictionary staticClients = new Dictionary(StringComparer.OrdinalIgnoreCase); public LazyClientStore( - IOptions urlsOptions, + IOptions urlsOptions, IOptions identityOptions, IAppProvider appProvider) { @@ -89,7 +89,7 @@ namespace Squidex.Areas.IdentityServer.Config }; } - private void CreateStaticClients(IOptions urlsOptions, IOptions identityOptions) + private void CreateStaticClients(IOptions urlsOptions, IOptions identityOptions) { foreach (var client in CreateStaticClients(urlsOptions.Value, identityOptions.Value)) { @@ -97,7 +97,7 @@ namespace Squidex.Areas.IdentityServer.Config } } - private static IEnumerable CreateStaticClients(MyUrlsOptions urlsOptions, MyIdentityOptions identityOptions) + private static IEnumerable CreateStaticClients(UrlsOptions urlsOptions, MyIdentityOptions identityOptions) { var frontendId = Constants.FrontendClient; diff --git a/src/Squidex/Areas/IdentityServer/Startup.cs b/src/Squidex/Areas/IdentityServer/Startup.cs index e98f0aff3..d46ab509e 100644 --- a/src/Squidex/Areas/IdentityServer/Startup.cs +++ b/src/Squidex/Areas/IdentityServer/Startup.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Squidex.Areas.IdentityServer.Config; -using Squidex.Config; +using Squidex.Web; namespace Squidex.Areas.IdentityServer { diff --git a/src/Squidex/Areas/OrleansDashboard/Startup.cs b/src/Squidex/Areas/OrleansDashboard/Startup.cs index d8b5da6f8..943057450 100644 --- a/src/Squidex/Areas/OrleansDashboard/Startup.cs +++ b/src/Squidex/Areas/OrleansDashboard/Startup.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Builder; using Orleans; using Squidex.Areas.OrleansDashboard.Middlewares; -using Squidex.Config; +using Squidex.Web; namespace Squidex.Areas.OrleansDashboard { diff --git a/src/Squidex/Areas/Portal/Startup.cs b/src/Squidex/Areas/Portal/Startup.cs index 70490676a..88cc7646b 100644 --- a/src/Squidex/Areas/Portal/Startup.cs +++ b/src/Squidex/Areas/Portal/Startup.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Builder; using Squidex.Areas.Portal.Middlewares; -using Squidex.Config; +using Squidex.Web; namespace Squidex.Areas.Portal { diff --git a/src/Squidex/Config/Authentication/IdentityServerServices.cs b/src/Squidex/Config/Authentication/IdentityServerServices.cs index bcf0b9916..deb1a9ad1 100644 --- a/src/Squidex/Config/Authentication/IdentityServerServices.cs +++ b/src/Squidex/Config/Authentication/IdentityServerServices.cs @@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Infrastructure; +using Squidex.Web; namespace Squidex.Config.Authentication { @@ -20,7 +21,7 @@ namespace Squidex.Config.Authentication { var apiScope = Constants.ApiScope; - var urlsOptions = config.GetSection("urls").Get(); + var urlsOptions = config.GetSection("urls").Get(); if (!string.IsNullOrWhiteSpace(urlsOptions.BaseUrl)) { diff --git a/src/Squidex/Config/Authentication/OidcServices.cs b/src/Squidex/Config/Authentication/OidcServices.cs index 9d344601b..533baa295 100644 --- a/src/Squidex/Config/Authentication/OidcServices.cs +++ b/src/Squidex/Config/Authentication/OidcServices.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.Extensions.DependencyInjection; +using Squidex.Web; namespace Squidex.Config.Authentication { diff --git a/src/Squidex/Config/Domain/EntitiesServices.cs b/src/Squidex/Config/Domain/EntitiesServices.cs index 0ae7ce401..5f9f788db 100644 --- a/src/Squidex/Config/Domain/EntitiesServices.cs +++ b/src/Squidex/Config/Domain/EntitiesServices.cs @@ -12,6 +12,7 @@ using Microsoft.Extensions.Options; using Migrate_01; using Migrate_01.Migrations; using Orleans; +using Squidex.Areas.Api.Controllers.UI; using Squidex.Domain.Apps.Core.Apps; using Squidex.Domain.Apps.Core.ConvertContent; using Squidex.Domain.Apps.Core.HandleRules; @@ -44,11 +45,11 @@ using Squidex.Domain.Apps.Entities.Tags; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.EventSourcing; -using Squidex.Infrastructure.EventSourcing.Grains; using Squidex.Infrastructure.Migrations; using Squidex.Infrastructure.Orleans; -using Squidex.Pipeline; -using Squidex.Pipeline.CommandMiddlewares; +using Squidex.Web; +using Squidex.Web.CommandMiddlewares; +using Squidex.Web.Services; namespace Squidex.Config.Domain { @@ -59,7 +60,7 @@ namespace Squidex.Config.Domain var exposeSourceUrl = config.GetOptionalValue("assetStore:exposeSourceUrl", true); services.AddSingletonAs(c => new UrlGenerator( - c.GetRequiredService>(), + c.GetRequiredService>(), c.GetRequiredService(), exposeSourceUrl)) .As().As().As(); diff --git a/src/Squidex/Config/Domain/LoggingServices.cs b/src/Squidex/Config/Domain/LoggingServices.cs index 60c4d6333..f78858a8c 100644 --- a/src/Squidex/Config/Domain/LoggingServices.cs +++ b/src/Squidex/Config/Domain/LoggingServices.cs @@ -10,7 +10,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Infrastructure.Log; -using Squidex.Pipeline; +using Squidex.Web.Pipeline; namespace Squidex.Config.Domain { diff --git a/src/Squidex/Config/Domain/SubscriptionServices.cs b/src/Squidex/Config/Domain/SubscriptionServices.cs index f5f8ad07b..82e370e7b 100644 --- a/src/Squidex/Config/Domain/SubscriptionServices.cs +++ b/src/Squidex/Config/Domain/SubscriptionServices.cs @@ -12,6 +12,7 @@ using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Domain.Apps.Entities.Apps.Services.Implementations; using Squidex.Domain.Users; using Squidex.Infrastructure; +using Squidex.Web; namespace Squidex.Config.Domain { @@ -19,7 +20,7 @@ namespace Squidex.Config.Domain { public static void AddMySubscriptionServices(this IServiceCollection services, IConfiguration config) { - services.AddSingletonAs(c => c.GetRequiredService>()?.Value?.Plans.OrEmpty()); + services.AddSingletonAs(c => c.GetRequiredService>()?.Value?.Plans.OrEmpty()); services.AddSingletonAs() .AsOptional(); diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs index a3d33227e..d30ed84a0 100644 --- a/src/Squidex/Config/Orleans/OrleansServices.cs +++ b/src/Squidex/Config/Orleans/OrleansServices.cs @@ -15,6 +15,7 @@ using OrleansDashboard; using Squidex.Domain.Apps.Entities; using Squidex.Infrastructure; using Squidex.Infrastructure.Orleans; +using Squidex.Web; using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment; namespace Squidex.Config.Orleans diff --git a/src/Squidex/Config/Web/WebExtensions.cs b/src/Squidex/Config/Web/WebExtensions.cs index b50350723..badab15c3 100644 --- a/src/Squidex/Config/Web/WebExtensions.cs +++ b/src/Squidex/Config/Web/WebExtensions.cs @@ -17,8 +17,8 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Net.Http.Headers; using Squidex.Infrastructure.Json; -using Squidex.Pipeline; using Squidex.Pipeline.Robots; +using Squidex.Web.Pipeline; namespace Squidex.Config.Web { diff --git a/src/Squidex/Config/Web/WebServices.cs b/src/Squidex/Config/Web/WebServices.cs index b94410f97..ec55d161a 100644 --- a/src/Squidex/Config/Web/WebServices.cs +++ b/src/Squidex/Config/Web/WebServices.cs @@ -9,9 +9,10 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Config.Domain; -using Squidex.Pipeline; using Squidex.Pipeline.Plugins; using Squidex.Pipeline.Robots; +using Squidex.Web; +using Squidex.Web.Pipeline; namespace Squidex.Config.Web { diff --git a/src/Squidex/Pipeline/Swagger/NSwagHelper.cs b/src/Squidex/Pipeline/Swagger/NSwagHelper.cs index ccc236f1f..385a2b48f 100644 --- a/src/Squidex/Pipeline/Swagger/NSwagHelper.cs +++ b/src/Squidex/Pipeline/Swagger/NSwagHelper.cs @@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Http; using NJsonSchema; using NJsonSchema.Generation; using NSwag; -using Squidex.Config; +using Squidex.Web; namespace Squidex.Pipeline.Swagger { @@ -33,7 +33,7 @@ namespace Squidex.Pipeline.Swagger } } - public static SwaggerDocument CreateApiDocument(HttpContext context, MyUrlsOptions urlOptions, string appName) + public static SwaggerDocument CreateApiDocument(HttpContext context, UrlsOptions urlOptions, string appName) { var scheme = string.Equals(context.Request.Scheme, "http", StringComparison.OrdinalIgnoreCase) ? diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index 6ee1e41d3..5cdd8b1bc 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -38,6 +38,7 @@ + diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs index cc317832f..769c5774c 100644 --- a/src/Squidex/WebStartup.cs +++ b/src/Squidex/WebStartup.cs @@ -14,6 +14,7 @@ using Squidex.Areas.Api; using Squidex.Areas.Api.Config.Swagger; using Squidex.Areas.Api.Controllers.Contents; using Squidex.Areas.Api.Controllers.News; +using Squidex.Areas.Api.Controllers.UI; using Squidex.Areas.Frontend; using Squidex.Areas.IdentityServer; using Squidex.Areas.IdentityServer.Config; @@ -30,9 +31,9 @@ using Squidex.Domain.Apps.Entities.Contents; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Diagnostics; using Squidex.Infrastructure.Translations; -using Squidex.Pipeline; using Squidex.Pipeline.Plugins; using Squidex.Pipeline.Robots; +using Squidex.Web; namespace Squidex { @@ -86,17 +87,17 @@ namespace Squidex config.GetSection("healthz:gc")); services.Configure( config.GetSection("etags")); + services.Configure( + config.GetSection("urls")); + services.Configure( + config.GetSection("usage")); services.Configure( config.GetSection("contentsController")); - services.Configure( - config.GetSection("urls")); services.Configure( config.GetSection("identity")); services.Configure( config.GetSection("ui")); - services.Configure( - config.GetSection("usage")); services.Configure( config.GetSection("news")); diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json index 08771041a..09e72705c 100644 --- a/src/Squidex/appsettings.json +++ b/src/Squidex/appsettings.json @@ -295,48 +295,48 @@ /* * Enable password auth. Set this to false if you want to disable local login, leaving only 3rd party login options. */ - "allowPasswordAuth": true, - /* + "allowPasswordAuth": true, + /* * Initial admin user. */ - "adminEmail": "", - "adminPassword": "", - /* + "adminEmail": "", + "adminPassword": "", + /* * Client with all admin permissions. */ - "adminClientId": "", - "adminClientSecret": "", - /* + "adminClientId": "", + "adminClientSecret": "", + /* * Settings for Google auth (keep empty to disable). */ - "googleClient": "1006817248705-t3lb3ge808m9am4t7upqth79hulk456l.apps.googleusercontent.com", - "googleSecret": "QsEi-fHqkGw2_PjJmtNHf2wg", - /* + "googleClient": "1006817248705-t3lb3ge808m9am4t7upqth79hulk456l.apps.googleusercontent.com", + "googleSecret": "QsEi-fHqkGw2_PjJmtNHf2wg", + /* * Settings for Github auth (keep empty to disable). */ - "githubClient": "211ea00e726baf754c78", - "githubSecret": "d0a0d0fe2c26469ae20987ac265b3a339fd73132", - /* + "githubClient": "211ea00e726baf754c78", + "githubSecret": "d0a0d0fe2c26469ae20987ac265b3a339fd73132", + /* * Settings for Microsoft auth (keep empty to disable). */ - "microsoftClient": "b55da740-6648-4502-8746-b9003f29d5f1", - "microsoftSecret": "idWbANxNYEF4cB368WXJhjN", - /* + "microsoftClient": "b55da740-6648-4502-8746-b9003f29d5f1", + "microsoftSecret": "idWbANxNYEF4cB368WXJhjN", + /* * Settings for your custom oidc server. */ - "oidcName": "OIDC", - "oidcAuthority": "", - "oidcClient": "", - "oidcSecret": "", - /* + "oidcName": "OIDC", + "oidcAuthority": "", + "oidcClient": "", + "oidcSecret": "", + /* * Lock new users automatically, the administrator must unlock them. */ - "lockAutomatically": false, - /* + "lockAutomatically": false, + /* * The url to you privacy statements, if you host squidex by yourself. */ - "privacyUrl": "https://squidex.io/privacy" - }, + "privacyUrl": "https://squidex.io/privacy" + }, "news": { /* diff --git a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/ETagCommandMiddlewareTests.cs b/tests/Squidex.Web.Tests/CommandMiddlewares/ETagCommandMiddlewareTests.cs similarity index 98% rename from tests/Squidex.Tests/Pipeline/CommandMiddlewares/ETagCommandMiddlewareTests.cs rename to tests/Squidex.Web.Tests/CommandMiddlewares/ETagCommandMiddlewareTests.cs index 359147278..a9f8145fe 100644 --- a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/ETagCommandMiddlewareTests.cs +++ b/tests/Squidex.Web.Tests/CommandMiddlewares/ETagCommandMiddlewareTests.cs @@ -14,7 +14,7 @@ using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Infrastructure.Commands; using Xunit; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public class ETagCommandMiddlewareTests { diff --git a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddlewareTests.cs b/tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithActorCommandMiddlewareTests.cs similarity index 98% rename from tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddlewareTests.cs rename to tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithActorCommandMiddlewareTests.cs index 28977d34b..8ecdb1e15 100644 --- a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddlewareTests.cs +++ b/tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithActorCommandMiddlewareTests.cs @@ -16,7 +16,7 @@ using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Security; using Xunit; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public class EnrichWithActorCommandMiddlewareTests { diff --git a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs b/tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs similarity index 98% rename from tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs rename to tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs index 1d19f9baf..16398cc53 100644 --- a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs +++ b/tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs @@ -14,9 +14,10 @@ using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; +using Squidex.Web.Pipeline; using Xunit; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public class EnrichWithAppIdCommandMiddlewareTests { diff --git a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs b/tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs similarity index 98% rename from tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs rename to tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs index 6e2e99e9c..4513b51b6 100644 --- a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs +++ b/tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs @@ -20,9 +20,10 @@ using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Domain.Apps.Entities.Schemas.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; +using Squidex.Web.Pipeline; using Xunit; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public class EnrichWithSchemaIdCommandMiddlewareTests { diff --git a/tests/Squidex.Tests/Pipeline/ApiCostsFilterTests.cs b/tests/Squidex.Web.Tests/Pipeline/ApiCostsFilterTests.cs similarity index 99% rename from tests/Squidex.Tests/Pipeline/ApiCostsFilterTests.cs rename to tests/Squidex.Web.Tests/Pipeline/ApiCostsFilterTests.cs index cbf7efab4..2ee909d51 100644 --- a/tests/Squidex.Tests/Pipeline/ApiCostsFilterTests.cs +++ b/tests/Squidex.Web.Tests/Pipeline/ApiCostsFilterTests.cs @@ -20,7 +20,7 @@ using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Infrastructure.UsageTracking; using Xunit; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public class ApiCostsFilterTests { diff --git a/tests/Squidex.Tests/Pipeline/ETagFilterTests.cs b/tests/Squidex.Web.Tests/Pipeline/ETagFilterTests.cs similarity index 99% rename from tests/Squidex.Tests/Pipeline/ETagFilterTests.cs rename to tests/Squidex.Web.Tests/Pipeline/ETagFilterTests.cs index ec1ca4bfe..9a1e30abb 100644 --- a/tests/Squidex.Tests/Pipeline/ETagFilterTests.cs +++ b/tests/Squidex.Web.Tests/Pipeline/ETagFilterTests.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; using Xunit; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public class ETagFilterTests { diff --git a/tests/Squidex.Tests/Pipeline/EnforceHttpsMiddlewareTests.cs b/tests/Squidex.Web.Tests/Pipeline/EnforceHttpsMiddlewareTests.cs similarity index 95% rename from tests/Squidex.Tests/Pipeline/EnforceHttpsMiddlewareTests.cs rename to tests/Squidex.Web.Tests/Pipeline/EnforceHttpsMiddlewareTests.cs index 65388f017..090960922 100644 --- a/tests/Squidex.Tests/Pipeline/EnforceHttpsMiddlewareTests.cs +++ b/tests/Squidex.Web.Tests/Pipeline/EnforceHttpsMiddlewareTests.cs @@ -7,17 +7,16 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Squidex.Config; using Squidex.Infrastructure.Tasks; using Xunit; using Options = Microsoft.Extensions.Options.Options; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public class EnforceHttpsMiddlewareTests { private readonly RequestDelegate next; - private readonly MyUrlsOptions options = new MyUrlsOptions(); + private readonly UrlsOptions options = new UrlsOptions(); private readonly EnforceHttpsMiddleware sut; private bool isNextCalled; diff --git a/tests/Squidex.Tests/Squidex.Tests.csproj b/tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj similarity index 94% rename from tests/Squidex.Tests/Squidex.Tests.csproj rename to tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj index cd75c2a1c..4332f6cfe 100644 --- a/tests/Squidex.Tests/Squidex.Tests.csproj +++ b/tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj @@ -3,8 +3,7 @@ Exe netcoreapp2.2 2.2.0 - Squidex - $(NoWarn);NU1605 + Squidex.Web 7.3 From 77017c1168e7e9837a48c661202510ccb5a9f008 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Mar 2019 13:10:01 +0100 Subject: [PATCH 43/55] Ensure that web is shared in plugins. --- src/Squidex.Web/SquidexWeb.cs | 18 ++++++++++++++++++ .../Pipeline/Plugins/PluginExtensions.cs | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/Squidex.Web/SquidexWeb.cs diff --git a/src/Squidex.Web/SquidexWeb.cs b/src/Squidex.Web/SquidexWeb.cs new file mode 100644 index 000000000..a76b688dc --- /dev/null +++ b/src/Squidex.Web/SquidexWeb.cs @@ -0,0 +1,18 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Reflection; + +#pragma warning disable RECS0014 // If all fields, properties and methods members are static, the class can be made static. + +namespace Squidex.Infrastructure +{ + public sealed class SquidexInfrastructure + { + public static readonly Assembly Assembly = typeof(SquidexInfrastructure).Assembly; + } +} diff --git a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs index 42a07e18d..986c0c55c 100644 --- a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs +++ b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs @@ -20,6 +20,7 @@ using Squidex.Domain.Apps.Events; using Squidex.Infrastructure; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Plugins; +using Squidex.Web; namespace Squidex.Pipeline.Plugins { @@ -32,7 +33,8 @@ namespace Squidex.Pipeline.Plugins typeof(SquidexCoreOperations), typeof(SquidexEntities), typeof(SquidexEvents), - typeof(SquidexInfrastructure) + typeof(SquidexInfrastructure), + typeof(SquidexWeb) }; public static IMvcBuilder AddMyPlugins(this IMvcBuilder mvcBuilder, IConfiguration config) From 98a93e9ba7f92b72ba67ced131480e3a4c6e5da1 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Mar 2019 13:17:22 +0100 Subject: [PATCH 44/55] More tests. --- Dockerfile | 2 +- Dockerfile.build | 2 +- src/Squidex.Web/SquidexWeb.cs | 6 +- tests/RunCoverage.ps1 | 4 +- .../Pipeline/CleanupHostMiddlewareTests.cs | 75 +++++++++++++++++++ 5 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 tests/Squidex.Web.Tests/Pipeline/CleanupHostMiddlewareTests.cs diff --git a/Dockerfile b/Dockerfile index a6859a510..130de2b25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN dotnet restore \ && dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \ && dotnet test tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj \ && dotnet test tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj \ - && dotnet test tests/Squidex.Tests/Squidex.Tests.csproj + && dotnet test tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj # Publish RUN dotnet publish src/Squidex/Squidex.csproj --output /out/alpine --configuration Release -r alpine.3.7-x64 diff --git a/Dockerfile.build b/Dockerfile.build index 4fba46954..30a5d3091 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -21,7 +21,7 @@ RUN dotnet restore \ && dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \ && dotnet test tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj \ && dotnet test tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj \ - && dotnet test tests/Squidex.Tests/Squidex.Tests.csproj + && dotnet test tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj # Publish RUN dotnet publish src/Squidex/Squidex.csproj --output /out/ --configuration Release \ No newline at end of file diff --git a/src/Squidex.Web/SquidexWeb.cs b/src/Squidex.Web/SquidexWeb.cs index a76b688dc..ea1ea613b 100644 --- a/src/Squidex.Web/SquidexWeb.cs +++ b/src/Squidex.Web/SquidexWeb.cs @@ -9,10 +9,10 @@ using System.Reflection; #pragma warning disable RECS0014 // If all fields, properties and methods members are static, the class can be made static. -namespace Squidex.Infrastructure +namespace Squidex.Web { - public sealed class SquidexInfrastructure + public sealed class SquidexWeb { - public static readonly Assembly Assembly = typeof(SquidexInfrastructure).Assembly; + public static readonly Assembly Assembly = typeof(SquidexWeb).Assembly; } } diff --git a/tests/RunCoverage.ps1 b/tests/RunCoverage.ps1 index b5d468203..01a95a5e0 100644 --- a/tests/RunCoverage.ps1 +++ b/tests/RunCoverage.ps1 @@ -69,8 +69,8 @@ if ($all -Or $web) { &"$folderHome\.nuget\packages\OpenCover\4.7.922\tools\OpenCover.Console.exe" ` -register:user ` -target:"C:\Program Files\dotnet\dotnet.exe" ` - -targetargs:"test $folderWorking\Squidex.Tests\Squidex.Tests.csproj" ` - -filter:"+[Squidex]Squidex.Pipeline*" ` + -targetargs:"test $folderWorking\Squidex.Web.Tests\Squidex.Web.Tests.csproj" ` + -filter:"+[Squidex]Squidex.Web*" ` -skipautoprops ` -output:"$folderWorking\$folderReports\Web.xml" ` -oldStyle diff --git a/tests/Squidex.Web.Tests/Pipeline/CleanupHostMiddlewareTests.cs b/tests/Squidex.Web.Tests/Pipeline/CleanupHostMiddlewareTests.cs new file mode 100644 index 000000000..ab4db334a --- /dev/null +++ b/tests/Squidex.Web.Tests/Pipeline/CleanupHostMiddlewareTests.cs @@ -0,0 +1,75 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Squidex.Infrastructure.Tasks; +using Xunit; + +namespace Squidex.Web.Pipeline +{ + public class CleanupHostMiddlewareTests + { + private readonly RequestDelegate next; + private readonly CleanupHostMiddleware sut; + private bool isNextCalled; + + public CleanupHostMiddlewareTests() + { + next = context => + { + isNextCalled = true; + + return TaskHelper.Done; + }; + + sut = new CleanupHostMiddleware(next); + } + + [Fact] + public async Task Should_cleanup_host_if_https_schema_contains_default_port() + { + var httpContext = new DefaultHttpContext(); + + httpContext.Request.Scheme = "https"; + httpContext.Request.Host = new HostString("host", 443); + + await sut.Invoke(httpContext); + + Assert.Null(httpContext.Request.Host.Port); + Assert.True(isNextCalled); + } + + [Fact] + public async Task Should_cleanup_host_if_http_schema_contains_default_port() + { + var httpContext = new DefaultHttpContext(); + + httpContext.Request.Scheme = "http"; + httpContext.Request.Host = new HostString("host", 80); + + await sut.Invoke(httpContext); + + Assert.Null(httpContext.Request.Host.Port); + Assert.True(isNextCalled); + } + + [Fact] + public async Task Should_not_cleanup_host_if_http_schema_contains_other_port() + { + var httpContext = new DefaultHttpContext(); + + httpContext.Request.Scheme = "http"; + httpContext.Request.Host = new HostString("host", 8080); + + await sut.Invoke(httpContext); + + Assert.Equal(8080, httpContext.Request.Host.Port); + Assert.True(isNextCalled); + } + } +} From 968932becd6a9f621a6303579360f08e2e722bea Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Mar 2019 14:33:38 +0100 Subject: [PATCH 45/55] File moved. --- src/Squidex.Web/{ => Pipeline}/MeasureResultFilter.cs | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/Squidex.Web/{ => Pipeline}/MeasureResultFilter.cs (100%) diff --git a/src/Squidex.Web/MeasureResultFilter.cs b/src/Squidex.Web/Pipeline/MeasureResultFilter.cs similarity index 100% rename from src/Squidex.Web/MeasureResultFilter.cs rename to src/Squidex.Web/Pipeline/MeasureResultFilter.cs From 7d6f53a5a927c396d1067f4157626dfa8a277e2a Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Mar 2019 15:08:55 +0100 Subject: [PATCH 46/55] Tests for AppResolver --- src/Squidex.Web/Pipeline/AppResolver.cs | 19 +- .../Pipeline/AppResolverTests.cs | 197 ++++++++++++++++++ 2 files changed, 205 insertions(+), 11 deletions(-) create mode 100644 tests/Squidex.Web.Tests/Pipeline/AppResolverTests.cs diff --git a/src/Squidex.Web/Pipeline/AppResolver.cs b/src/Squidex.Web/Pipeline/AppResolver.cs index bafbbe24c..cc0ae853b 100644 --- a/src/Squidex.Web/Pipeline/AppResolver.cs +++ b/src/Squidex.Web/Pipeline/AppResolver.cs @@ -61,17 +61,6 @@ namespace Squidex.Web.Pipeline (role, permissions) = FindByOpenIdClient(app, user); } - if (permissions == null || permissions.Count == 0) - { - var set = user.Permissions(); - - if (!set.Includes(Permissions.ForApp(Permissions.App, appName)) && !AllowAnonymous(context)) - { - context.Result = new NotFoundResult(); - return; - } - } - if (permissions != null) { var identity = user.Identities.First(); @@ -84,6 +73,14 @@ namespace Squidex.Web.Pipeline } } + var set = user.Permissions(); + + if (!set.Includes(Permissions.ForApp(Permissions.App, appName))&& !AllowAnonymous(context)) + { + context.Result = new NotFoundResult(); + return; + } + context.HttpContext.Features.Set(new AppFeature(app)); } diff --git a/tests/Squidex.Web.Tests/Pipeline/AppResolverTests.cs b/tests/Squidex.Web.Tests/Pipeline/AppResolverTests.cs new file mode 100644 index 000000000..a1585f58c --- /dev/null +++ b/tests/Squidex.Web.Tests/Pipeline/AppResolverTests.cs @@ -0,0 +1,197 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; +using System.Linq; +using System.Security.Claims; +using System.Security.Principal; +using System.Threading.Tasks; +using FakeItEasy; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Abstractions; +using Microsoft.AspNetCore.Mvc.Authorization; +using Microsoft.AspNetCore.Mvc.Filters; +using Microsoft.AspNetCore.Routing; +using Squidex.Domain.Apps.Core.Apps; +using Squidex.Domain.Apps.Entities; +using Squidex.Domain.Apps.Entities.Apps; +using Squidex.Infrastructure.Security; +using Squidex.Shared; +using Squidex.Shared.Identity; +using Xunit; + +#pragma warning disable IDE0017 // Simplify object initialization + +namespace Squidex.Web.Pipeline +{ + public class AppResolverTests + { + private readonly IAppProvider appProvider = A.Fake(); + private readonly HttpContext httpContext = new DefaultHttpContext(); + private readonly ActionContext actionContext; + private readonly ActionExecutingContext actionExecutingContext; + private readonly ActionExecutionDelegate next; + private readonly ClaimsIdentity user = new ClaimsIdentity(); + private readonly string appName = "my-app"; + private readonly AppResolver sut; + private bool isNextCalled; + + public AppResolverTests() + { + actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor + { + FilterDescriptors = new List() + }); + + actionExecutingContext = new ActionExecutingContext(actionContext, new List(), new Dictionary(), this); + actionExecutingContext.HttpContext = httpContext; + actionExecutingContext.HttpContext.User = new ClaimsPrincipal(user); + actionExecutingContext.RouteData.Values["app"] = appName; + + next = () => + { + isNextCalled = true; + + return Task.FromResult(null); + }; + + sut = new AppResolver(appProvider); + } + + [Fact] + public async Task Should_return_not_found_if_app_not_found() + { + A.CallTo(() => appProvider.GetAppAsync(appName)) + .Returns(Task.FromResult(null)); + + await sut.OnActionExecutionAsync(actionExecutingContext, next); + + Assert.IsType(actionExecutingContext.Result); + Assert.False(isNextCalled); + } + + [Fact] + public async Task Should_resolve_app_from_user() + { + var app = CreateApp(appName, appUser: "user1"); + + user.AddClaim(new Claim(OpenIdClaims.Subject, "user1")); + user.AddClaim(new Claim(SquidexClaimTypes.Permissions, "squidex.apps.my-app")); + + A.CallTo(() => appProvider.GetAppAsync(appName)) + .Returns(app); + + await sut.OnActionExecutionAsync(actionExecutingContext, next); + + Assert.Same(app, httpContext.Features.Get()?.App); + Assert.True(user.Claims.Count() > 2); + Assert.True(isNextCalled); + } + + [Fact] + public async Task Should_resolve_app_from_client() + { + var app = CreateApp(appName, appClient: "client1"); + + user.AddClaim(new Claim(OpenIdClaims.ClientId, "client1")); + user.AddClaim(new Claim(SquidexClaimTypes.Permissions, "squidex.apps.my-app")); + + A.CallTo(() => appProvider.GetAppAsync(appName)) + .Returns(app); + + await sut.OnActionExecutionAsync(actionExecutingContext, next); + + Assert.Same(app, httpContext.Features.Get()?.App); + Assert.True(user.Claims.Count() > 2); + Assert.True(isNextCalled); + } + + [Fact] + public async Task Should_resolve_app_if_anonymouse_but_not_permissions() + { + var app = CreateApp(appName); + + user.AddClaim(new Claim(OpenIdClaims.ClientId, "client1")); + user.AddClaim(new Claim(SquidexClaimTypes.Permissions, "squidex.apps.other-app")); + + actionContext.ActionDescriptor.FilterDescriptors.Add(new FilterDescriptor(new AllowAnonymousFilter(), 1)); + + A.CallTo(() => appProvider.GetAppAsync(appName)) + .Returns(app); + + await sut.OnActionExecutionAsync(actionExecutingContext, next); + + Assert.Same(app, httpContext.Features.Get()?.App); + Assert.Equal(2, user.Claims.Count()); + Assert.True(isNextCalled); + } + + [Fact] + public async Task Should_return_not_found_if_user_has_no_permissions() + { + var app = CreateApp(appName); + + user.AddClaim(new Claim(OpenIdClaims.ClientId, "client1")); + user.AddClaim(new Claim(SquidexClaimTypes.Permissions, "squidex.apps.other-app")); + + A.CallTo(() => appProvider.GetAppAsync(appName)) + .Returns(app); + + await sut.OnActionExecutionAsync(actionExecutingContext, next); + + Assert.IsType(actionExecutingContext.Result); + Assert.False(isNextCalled); + } + + [Fact] + public async Task Should_do_nothing_if_parameter_not_set() + { + actionExecutingContext.RouteData.Values.Remove("app"); + + await sut.OnActionExecutionAsync(actionExecutingContext, next); + + Assert.True(isNextCalled); + + A.CallTo(() => appProvider.GetAppAsync(A.Ignored)) + .MustNotHaveHappened(); + } + + private static IAppEntity CreateApp(string name, string appUser = null, string appClient = null) + { + var app = A.Fake(); + + if (appUser != null) + { + A.CallTo(() => app.Contributors) + .Returns(AppContributors.Empty.Assign(appUser, Role.Owner)); + } + else + { + A.CallTo(() => app.Contributors) + .Returns(AppContributors.Empty); + } + + if (appClient != null) + { + A.CallTo(() => app.Clients) + .Returns(AppClients.Empty.Add(appClient, "secret")); + } + else + { + A.CallTo(() => app.Clients) + .Returns(AppClients.Empty); + } + + A.CallTo(() => app.Roles) + .Returns(Roles.CreateDefaults(name)); + + return app; + } + } +} From dd3bdef34e5428c6ac045a43c88ace479d31f324 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 24 Mar 2019 17:17:11 +0100 Subject: [PATCH 47/55] More tests. --- src/Squidex.Web/ApiPermissionAttribute.cs | 6 +- .../Pipeline/ApiPermissionUnifier.cs | 3 +- .../ApiPermissionAttributeTests.cs | 117 ++++++++++++++++++ .../Pipeline/ApiPermissionUnifierTests.cs | 61 +++++++++ 4 files changed, 185 insertions(+), 2 deletions(-) create mode 100644 tests/Squidex.Web.Tests/ApiPermissionAttributeTests.cs create mode 100644 tests/Squidex.Web.Tests/Pipeline/ApiPermissionUnifierTests.cs diff --git a/src/Squidex.Web/ApiPermissionAttribute.cs b/src/Squidex.Web/ApiPermissionAttribute.cs index 1df4fd5e2..d515c76ce 100644 --- a/src/Squidex.Web/ApiPermissionAttribute.cs +++ b/src/Squidex.Web/ApiPermissionAttribute.cs @@ -49,7 +49,11 @@ namespace Squidex.Web id = id.Replace($"{{{routeParam.Key}}}", routeParam.Value?.ToString()); } - hasPermission |= set.Allows(new Permission(id)); + if (set.Allows(new Permission(id))) + { + hasPermission = true; + break; + } } if (!hasPermission) diff --git a/src/Squidex.Web/Pipeline/ApiPermissionUnifier.cs b/src/Squidex.Web/Pipeline/ApiPermissionUnifier.cs index 1751b1241..672022d73 100644 --- a/src/Squidex.Web/Pipeline/ApiPermissionUnifier.cs +++ b/src/Squidex.Web/Pipeline/ApiPermissionUnifier.cs @@ -5,6 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; @@ -22,7 +23,7 @@ namespace Squidex.Web.Pipeline { var identity = principal.Identities.First(); - if (string.Equals(identity.FindFirst(identity.RoleClaimType)?.Value, AdministratorRole)) + if (string.Equals(identity.FindFirst(identity.RoleClaimType)?.Value, AdministratorRole, StringComparison.OrdinalIgnoreCase)) { identity.AddClaim(new Claim(SquidexClaimTypes.Permissions, Permissions.Admin)); } diff --git a/tests/Squidex.Web.Tests/ApiPermissionAttributeTests.cs b/tests/Squidex.Web.Tests/ApiPermissionAttributeTests.cs new file mode 100644 index 000000000..3a539a478 --- /dev/null +++ b/tests/Squidex.Web.Tests/ApiPermissionAttributeTests.cs @@ -0,0 +1,117 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; +using System.Security.Claims; +using System.Threading.Tasks; +using FakeItEasy; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Abstractions; +using Microsoft.AspNetCore.Mvc.Filters; +using Microsoft.AspNetCore.Routing; +using Squidex.Domain.Apps.Entities; +using Squidex.Shared; +using Squidex.Shared.Identity; +using Xunit; + +#pragma warning disable IDE0017 // Simplify object initialization + +namespace Squidex.Web.Pipeline +{ + public class ApiPermissionAttributeTests + { + private readonly IAppProvider appProvider = A.Fake(); + private readonly HttpContext httpContext = new DefaultHttpContext(); + private readonly ActionContext actionContext; + private readonly ActionExecutingContext actionExecutingContext; + private readonly ActionExecutionDelegate next; + private readonly ClaimsIdentity user = new ClaimsIdentity(); + private bool isNextCalled; + + public ApiPermissionAttributeTests() + { + actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor + { + FilterDescriptors = new List() + }); + + actionExecutingContext = new ActionExecutingContext(actionContext, new List(), new Dictionary(), this); + actionExecutingContext.HttpContext = httpContext; + actionExecutingContext.HttpContext.User = new ClaimsPrincipal(user); + + next = () => + { + isNextCalled = true; + + return Task.FromResult(null); + }; + } + + [Fact] + public void Should_use_bearer_schemes() + { + var sut = new ApiPermissionAttribute(); + + Assert.Equal("Bearer", sut.AuthenticationSchemes); + } + + [Fact] + public async Task Should_call_next_when_user_has_correct_permission() + { + actionExecutingContext.RouteData.Values["app"] = "my-app"; + + user.AddClaim(new Claim(SquidexClaimTypes.Permissions, "squidex.apps.my-app")); + + var sut = new ApiPermissionAttribute(Permissions.AppSchemasRead); + + await sut.OnActionExecutionAsync(actionExecutingContext, next); + + Assert.Null(actionExecutingContext.Result); + Assert.True(isNextCalled); + } + + [Fact] + public async Task Should_return_forbidden_when_user_has_wrong_permission() + { + actionExecutingContext.RouteData.Values["app"] = "my-app"; + + user.AddClaim(new Claim(SquidexClaimTypes.Permissions, "squidex.apps.other-app")); + + var sut = new ApiPermissionAttribute(Permissions.AppSchemasRead); + + await sut.OnActionExecutionAsync(actionExecutingContext, next); + + Assert.Equal(403, (actionExecutingContext.Result as StatusCodeResult)?.StatusCode); + Assert.False(isNextCalled); + } + + [Fact] + public async Task Should_return_forbidden_when_route_data_has_no_value() + { + user.AddClaim(new Claim(SquidexClaimTypes.Permissions, "squidex.apps.other-app")); + + var sut = new ApiPermissionAttribute(Permissions.AppSchemasRead); + + await sut.OnActionExecutionAsync(actionExecutingContext, next); + + Assert.Equal(403, (actionExecutingContext.Result as StatusCodeResult)?.StatusCode); + Assert.False(isNextCalled); + } + + [Fact] + public async Task Should_return_forbidden_when_user_has_no_permission() + { + var sut = new ApiPermissionAttribute(Permissions.AppSchemasRead); + + await sut.OnActionExecutionAsync(actionExecutingContext, next); + + Assert.Equal(403, (actionExecutingContext.Result as StatusCodeResult)?.StatusCode); + Assert.False(isNextCalled); + } + } +} diff --git a/tests/Squidex.Web.Tests/Pipeline/ApiPermissionUnifierTests.cs b/tests/Squidex.Web.Tests/Pipeline/ApiPermissionUnifierTests.cs new file mode 100644 index 000000000..265658925 --- /dev/null +++ b/tests/Squidex.Web.Tests/Pipeline/ApiPermissionUnifierTests.cs @@ -0,0 +1,61 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Linq; +using System.Security.Claims; +using System.Threading.Tasks; +using Squidex.Shared; +using Squidex.Shared.Identity; +using Xunit; + +namespace Squidex.Web.Pipeline +{ + public class ApiPermissionUnifierTests + { + private readonly ApiPermissionUnifier sut = new ApiPermissionUnifier(); + + [Theory] + [InlineData("administrator")] + [InlineData("ADMINISTRATOR")] + public async Task Should_add_admin_permission_when_user_is_in_role(string role) + { + var userIdentity = new ClaimsIdentity(); + var userPrinicpal = new ClaimsPrincipal(userIdentity); + + userIdentity.AddClaim(new Claim(userIdentity.RoleClaimType, role)); + + var result = await sut.TransformAsync(userPrinicpal); + + Assert.Equal(Permissions.Admin, result.Claims.FirstOrDefault(x => x.Type == SquidexClaimTypes.Permissions)?.Value); + Assert.Equal(role, result.Claims.FirstOrDefault(x => x.Type == userIdentity.RoleClaimType)?.Value); + } + + [Fact] + public async Task Should_not_add_admin_persmission_when_user_has_other_role() + { + var userIdentity = new ClaimsIdentity(); + var userPrinicpal = new ClaimsPrincipal(userIdentity); + + userIdentity.AddClaim(new Claim(userIdentity.RoleClaimType, "Developer")); + + var result = await sut.TransformAsync(userPrinicpal); + + Assert.Single(result.Claims); + } + + [Fact] + public async Task Should_not_add_admin_persmission_when_user_has_no_role() + { + var userIdentity = new ClaimsIdentity(); + var userPrinicpal = new ClaimsPrincipal(userIdentity); + + var result = await sut.TransformAsync(userPrinicpal); + + Assert.Empty(result.Claims); + } + } +} From 4de7ed2e39c8683df58c7fc9c6e158721d10bcc9 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 24 Mar 2019 20:13:21 +0100 Subject: [PATCH 48/55] More tests --- src/Squidex.Web/ApiExceptionFilterAttribute.cs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/Squidex.Web/ApiExceptionFilterAttribute.cs b/src/Squidex.Web/ApiExceptionFilterAttribute.cs index 65c6e8ac0..3e195c0be 100644 --- a/src/Squidex.Web/ApiExceptionFilterAttribute.cs +++ b/src/Squidex.Web/ApiExceptionFilterAttribute.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Security; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; @@ -60,7 +61,7 @@ namespace Squidex.Web private static IActionResult OnValidationException(ValidationException ex) { - return ErrorResult(400, new ErrorDto { Message = ex.Summary, Details = ex.Errors?.ToArray(e => e.Message) }); + return ErrorResult(400, new ErrorDto { Message = ex.Summary, Details = ToDetails(ex) }); } private static IActionResult ErrorResult(int statusCode, ErrorDto error) @@ -89,5 +90,20 @@ namespace Squidex.Web context.Result = result; } } + + private static string[] ToDetails(ValidationException ex) + { + return ex.Errors?.ToArray(e => + { + if (e.PropertyNames?.Any() == true) + { + return $"{string.Join(", ", e.PropertyNames)}: {e.Message}"; + } + else + { + return e.Message; + } + }); + } } } From 9d8c8ac975670d9bfa39527f71bd5b8dbdba5001 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 24 Mar 2019 20:14:35 +0100 Subject: [PATCH 49/55] Added missing files. --- .../ApiCostsAttributeTests.cs | 22 ++++ .../ApiExceptionFilterAttributeTests.cs | 122 ++++++++++++++++++ 2 files changed, 144 insertions(+) create mode 100644 tests/Squidex.Web.Tests/ApiCostsAttributeTests.cs create mode 100644 tests/Squidex.Web.Tests/ApiExceptionFilterAttributeTests.cs diff --git a/tests/Squidex.Web.Tests/ApiCostsAttributeTests.cs b/tests/Squidex.Web.Tests/ApiCostsAttributeTests.cs new file mode 100644 index 000000000..91f9c4a16 --- /dev/null +++ b/tests/Squidex.Web.Tests/ApiCostsAttributeTests.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Xunit; + +namespace Squidex.Web +{ + public class ApiCostsAttributeTests + { + [Fact] + public void Should_assign_weight() + { + var sut = new ApiCostsAttribute(10.5); + + Assert.Equal(10.5, sut.Weight); + } + } +} diff --git a/tests/Squidex.Web.Tests/ApiExceptionFilterAttributeTests.cs b/tests/Squidex.Web.Tests/ApiExceptionFilterAttributeTests.cs new file mode 100644 index 000000000..51a15b1d5 --- /dev/null +++ b/tests/Squidex.Web.Tests/ApiExceptionFilterAttributeTests.cs @@ -0,0 +1,122 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Security; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Abstractions; +using Microsoft.AspNetCore.Mvc.Filters; +using Microsoft.AspNetCore.Routing; +using Squidex.Infrastructure; +using Xunit; + +namespace Squidex.Web +{ + public class ApiExceptionFilterAttributeTests + { + private readonly ApiExceptionFilterAttribute sut = new ApiExceptionFilterAttribute(); + + [Fact] + public void Should_generate_404_for_DomainObjectNotFoundException() + { + var context = E(new DomainObjectNotFoundException("1", typeof(object))); + + sut.OnException(context); + + Assert.IsType(context.Result); + } + + [Fact] + public void Should_generate_400_for_ValidationException() + { + var ex = new ValidationException("NotAllowed", + new ValidationError("Error1"), + new ValidationError("Error2", "P"), + new ValidationError("Error3", "P1", "P2")); + + var context = E(ex); + + sut.OnException(context); + + var result = context.Result as ObjectResult; + + Assert.Equal(400, result.StatusCode); + Assert.Equal(400, (result.Value as ErrorDto)?.StatusCode); + + Assert.Equal(ex.Summary, (result.Value as ErrorDto).Message); + + Assert.Equal(new string[] { "Error1", "P: Error2", "P1, P2: Error3" }, (result.Value as ErrorDto).Details); + } + + [Fact] + public void Should_generate_400_for_DomainException() + { + var context = E(new DomainException("NotAllowed")); + + sut.OnException(context); + + Validate(400, context); + } + + [Fact] + public void Should_generate_412_for_DomainObjectVersionException() + { + var context = E(new DomainObjectVersionException("1", typeof(object), 1, 2)); + + sut.OnException(context); + + Validate(412, context); + } + + [Fact] + public void Should_generate_403_for_DomainForbiddenException() + { + var context = E(new DomainForbiddenException("Forbidden")); + + sut.OnException(context); + + Validate(403, context); + } + + [Fact] + public void Should_generate_403_for_SecurityException() + { + var context = E(new SecurityException("Forbidden")); + + sut.OnException(context); + + Validate(403, context); + } + + private static ExceptionContext E(Exception exception) + { + var httpContext = new DefaultHttpContext(); + + var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor + { + FilterDescriptors = new List() + }); + + return new ExceptionContext(actionContext, new List()) + { + Exception = exception + }; + } + + private static void Validate(int statusCode, ExceptionContext context) + { + var result = context.Result as ObjectResult; + + Assert.Equal(statusCode, result.StatusCode); + Assert.Equal(statusCode, (result.Value as ErrorDto)?.StatusCode); + + Assert.Equal(context.Exception.Message, (result.Value as ErrorDto).Message); + } + } +} From c32b27c26e1010ab00d4bc1fc1d044426a108bc2 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 24 Mar 2019 20:31:47 +0100 Subject: [PATCH 50/55] Enum fixes. --- .../Api/Controllers/Rules/Models/RuleElementPropertyDto.cs | 1 + src/Squidex/Config/Domain/SerializationServices.cs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleElementPropertyDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleElementPropertyDto.cs index 81170e36f..ea9c72a64 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleElementPropertyDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleElementPropertyDto.cs @@ -6,6 +6,7 @@ // ========================================================================== using System.ComponentModel.DataAnnotations; +using Newtonsoft.Json; using Squidex.Domain.Apps.Core.HandleRules; namespace Squidex.Areas.Api.Controllers.Rules.Models diff --git a/src/Squidex/Config/Domain/SerializationServices.cs b/src/Squidex/Config/Domain/SerializationServices.cs index 30f1b27bf..0b1f7cfce 100644 --- a/src/Squidex/Config/Domain/SerializationServices.cs +++ b/src/Squidex/Config/Domain/SerializationServices.cs @@ -25,6 +25,8 @@ namespace Squidex.Config.Domain { private static JsonSerializerSettings ConfigureJson(JsonSerializerSettings settings, TypeNameHandling typeNameHandling) { + settings.Converters.Add(new StringEnumConverter()); + settings.ContractResolver = new ConverterContractResolver( new AppClientsConverter(), new AppContributorsConverter(), From 041b1d32a31d00c576a50485a2db4ef0b64a2e4b Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 25 Mar 2019 20:15:46 +0100 Subject: [PATCH 51/55] Extensions --- .../Squidex.Extensions.csproj | 3 +++ .../Pipeline/Plugins/PluginExtensions.cs | 23 +------------------ src/Squidex/Squidex.csproj | 7 +++--- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/extensions/Squidex.Extensions/Squidex.Extensions.csproj b/extensions/Squidex.Extensions/Squidex.Extensions.csproj index d9b24aa1f..836716069 100644 --- a/extensions/Squidex.Extensions/Squidex.Extensions.csproj +++ b/extensions/Squidex.Extensions/Squidex.Extensions.csproj @@ -31,4 +31,7 @@ + + + diff --git a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs index 986c0c55c..56626e70e 100644 --- a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs +++ b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs @@ -14,29 +14,13 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Mvc.ApplicationParts; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Squidex.Domain.Apps.Core; -using Squidex.Domain.Apps.Entities; -using Squidex.Domain.Apps.Events; -using Squidex.Infrastructure; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Plugins; -using Squidex.Web; namespace Squidex.Pipeline.Plugins { public static class PluginExtensions { - private static readonly Type[] SharedTypes = - { - typeof(IPlugin), - typeof(SquidexCoreModel), - typeof(SquidexCoreOperations), - typeof(SquidexEntities), - typeof(SquidexEvents), - typeof(SquidexInfrastructure), - typeof(SquidexWeb) - }; - public static IMvcBuilder AddMyPlugins(this IMvcBuilder mvcBuilder, IConfiguration config) { var pluginManager = new PluginManager(); @@ -89,12 +73,7 @@ namespace Squidex.Pipeline.Plugins { if (candidate.Extension.Equals(".dll", StringComparison.OrdinalIgnoreCase)) { - return PluginLoader.CreateFromAssemblyFile(candidate.FullName, SharedTypes); - } - - if (candidate.Extension.Equals(".json", StringComparison.OrdinalIgnoreCase)) - { - return PluginLoader.CreateFromConfigFile(candidate.FullName, SharedTypes); + return PluginLoader.CreateFromAssemblyFile(candidate.FullName, PluginLoaderOptions.PreferSharedTypes); } } diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index 5cdd8b1bc..f7c33f443 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -40,7 +40,7 @@ - + @@ -59,6 +59,7 @@ + @@ -69,12 +70,12 @@ - + - + From cea498cf3741ebd5b686ba24965c3b302926746a Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 25 Mar 2019 20:17:53 +0100 Subject: [PATCH 52/55] Change reverted --- .../Pipeline/Plugins/PluginExtensions.cs | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs index 56626e70e..8f257bc51 100644 --- a/src/Squidex/Pipeline/Plugins/PluginExtensions.cs +++ b/src/Squidex/Pipeline/Plugins/PluginExtensions.cs @@ -14,13 +14,29 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Mvc.ApplicationParts; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Squidex.Domain.Apps.Core; +using Squidex.Domain.Apps.Entities; +using Squidex.Domain.Apps.Events; +using Squidex.Infrastructure; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Plugins; +using Squidex.Web; namespace Squidex.Pipeline.Plugins { public static class PluginExtensions { + private static readonly Type[] SharedTypes = + { + typeof(IPlugin), + typeof(SquidexCoreModel), + typeof(SquidexCoreOperations), + typeof(SquidexEntities), + typeof(SquidexEvents), + typeof(SquidexInfrastructure), + typeof(SquidexWeb) + }; + public static IMvcBuilder AddMyPlugins(this IMvcBuilder mvcBuilder, IConfiguration config) { var pluginManager = new PluginManager(); @@ -75,6 +91,11 @@ namespace Squidex.Pipeline.Plugins { return PluginLoader.CreateFromAssemblyFile(candidate.FullName, PluginLoaderOptions.PreferSharedTypes); } + + if (candidate.Extension.Equals(".json", StringComparison.OrdinalIgnoreCase)) + { + return PluginLoader.CreateFromConfigFile(candidate.FullName, SharedTypes); + } } return null; From 5b2580faf9126a0d8e873ba1ff13f6bfb288c290 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 25 Mar 2019 21:05:11 +0100 Subject: [PATCH 53/55] Changes reverted. --- extensions/Squidex.Extensions/Squidex.Extensions.csproj | 7 ------- 1 file changed, 7 deletions(-) diff --git a/extensions/Squidex.Extensions/Squidex.Extensions.csproj b/extensions/Squidex.Extensions/Squidex.Extensions.csproj index 836716069..0940d8a2a 100644 --- a/extensions/Squidex.Extensions/Squidex.Extensions.csproj +++ b/extensions/Squidex.Extensions/Squidex.Extensions.csproj @@ -3,10 +3,6 @@ netstandard2.0 7.3 - - full - True - @@ -31,7 +27,4 @@ - - - From c923a3d6703d05648a256e8ba3a4c6070711cd5f Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 25 Mar 2019 21:06:57 +0100 Subject: [PATCH 54/55] Better logging --- src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs | 5 +++++ src/Squidex/Config/Startup/BackgroundHost.cs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs b/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs index 7177e4fbe..ae47858a5 100644 --- a/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs +++ b/src/Squidex.Infrastructure/Orleans/GrainBootstrap.cs @@ -45,5 +45,10 @@ namespace Squidex.Infrastructure.Orleans } } } + + public override string ToString() + { + return typeof(T).ToString(); + } } } diff --git a/src/Squidex/Config/Startup/BackgroundHost.cs b/src/Squidex/Config/Startup/BackgroundHost.cs index 3691ba676..41bef8f72 100644 --- a/src/Squidex/Config/Startup/BackgroundHost.cs +++ b/src/Squidex/Config/Startup/BackgroundHost.cs @@ -32,7 +32,7 @@ namespace Squidex.Config.Startup { await target.StartAsync(ct); - log.LogInformation(w => w.WriteProperty("backgroundSystem", target.GetType().Name)); + log.LogInformation(w => w.WriteProperty("backgroundSystem", target.ToString())); } } } From d2d93c3a50476148c8880bfa80bcfd3faaf65d7f Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Wed, 27 Mar 2019 18:05:18 +0100 Subject: [PATCH 55/55] Fix for stackoverflow --- tools/Migrate_01/Migrations/BuildFullTextIndices.cs | 2 +- tools/Migrate_01/Rebuilder.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Migrate_01/Migrations/BuildFullTextIndices.cs b/tools/Migrate_01/Migrations/BuildFullTextIndices.cs index 9cda18d1c..42732e496 100644 --- a/tools/Migrate_01/Migrations/BuildFullTextIndices.cs +++ b/tools/Migrate_01/Migrations/BuildFullTextIndices.cs @@ -30,7 +30,7 @@ namespace Migrate_01.Migrations public Task UpdateAsync() { - return UpdateAsync(); + return UpdateAsync(CancellationToken.None); } public async Task UpdateAsync(CancellationToken ct) diff --git a/tools/Migrate_01/Rebuilder.cs b/tools/Migrate_01/Rebuilder.cs index 8f0eaa062..92bb21174 100644 --- a/tools/Migrate_01/Rebuilder.cs +++ b/tools/Migrate_01/Rebuilder.cs @@ -114,7 +114,7 @@ namespace Migrate_01 { await worker.SendAsync(id); } - }, filter, ct); + }, filter, ct: ct); worker.Complete();