Refactor

Elsa.sln

@@ -200,8 +200,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.EntityFrameworkCore.My
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.AspNet.DslWorkflowProvider", "src\samples\aspnet\Elsa.Samples.AspNet.DslWorkflowProvider\Elsa.Samples.AspNet.DslWorkflowProvider.csproj", "{4BC5D3D2-9425-41D7-9804-D145B92520EE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.MongoDB", "src\modules\Elsa.MongoDB\Elsa.MongoDB.csproj", "{F84DD219-8693-4F1E-8C65-59B673E70DD5}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "persistence", "persistence", "{9B4F139F-7D26-435C-A561-89E65A67A8E5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripting", "scripting", "{6EF07978-A6D2-40EB-891D-7D70C5F37E76}"
@@ -226,6 +224,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.WorkflowProviders.Blob
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.ConsoleApp.ActivityOutput", "src\samples\console\Elsa.Samples.ConsoleApp.ActivityOutput\Elsa.Samples.ConsoleApp.ActivityOutput.csproj", "{9C9FEB8E-A253-4705-A344-49BFEFC9A516}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.MongoDb", "src\modules\Elsa.MongoDb\Elsa.MongoDb.csproj", "{3A377A6A-F735-4010-9E00-72E8BEB8F1F2}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -540,10 +540,6 @@ Global
  {4BC5D3D2-9425-41D7-9804-D145B92520EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {4BC5D3D2-9425-41D7-9804-D145B92520EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {4BC5D3D2-9425-41D7-9804-D145B92520EE}.Release|Any CPU.Build.0 = Release|Any CPU
- {F84DD219-8693-4F1E-8C65-59B673E70DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F84DD219-8693-4F1E-8C65-59B673E70DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F84DD219-8693-4F1E-8C65-59B673E70DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F84DD219-8693-4F1E-8C65-59B673E70DD5}.Release|Any CPU.Build.0 = Release|Any CPU
  {4D8F3BB2-709D-481A-8FD3-0DA9762B366D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {4D8F3BB2-709D-481A-8FD3-0DA9762B366D}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {4D8F3BB2-709D-481A-8FD3-0DA9762B366D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -564,6 +560,10 @@ Global
  {9C9FEB8E-A253-4705-A344-49BFEFC9A516}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {9C9FEB8E-A253-4705-A344-49BFEFC9A516}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {9C9FEB8E-A253-4705-A344-49BFEFC9A516}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3A377A6A-F735-4010-9E00-72E8BEB8F1F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3A377A6A-F735-4010-9E00-72E8BEB8F1F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3A377A6A-F735-4010-9E00-72E8BEB8F1F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3A377A6A-F735-4010-9E00-72E8BEB8F1F2}.Release|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(NestedProjects) = preSolution
  {155227F0-A33B-40AA-A4B4-06F813EB921B} = {61017E64-6D00-49CB-9E81-5002DC8F7D5F}
@@ -665,6 +665,6 @@ Global
  {A86DF0F0-24E9-470E-984B-9E7332544972} = {9B4F139F-7D26-435C-A561-89E65A67A8E5}
  {A702DD84-B55C-4807-9C28-D8F5AC3CCA78} = {B08B4E00-C2AB-48F3-8389-449F42AEF179}
  {9C9FEB8E-A253-4705-A344-49BFEFC9A516} = {873BFC3E-63C2-4495-A503-5EC05DCD84E4}
- {F84DD219-8693-4F1E-8C65-59B673E70DD5} = {9B4F139F-7D26-435C-A561-89E65A67A8E5}
+ {3A377A6A-F735-4010-9E00-72E8BEB8F1F2} = {9B4F139F-7D26-435C-A561-89E65A67A8E5}
  EndGlobalSection
 EndGlobal

src/bundles/Elsa.WorkflowServer.Web/Elsa.WorkflowServer.Web.csproj

@@ -16,7 +16,7 @@
  <ProjectReference Include="..\..\modules\Elsa.EntityFrameworkCore\Elsa.EntityFrameworkCore.csproj" />
  <ProjectReference Include="..\..\modules\Elsa.Environments\Elsa.Environments.csproj" />
  <ProjectReference Include="..\..\modules\Elsa.MassTransit\Elsa.MassTransit.csproj" />
- <ProjectReference Include="..\..\modules\Elsa.MongoDB\Elsa.MongoDB.csproj" />
+ <ProjectReference Include="..\..\modules\Elsa.MongoDb\Elsa.MongoDb.csproj" />
  <ProjectReference Include="..\..\modules\Elsa.ProtoActor\Elsa.ProtoActor.csproj" />
  <ProjectReference Include="..\..\modules\Elsa.Identity\Elsa.Identity.csproj" />
  <ProjectReference Include="..\..\modules\Elsa.ProtoActor.Cluster.AzureContainerApps\Elsa.ProtoActor.Cluster.AzureContainerApps.csproj" />

src/bundles/Elsa.WorkflowServer.Web/Program.cs

@@ -5,12 +5,13 @@
 using Elsa.EntityFrameworkCore.Modules.Runtime;
 using Elsa.Http.Handlers;
 using Elsa.JavaScript.Options;
-using Elsa.MongoDB.Extensions;
-using Elsa.MongoDB.Modules.Identity;
-using Elsa.MongoDB.Modules.Labels;
-using Elsa.MongoDB.Modules.Management;
-using Elsa.MongoDB.Modules.Runtime;
+using Elsa.MongoDb.Extensions;
+using Elsa.MongoDb.Modules.Identity;
+using Elsa.MongoDb.Modules.Labels;
+using Elsa.MongoDb.Modules.Management;
+using Elsa.MongoDb.Modules.Runtime;
 using Elsa.WorkflowServer.Web;
+using Jint;
 
 EndpointSecurityOptions.DisableSecurity();
 
@@ -59,7 +60,7 @@
  .UseLabels(options => options.UseMongoDb())
  .UseHttp(http => http.HttpEndpointAuthorizationHandler = sp => sp.GetRequiredService<AllowAnonymousHttpEndpointAuthorizationHandler>())
  .UseEmail(email => email.ConfigureOptions = options => configuration.GetSection("Smtp").Bind(options))
- .UseMongoDb(options => configuration.GetSection("MongoDb").Bind(options))
+ .UseMongoDb(configuration.GetConnectionString("MongoDb")!)
  );
 
 services.Configure<JintOptions>(options => options.AllowClrAccess = true);

src/bundles/Elsa.WorkflowServer.Web/appsettings.json

@@ -13,11 +13,8 @@
  },
  "AllowedHosts": "*",
  "ConnectionStrings": {
- "Sqlite": "Data Source=elsa.sqlite.db;Cache=Shared;"
- },
- "MongoDb": {
- "ConnectionString": "mongodb:https://localhost:27017",
- "DatabaseName": "elsa-workflows"
+ "Sqlite": "Data Source=elsa.sqlite.db;Cache=Shared;",
+ "MongoDb": "mongodb:https://localhost:27017/elsa-workflows"
  },
  "Smtp": {
  "Host": "localhost",

src/modules/Elsa.MongoDB/Common/MongoStore.cs → src/modules/Elsa.MongoDb/Common/MongoDbStore.cs

@@ -1,22 +1,22 @@
 using System.Linq.Expressions;
-using Elsa.MongoDB.Extensions;
+using Elsa.MongoDb.Extensions;
 using JetBrains.Annotations;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
 
-namespace Elsa.MongoDB.Common;
+namespace Elsa.MongoDb.Common;
 
 /// <summary>
 /// A generic repository class around MongoDb for accessing documents.
 /// </summary>
 /// <typeparam name="TDocument">The type of the document.</typeparam>
 [PublicAPI]
-public class MongoStore<TDocument> where TDocument : class
+public class MongoDbStore<TDocument> where TDocument : class
 {
  private readonly IMongoCollection<TDocument> _collection;
 
  /// <param name="collection"></param>
- public MongoStore(IMongoCollection<TDocument> collection)
+ public MongoDbStore(IMongoCollection<TDocument> collection)
  {
  _collection = collection;
  }

src/modules/Elsa.MongoDB/Common/PersistenceFeatureBase.cs → src/modules/Elsa.MongoDb/Common/PersistenceFeatureBase.cs

@@ -2,7 +2,7 @@
 using Elsa.Features.Services;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Elsa.MongoDB.Common;
+namespace Elsa.MongoDb.Common;
 
 /// <summary>
 /// Base class for features that configure MongoDb persistence.
@@ -15,14 +15,14 @@ protected PersistenceFeatureBase(IModule module) : base(module)
  }
 
  /// <summary>
- /// Registers an <see cref="MongoStore{TDocument}"/>.
+ /// Registers a <see cref="MongoDbStore{TDocument}"/>.
  /// </summary>
  /// <typeparam name="TStore">The type of the store.</typeparam>
  /// <typeparam name="TDocument">The document type of the store.</typeparam>
  protected void AddStore<TDocument, TStore>() where TDocument : class where TStore : class
  {
  Services
- .AddSingleton<MongoStore<TDocument>>()
+ .AddSingleton<MongoDbStore<TDocument>>()
  .AddSingleton<TStore>()
  ;
  }

src/modules/Elsa.MongoDB/Elsa.MongoDB.csproj → src/modules/Elsa.MongoDb/Elsa.MongoDb.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\..\common.props" />
+ <Import Project="..\..\..\common.props" />
  <Import Project="..\..\..\configureawait.props" />
 
  <PropertyGroup>

src/modules/Elsa.MongoDB/Extensions/DocumentExtensions.cs → src/modules/Elsa.MongoDb/Extensions/DocumentExtensions.cs

@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
 using MongoDB.Driver;
 
-namespace Elsa.MongoDB.Extensions;
+namespace Elsa.MongoDb.Extensions;
 
 public static class DocumentExtensions
 {

src/modules/Elsa.MongoDB/Extensions/ModuleExtensions.cs → src/modules/Elsa.MongoDb/Extensions/ModuleExtensions.cs

@@ -1,9 +1,8 @@
 using Elsa.Features.Services;
-using Elsa.MongoDB.Features;
-using Elsa.MongoDB.Options;
+using Elsa.MongoDb.Features;
 using JetBrains.Annotations;
 
-namespace Elsa.MongoDB.Extensions;
+namespace Elsa.MongoDb.Extensions;
 
 /// <summary>
 /// Extends <see cref="IModule"/> to configure the <see cref="MongoDbFeature"/> feature.
@@ -16,10 +15,10 @@ public static class ModuleExtensions
  /// </summary>
  public static IModule UseMongoDb(
  this IModule module, 
- Action<MongoDbOptions> options,
+ string connectionString,
  Action<MongoDbFeature>? configure = default)
  {
- configure += f => f.Options += options;
+ configure += f => f.ConnectionString = connectionString;
  module.Configure(configure);
  return module;
  }

src/modules/Elsa.MongoDB/Extensions/QueryableExtensions.cs → src/modules/Elsa.MongoDb/Extensions/QueryableExtensions.cs

@@ -2,7 +2,7 @@
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
 
-namespace Elsa.MongoDB.Extensions;
+namespace Elsa.MongoDb.Extensions;
 
 public static class QueryableExtensions
 {

src/modules/Elsa.MongoDB/Features/MongoDbFeature.cs → src/modules/Elsa.MongoDb/Features/MongoDbFeature.cs

@@ -1,34 +1,29 @@
 using System.Security.Authentication;
 using Elsa.Features.Abstractions;
 using Elsa.Features.Services;
-using Elsa.Http.Models;
 using Elsa.Identity.Contracts;
 using Elsa.Identity.Entities;
 using Elsa.Labels.Contracts;
 using Elsa.Labels.Entities;
-using Elsa.MongoDB.HostedServices;
-using Elsa.MongoDB.Modules.Identity;
-using Elsa.MongoDB.Modules.Labels;
-using Elsa.MongoDB.Modules.Management;
-using Elsa.MongoDB.Modules.Runtime;
-using Elsa.MongoDB.Options;
-using Elsa.MongoDB.Serializers;
-using Elsa.Workflows.Core.Services;
+using Elsa.MongoDb.HostedServices;
+using Elsa.MongoDb.Modules.Identity;
+using Elsa.MongoDb.Modules.Labels;
+using Elsa.MongoDb.Modules.Management;
+using Elsa.MongoDb.Modules.Runtime;
+using Elsa.MongoDb.Serializers;
 using Elsa.Workflows.Core.State;
 using Elsa.Workflows.Management.Contracts;
 using Elsa.Workflows.Management.Entities;
 using Elsa.Workflows.Runtime.Contracts;
 using Elsa.Workflows.Runtime.Entities;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
 using MongoDB.Bson.Serialization;
-using MongoDB.Bson.Serialization.Serializers;
 using MongoDB.Driver;
 using MongoDB.Driver.Core.Extensions.DiagnosticSources;
 using StoredBookmark = Elsa.Workflows.Runtime.Entities.StoredBookmark;
 using WorkflowExecutionLogRecord = Elsa.Workflows.Runtime.Entities.WorkflowExecutionLogRecord;
 
-namespace Elsa.MongoDB.Features;
+namespace Elsa.MongoDb.Features;
 
 /// <summary>
 /// Configures MongoDb.
@@ -41,16 +36,14 @@ public MongoDbFeature(IModule module) : base(module)
  }
 
  /// <summary>
- /// A delegate that configures MongoDb.
+ /// The MongoDB connection string.
  /// </summary>
- public Action<MongoDbOptions> Options { get; set; } = _ => { };
+ public string ConnectionString { get; set; }
 
  /// <inheritdoc />
  public override void Apply()
  {
- Services.Configure(Options);
-
- Services.AddSingleton(CreateDatabase);
+ Services.AddSingleton(_ => CreateDatabase(ConnectionString));
 
  RegisterSerializers();
 
@@ -87,11 +80,11 @@ private void RegisterSerializers()
  BsonSerializer.RegisterSerializer(typeof(object), new PolymorphicSerializer());
  }
 
- private static IMongoDatabase CreateDatabase(IServiceProvider sp)
+ private static IMongoDatabase CreateDatabase(string connectionString)
  {
- var options = sp.GetRequiredService<IOptions<MongoDbOptions>>().Value;
- var settings = MongoClientSettings.FromConnectionString(options.ConnectionString);
-
+ var mongoUrl = new MongoUrl(connectionString);
+ var settings = MongoClientSettings.FromUrl(mongoUrl);
+ 
  settings.ClusterConfigurator = cb => cb.Subscribe(new DiagnosticsActivityEventSubscriber());
  settings.ApplicationName = "elsa_workflows";
  settings.WriteConcern = WriteConcern.WMajority;
@@ -105,7 +98,7 @@ private static IMongoDatabase CreateDatabase(IServiceProvider sp)
  };
 
  var mongoClient = new MongoClient(settings);
- return mongoClient.GetDatabase(options.DatabaseName);
+ return mongoClient.GetDatabase(mongoUrl.DatabaseName);
  }
 
  private static void AddMongoCollection<T>(IServiceCollection services, string collectionName)

src/modules/Elsa.MongoDB/Helpers/ExpressionHelpers.cs → src/modules/Elsa.MongoDb/Helpers/ExpressionHelpers.cs

@@ -2,7 +2,7 @@
 using Elsa.Workflows.Management.Entities;
 using Elsa.Workflows.Management.Models;
 
-namespace Elsa.MongoDB.Helpers;
+namespace Elsa.MongoDb.Helpers;
 
 public class ExpressionHelpers
 {

src/modules/Elsa.MongoDB/HostedServices/CreateIndices.cs → src/modules/Elsa.MongoDb/HostedServices/CreateIndices.cs

@@ -8,7 +8,7 @@
 using StoredBookmark = Elsa.Workflows.Runtime.Entities.StoredBookmark;
 using WorkflowExecutionLogRecord = Elsa.Workflows.Runtime.Entities.WorkflowExecutionLogRecord;
 
-namespace Elsa.MongoDB.HostedServices;
+namespace Elsa.MongoDb.HostedServices;
 
 internal class CreateIndices : IHostedService
 {