Browse Source

Autofac bugs fixed

pull/1/head
Sebastian 9 years ago
parent
commit
76e4e2b195
  1. 2
      src/Squidex/Config/Domain/EventStoreModule.cs
  2. 4
      src/Squidex/Config/Domain/InfrastructureModule.cs
  3. 10
      src/Squidex/Config/Domain/StoreMongoDbModule.cs
  4. 11
      src/Squidex/Config/Domain/WriteModule.cs
  5. 8
      src/Squidex/Config/Web/WebModule.cs
  6. 1
      src/Squidex/Startup.cs
  7. 3
      src/Squidex/appsettings.json

2
src/Squidex/Config/Domain/EventStoreModule.cs

@ -50,7 +50,7 @@ namespace Squidex.Config.Domain
throw new ConfigurationException("You must specify the MongoDB connection string in the 'squidex:eventStore:mongoDb:connectionString' configuration section.");
}
builder.Register(context =>
builder.Register(c =>
{
var mongoDbClient = new MongoClient(connectionString);
var mongoDatabase = mongoDbClient.GetDatabase(databaseName);

4
src/Squidex/Config/Domain/InfrastructureModule.cs

@ -42,6 +42,10 @@ namespace Squidex.Config.Domain
.As<IDomainObjectRepository>()
.SingleInstance();
builder.RegisterType<DefaultDomainObjectFactory>()
.As<IDomainObjectFactory>()
.SingleInstance();
builder.RegisterType<AggregateHandler>()
.As<IAggregateHandler>()
.SingleInstance();

10
src/Squidex/Config/Domain/StoreMongoDbModule.cs

@ -58,7 +58,7 @@ namespace Squidex.Config.Domain
throw new ConfigurationException("You must specify the MongoDB connection string in the 'squidex:stores:mongoDb:connectionString' configuration section.");
}
builder.Register(context =>
builder.Register(c =>
{
var mongoDbClient = new MongoClient(connectionString);
var mongoDatabase = mongoDbClient.GetDatabase(databaseName);
@ -66,9 +66,9 @@ namespace Squidex.Config.Domain
return mongoDatabase;
}).Named<IMongoDatabase>(MongoDatabaseName).SingleInstance();
builder.Register<IUserStore<IdentityUser>>(context =>
builder.Register<IUserStore<IdentityUser>>(c =>
{
var usersCollection = context.ResolveNamed<IMongoDatabase>(MongoDatabaseName).GetCollection<IdentityUser>("Identity_Users");
var usersCollection = c.ResolveNamed<IMongoDatabase>(MongoDatabaseName).GetCollection<IdentityUser>("Identity_Users");
IndexChecks.EnsureUniqueIndexOnNormalizedEmail(usersCollection);
IndexChecks.EnsureUniqueIndexOnNormalizedUserName(usersCollection);
@ -76,9 +76,9 @@ namespace Squidex.Config.Domain
return new UserStore<IdentityUser>(usersCollection);
}).SingleInstance();
builder.Register<IRoleStore<IdentityRole>>(context =>
builder.Register<IRoleStore<IdentityRole>>(c =>
{
var rolesCollection = context.ResolveNamed<IMongoDatabase>(MongoDatabaseName).GetCollection<IdentityRole>("Identity_Roles");
var rolesCollection = c.ResolveNamed<IMongoDatabase>(MongoDatabaseName).GetCollection<IdentityRole>("Identity_Roles");
IndexChecks.EnsureUniqueIndexOnNormalizedRoleName(rolesCollection);

11
src/Squidex/Config/Domain/WriteModule.cs

@ -87,15 +87,20 @@ namespace Squidex.Config.Domain
.SingleInstance();
builder.Register<DomainObjectFactoryFunction<AppDomainObject>>(s => (id => new AppDomainObject(id, 0)))
builder.Register<DomainObjectFactoryFunction<AppDomainObject>>(c => (id => new AppDomainObject(id, 0)))
.AsSelf()
.InstancePerDependency();
builder.Register<DomainObjectFactoryFunction<ContentDomainObject>>(s => (id => new ContentDomainObject(id, 0)))
builder.Register<DomainObjectFactoryFunction<ContentDomainObject>>(c => (id => new ContentDomainObject(id, 0)))
.AsSelf()
.InstancePerDependency();
builder.Register<DomainObjectFactoryFunction<SchemaDomainObject>>(s => (id => new SchemaDomainObject(id, 0, s.Resolve<FieldRegistry>())))
builder.Register<DomainObjectFactoryFunction<SchemaDomainObject>>(c =>
{
var fieldRegistry = c.Resolve<FieldRegistry>();
return (id => new SchemaDomainObject(id, 0, fieldRegistry));
})
.AsSelf()
.InstancePerDependency();
}

8
src/Squidex/Config/Web/WebModule.cs

@ -7,12 +7,20 @@
// ==========================================================================
using Autofac;
using Microsoft.Extensions.Configuration;
using Squidex.Pipeline;
namespace Squidex.Config.Web
{
public class WebModule : Module
{
public IConfiguration Configuration { get; }
public WebModule(IConfiguration configuration)
{
Configuration = configuration;
}
protected override void Load(ContainerBuilder builder)
{
builder.RegisterType<AppFilterAttribute>()

1
src/Squidex/Startup.cs

@ -81,6 +81,7 @@ namespace Squidex
builder.RegisterModule(new InfrastructureModule(Configuration));
builder.RegisterModule(new ReadModule(Configuration));
builder.RegisterModule(new StoreModule(Configuration));
builder.RegisterModule(new WebModule(Configuration));
builder.RegisterModule(new WriteModule(Configuration));
var container = builder.Build();

3
src/Squidex/appsettings.json

@ -26,7 +26,8 @@
},
"identity": {
"googleClient": "1006817248705-t3lb3ge808m9am4t7upqth79hulk456l.apps.googleusercontent.com",
"googleSecret": "QsEi-fHqkGw2_PjJmtNHf2wg"
"googleSecret": "QsEi-fHqkGw2_PjJmtNHf2wg",
"keysFolder": "D:\\Keys"
}
}
}
Loading…
Cancel
Save