yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes up the starter kit installer in the back office with it's legacy implementation. Adds some handy methods for webapi routing for areas.

Browse Source
This commit is contained in:
Shannon
2014-03-05 22:42:51 +11:00
parent 24cc417395
commit feab2de260
23 changed files with 170 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Install/Controllers/InstallController.cs
View File

@@ -57,7 +57,7 @@ namespace Umbraco.Web.Install.Controllers
}
//gen the install base url
ViewBag.InstallApiBaseUrl = Url.GetUmbracoApiService("GetSetup", "InstallApi", "install").TrimEnd("GetSetup");
ViewBag.InstallApiBaseUrl = Url.GetUmbracoApiService("GetSetup", "InstallApi", "UmbracoInstall").TrimEnd("GetSetup");
//get the base umbraco folder
ViewBag.UmbracoBaseFolder = IOHelper.ResolveUrl(SystemDirectories.Umbraco);

64
src/Umbraco.Web/Install/Controllers/InstallPackageController.cs
View File

@@ -8,6 +8,7 @@ using System.Web.Http;
using Newtonsoft.Json.Linq;
using umbraco;
using Umbraco.Core;
using Umbraco.Web.Install.Models;
using Umbraco.Web.WebApi;
namespace Umbraco.Web.Install.Controllers
@@ -20,6 +21,7 @@ namespace Umbraco.Web.Install.Controllers
/// is a bit of a mess currently.
/// </remarks>
[HttpInstallAuthorize]
[AngularJsonOnlyConfiguration]
[Obsolete("This is only used for the legacy way of installing starter kits in the back office")]
public class InstallPackageController : ApiController
{
@@ -42,37 +44,38 @@ namespace Umbraco.Web.Install.Controllers
/// Empty action, useful for retrieving the base url for this controller
/// </summary>
/// <returns></returns>
[HttpGet]
public HttpResponseMessage Index()
{
throw new NotImplementedException();
}
/// <summary>
/// Connects to the repo, downloads the package and creates the manifest
/// </summary>
/// <param name="kitGuid"></param>
/// <returns></returns>
[HttpPost]
public HttpResponseMessage DownloadPackageFiles(Guid kitGuid)
/// <summary>
/// Connects to the repo, downloads the package and creates the manifest
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
public HttpResponseMessage DownloadPackageFiles(InstallPackageModel model)
{
var repo = global::umbraco.cms.businesslogic.packager.repositories.Repository.getByGuid(RepoGuid);
if (repo == null)
{
return Json(
new {success = false, error = "No repository found with id " + RepoGuid},
HttpStatusCode.BadGateway);
HttpStatusCode.OK);
}
if (repo.HasConnection() == false)
{
return Json(
new { success = false, error = "cannot_connect" },
HttpStatusCode.BadGateway);
HttpStatusCode.OK);
}
var installer = new global::umbraco.cms.businesslogic.packager.Installer();
var tempFile = installer.Import(repo.fetch(kitGuid.ToString()));
var tempFile = installer.Import(repo.fetch(model.KitGuid.ToString()));
installer.LoadConfig(tempFile);
var pId = installer.CreateManifest(tempFile, kitGuid.ToString(), RepoGuid);
var pId = installer.CreateManifest(tempFile, model.KitGuid.ToString(), RepoGuid);
return Json(new
{
success = true,
@@ -88,17 +91,17 @@ namespace Umbraco.Web.Install.Controllers
/// </summary>
/// <returns></returns>
[HttpPost]
public HttpResponseMessage InstallPackageFiles(Guid kitGuid, int manifestId, string packageFile)
public HttpResponseMessage InstallPackageFiles(InstallPackageModel model)
{
packageFile = HttpUtility.UrlDecode(packageFile);
model.PackageFile = HttpUtility.UrlDecode(model.PackageFile);
var installer = new global::umbraco.cms.businesslogic.packager.Installer();
installer.LoadConfig(packageFile);
installer.InstallFiles(manifestId, packageFile);
installer.LoadConfig(model.PackageFile);
installer.InstallFiles(model.ManifestId, model.PackageFile);
return Json(new
{
success = true,
manifestId,
packageFile,
model.ManifestId,
model.PackageFile,
percentage = 20,
message = "Installing starter kit files"
}, HttpStatusCode.OK);
@@ -134,7 +137,8 @@ namespace Umbraco.Web.Install.Controllers
return Json(new
{
percentage = 30
percentage = 30,
success = true,
}, HttpStatusCode.OK);
}
@@ -143,17 +147,17 @@ namespace Umbraco.Web.Install.Controllers
/// </summary>
/// <returns></returns>
[HttpPost]
public HttpResponseMessage InstallBusinessLogic(Guid kitGuid, int manifestId, string packageFile)
public HttpResponseMessage InstallBusinessLogic(InstallPackageModel model)
{
packageFile = HttpUtility.UrlDecode(packageFile);
model.PackageFile = HttpUtility.UrlDecode(model.PackageFile);
var installer = new global::umbraco.cms.businesslogic.packager.Installer();
installer.LoadConfig(packageFile);
installer.InstallBusinessLogic(manifestId, packageFile);
installer.LoadConfig(model.PackageFile);
installer.InstallBusinessLogic(model.ManifestId, model.PackageFile);
return Json(new
{
success = true,
manifestId,
packageFile,
model.ManifestId,
model.PackageFile,
percentage = 70,
message = "Installing starter kit files"
}, HttpStatusCode.OK);
@@ -164,20 +168,20 @@ namespace Umbraco.Web.Install.Controllers
/// </summary>
/// <returns></returns>
[HttpPost]
public HttpResponseMessage CleanupInstallation(Guid kitGuid, int manifestId, string packageFile)
public HttpResponseMessage CleanupInstallation(InstallPackageModel model)
{
packageFile = HttpUtility.UrlDecode(packageFile);
model.PackageFile = HttpUtility.UrlDecode(model.PackageFile);
var installer = new global::umbraco.cms.businesslogic.packager.Installer();
installer.LoadConfig(packageFile);
installer.InstallCleanUp(manifestId, packageFile);
installer.LoadConfig(model.PackageFile);
installer.InstallCleanUp(model.ManifestId, model.PackageFile);
library.RefreshContent();
return Json(new
{
success = true,
manifestId,
packageFile,
model.ManifestId,
model.PackageFile,
percentage = 100,
message = "Starter kit has been installed"
}, HttpStatusCode.OK);

23
src/Umbraco.Web/Install/Models/InstallPackageModel.cs Normal file
View File

@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace Umbraco.Web.Install.Models
{
[Obsolete("This is only used for the obsolete controller InstallPackageController")]
[DataContract(Name = "installPackage", Namespace = "")]
public class InstallPackageModel
{
[DataMember(Name = "kitGuid")]
public Guid KitGuid { get; set; }
[DataMember(Name = "manifestId")]
public int ManifestId { get; set; }
[DataMember(Name = "packageFile")]
public string PackageFile { get; set; }
}
}

23
src/Umbraco.Web/Install/UmbracoInstallArea.cs
View File

@@ -28,19 +28,20 @@ namespace Umbraco.Web.Install
"Install",
new { controller = "Install", action = "Index", id = UrlParameter.Optional },
new[] { typeof(InstallController).Namespace });
var apiRoute = context.Routes.MapHttpRoute(
//TODO: We can remove this when we re-build the back office package installer
//Create the install routes
context.MapHttpRoute(
"Umbraco_install_packages",
"Install/PackageInstaller/{action}/{id}",
new { controller = "InstallPackage", action = "Index", id = UrlParameter.Optional },
new[] { typeof(InstallPackageController).Namespace });
context.MapHttpRoute(
"umbraco-install-api",
"install/api/{action}/{id}",
new { controller = "InstallApi", action = "Status", id = RouteParameter.Optional });
//web api routes don't set the data tokens object
if (apiRoute.DataTokens == null)
{
apiRoute.DataTokens = new RouteValueDictionary();
}
apiRoute.DataTokens.Add("area", "Install");
apiRoute.DataTokens.Add("Namespaces", new[] { typeof(InstallApiController).Namespace }); //look in this namespace to create the controller
apiRoute.DataTokens.Add("UseNamespaceFallback", false); //Don't look anywhere else except this namespace!
new {controller = "InstallApi", action = "Status", id = RouteParameter.Optional},
new[] {typeof (InstallApiController).Namespace});
}
public override string AreaName