mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-09-22 20:13:50 +08:00
Wrapping user and content creation during setup in try/catch to cancel the transaction if something esplodes
--HG-- branch : dev
This commit is contained in:
@@ -4,6 +4,7 @@ using Orchard.Comments.Models;
|
|||||||
using Orchard.ContentManagement;
|
using Orchard.ContentManagement;
|
||||||
using Orchard.Core.Common.Models;
|
using Orchard.Core.Common.Models;
|
||||||
using Orchard.Core.Settings.Models;
|
using Orchard.Core.Settings.Models;
|
||||||
|
using Orchard.Data;
|
||||||
using Orchard.Data.Migrations;
|
using Orchard.Data.Migrations;
|
||||||
using Orchard.Environment;
|
using Orchard.Environment;
|
||||||
using Orchard.Environment.Configuration;
|
using Orchard.Environment.Configuration;
|
||||||
@@ -61,11 +62,15 @@ namespace Orchard.Setup.Controllers {
|
|||||||
// in theory this environment can be used to resolve any normal components by interface, and those
|
// in theory this environment can be used to resolve any normal components by interface, and those
|
||||||
// components will exist entirely in isolation - no crossover between the safemode container currently in effect
|
// components will exist entirely in isolation - no crossover between the safemode container currently in effect
|
||||||
using (var finiteEnvironment = _orchardHost.CreateStandaloneEnvironment(shellSettings)) {
|
using (var finiteEnvironment = _orchardHost.CreateStandaloneEnvironment(shellSettings)) {
|
||||||
|
try {
|
||||||
var contentManager = finiteEnvironment.Resolve<IContentManager>();
|
var contentManager = finiteEnvironment.Resolve<IContentManager>();
|
||||||
|
|
||||||
// create superuser
|
// create superuser
|
||||||
var membershipService = finiteEnvironment.Resolve<IMembershipService>();
|
var membershipService = finiteEnvironment.Resolve<IMembershipService>();
|
||||||
var user = membershipService.CreateUser(new CreateUserParams(model.AdminUsername, model.AdminPassword, String.Empty, String.Empty, String.Empty, true));
|
var user =
|
||||||
|
membershipService.CreateUser(new CreateUserParams(model.AdminUsername, model.AdminPassword,
|
||||||
|
String.Empty, String.Empty, String.Empty,
|
||||||
|
true));
|
||||||
|
|
||||||
// set site name and settings
|
// set site name and settings
|
||||||
var siteService = finiteEnvironment.Resolve<ISiteService>();
|
var siteService = finiteEnvironment.Resolve<ISiteService>();
|
||||||
@@ -87,6 +92,11 @@ namespace Orchard.Setup.Controllers {
|
|||||||
var authenticationService = finiteEnvironment.Resolve<IAuthenticationService>();
|
var authenticationService = finiteEnvironment.Resolve<IAuthenticationService>();
|
||||||
authenticationService.SignIn(user, true);
|
authenticationService.SignIn(user, true);
|
||||||
}
|
}
|
||||||
|
catch {
|
||||||
|
finiteEnvironment.Resolve<ITransactionManager>().Cancel();
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
_shellSettingsLoader.SaveSettings(shellSettings);
|
_shellSettingsLoader.SaveSettings(shellSettings);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user