diff --git a/src/apps/Elsa.ModularServer.Web/Elsa.ModularServer.Web.csproj b/src/apps/Elsa.ModularServer.Web/Elsa.ModularServer.Web.csproj index 4632e1e43..410510c25 100644 --- a/src/apps/Elsa.ModularServer.Web/Elsa.ModularServer.Web.csproj +++ b/src/apps/Elsa.ModularServer.Web/Elsa.ModularServer.Web.csproj @@ -7,6 +7,7 @@ + diff --git a/src/apps/Elsa.ModularServer.Web/appsettings.Development.json b/src/apps/Elsa.ModularServer.Web/appsettings.Development.json index 29047db60..7778896a3 100644 --- a/src/apps/Elsa.ModularServer.Web/appsettings.Development.json +++ b/src/apps/Elsa.ModularServer.Web/appsettings.Development.json @@ -5,6 +5,7 @@ "Microsoft.Hosting": "Information", "Elsa.SamplePackage": "Information", "CShells": "Information", + "CShells.AspNetCore.Notifications.ShellEndpointRegistrationHandler": "Warning", "Nuplane": "Information" } } diff --git a/src/apps/Elsa.ModularServer.Web/appsettings.json b/src/apps/Elsa.ModularServer.Web/appsettings.json index 7d59b195d..b7ec235c7 100644 --- a/src/apps/Elsa.ModularServer.Web/appsettings.json +++ b/src/apps/Elsa.ModularServer.Web/appsettings.json @@ -12,7 +12,7 @@ "Name": "Default", "Configuration": { "WebRouting": { - "Path": "foo" + "Path": "" } }, "Features": { @@ -25,6 +25,8 @@ "SigningKey": "CHANGE_ME_TO_A_SECURE_RANDOM_KEY" }, "DefaultAdminUser": { + "AdminUserName": "admin", + "AdminPassword": "", "AdminRoleName": "admin", "AdminRolePermissions": [ "*" @@ -36,6 +38,14 @@ "SqliteWorkflowPersistence": { "ConnectionString": "Data Source=elsa_workflows.db;Cache=Shared" }, + "SqliteIdentityPersistence": { + "ConnectionString": "Data Source=elsa_identity.db;Cache=Shared" + }, + "Http": { + "HttpActivityOptions": { + "BaseUrl": "https://localhost:5001" + } + }, "SampleEndpoint": {} } } diff --git a/src/modules/Elsa.Http/ShellFeatures/HttpFeature.cs b/src/modules/Elsa.Http/ShellFeatures/HttpFeature.cs index 1d360ceb7..f87dc3daa 100644 --- a/src/modules/Elsa.Http/ShellFeatures/HttpFeature.cs +++ b/src/modules/Elsa.Http/ShellFeatures/HttpFeature.cs @@ -7,7 +7,6 @@ using Elsa.Http.ContentWriters; using Elsa.Http.DownloadableContentHandlers; using Elsa.Http.FileCaches; using Elsa.Http.Handlers; -using Elsa.Http.Middleware; using Elsa.Http.Options; using Elsa.Http.Parsers; using Elsa.Http.PortResolvers; @@ -24,7 +23,6 @@ using FluentStorage; using JetBrains.Annotations; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.StaticFiles; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; diff --git a/src/modules/Elsa.Http/ShellFeatures/HttpJavaScriptFeature.cs b/src/modules/Elsa.Http/ShellFeatures/HttpJavaScriptFeature.cs index 05d73b0eb..f9b3e48ef 100644 --- a/src/modules/Elsa.Http/ShellFeatures/HttpJavaScriptFeature.cs +++ b/src/modules/Elsa.Http/ShellFeatures/HttpJavaScriptFeature.cs @@ -1,4 +1,5 @@ using CShells.Features; +using Elsa.Expressions.JavaScript.ShellFeatures; using Elsa.Http.Scripting.JavaScript; using JetBrains.Annotations; using Microsoft.Extensions.DependencyInjection; @@ -10,7 +11,8 @@ namespace Elsa.Http.ShellFeatures; /// [ShellFeature( DisplayName = "HTTP JavaScript", - Description = "Provides JavaScript integration for HTTP activities")] + Description = "Provides JavaScript integration for HTTP activities", + DependsOn = [typeof(JavaScriptFeature)])] [UsedImplicitly] public class HttpJavaScriptFeature : IShellFeature { diff --git a/src/modules/Elsa.Workflows.Management/ShellFeatures/WorkflowManagementFeature.cs b/src/modules/Elsa.Workflows.Management/ShellFeatures/WorkflowManagementFeature.cs index d306789da..d34feb336 100644 --- a/src/modules/Elsa.Workflows.Management/ShellFeatures/WorkflowManagementFeature.cs +++ b/src/modules/Elsa.Workflows.Management/ShellFeatures/WorkflowManagementFeature.cs @@ -98,6 +98,8 @@ public class WorkflowManagementFeature : IShellFeature .AddScoped() .AddScoped() .AddScoped() + .AddScoped() + .AddSingleton() .AddScoped() .AddScoped() .AddScoped()