Merge pull request #521 from PiranhaCMS/master

Merge from master

README.md

@@ -1,6 +1,7 @@
 # Welcome to Piranha.Core
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/ba7cbafe380b4c2796b731562c5166e0)](https://www.codacy.com/app/tidyui/piranha.core?utm_source=github.com&utm_medium=referral&utm_content=PiranhaCMS/piranha.core&utm_campaign=Badge_Grade)
+[![CodeFactor](https://www.codefactor.io/repository/github/piranhacms/piranha.core/badge)](https://www.codefactor.io/repository/github/piranhacms/piranha.core)
 [![Total alerts](https://img.shields.io/lgtm/alerts/g/PiranhaCMS/piranha.core.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/PiranhaCMS/piranha.core/alerts/)
 [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/PiranhaCMS/piranha.core.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/PiranhaCMS/piranha.core/context:javascript)
 [![Gitter chat](https://badges.gitter.im/PiranhaCMS/Piranha.png)](https://gitter.im/PiranhaCMS/Piranha)

core/Piranha.AspNetCore.Identity/DefaultIdentitySeed.cs

@@ -47,7 +47,7 @@ public DefaultIdentitySeed(IDb db, UserManager<User> userManager)
         /// </summary>
         public async Task CreateAsync()
         {
-            if (_db.Users.Any())
+            if (!_db.Users.Any())
             {
                 var user = new User
                 {

core/Piranha.AspNetCore/HttpCaching.cs

@@ -3,9 +3,9 @@
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
- * 
+ *
  * https://github.com/piranhacms/piranha.core
- * 
+ *
  */
 
 using Microsoft.AspNetCore.Http;
@@ -37,9 +37,7 @@ public static bool IsCached(HttpContext context, HttpCacheInfo serverInfo)
             if (clientInfo.LastModified.HasValue)
             {
                 return clientInfo.LastModified.Value >= serverInfo.LastModified.Value;
-
             }
-
             return false;
         }
 
@@ -76,8 +74,8 @@ public static HttpCacheInfo Get(HttpContext context)
                 {
                     info.LastModified = DateTime.Parse(lastMod);
                 }
-                catch 
-                { 
+                catch
+                {
                     info.LastModified = null;
                 }
             }

core/Piranha.Azure.BlobStorage/BlobStorage.cs

@@ -3,9 +3,9 @@
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
- * 
+ *
  * https://github.com/piranhacms/piranha.core
- * 
+ *
  */
 
 using Microsoft.WindowsAzure.Storage;
@@ -34,27 +34,36 @@ public class BlobStorage : IStorage
         private string _containerUrl;
 
         /// <summary>
-        /// Default constructor.
+        /// Creates a new Blog Storage service from the given credentials.
         /// </summary>
-        public BlobStorage(StorageCredentials credentials, string containerName = "uploads")
+        public BlobStorage(StorageCredentials credentials, string containerName = "uploads")
         {
             _storage = new CloudStorageAccount(credentials, true);
             _containerName = containerName;
         }
 
+        /// <summary>
+        /// Creates a new Blob Storage service from the given connection string.
+        /// </summary>
+        public BlobStorage(string connectionString, string containerName = "uploads")
+        {
+            _storage = CloudStorageAccount.Parse(connectionString);
+            _containerName = containerName;
+        }
+
         /// <summary>
         /// Opens a new storage session.
         /// </summary>
         /// <returns>A new open session</returns>
-        public async Task<IStorageSession> OpenAsync()
+        public async Task<IStorageSession> OpenAsync()
         {
             var session = _storage.CreateCloudBlobClient();
             var container = session.GetContainerReference(_containerName);
 
-            if (!await container.ExistsAsync())
+            if (!await container.ExistsAsync())
             {
                 await container.CreateAsync();
-                await container.SetPermissionsAsync(new BlobContainerPermissions()
+                await container.SetPermissionsAsync(new BlobContainerPermissions()
                 {
                     PublicAccess = BlobContainerPublicAccessType.Blob
                 });
@@ -69,16 +78,16 @@ await container.SetPermissionsAsync(new BlobContainerPermissions()
         /// </summary>
         /// <param name="id">The media resource id</param>
         /// <returns>The public url</returns>
-        public string GetPublicUrl(string id)
+        public string GetPublicUrl(string id)
         {
-            if (!string.IsNullOrWhiteSpace(id))
+            if (!string.IsNullOrWhiteSpace(id))
             {
-                if (string.IsNullOrEmpty(_containerUrl))
+                if (string.IsNullOrEmpty(_containerUrl))
                 {
                     var session = _storage.CreateCloudBlobClient();
                     var container = session.GetContainerReference(_containerName);
 
-                    _containerUrl = container.Uri.AbsoluteUri;
+                    _containerUrl = container.Uri.AbsoluteUri;
                 }
                 return _containerUrl + "/" + id;
             }

core/Piranha.Azure.BlobStorage/BlobStorageExtensions.cs

@@ -3,9 +3,9 @@
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
- * 
+ *
  * https://github.com/piranhacms/piranha.core
- * 
+ *
  */
 
 using Microsoft.Extensions.DependencyInjection;
@@ -30,4 +30,20 @@ public static IServiceCollection AddPiranhaBlobStorage(this IServiceCollection s
 
         return services;
     }
+
+    /// <summary>
+    /// Adds the services for the Azure BlobStorage service.
+    /// </summary>
+    /// <param name="services">The current service collection</param>
+    /// <param name="connectionString">The connection string</param>
+    /// <param name="containerName">The optional container name</param>
+    /// <param name="scope">The optional service scope. Default is singleton</param>
+    /// <returns>The service collection</returns>
+    public static IServiceCollection AddPiranhaBlobStorage(this IServiceCollection services,
+        string connectionString, string containerName = "uploads", ServiceLifetime scope = ServiceLifetime.Singleton)
+    {
+        services.Add(new ServiceDescriptor(typeof(IStorage), sp => new BlobStorage(connectionString, containerName), scope));
+
+        return services;
+    }
 }

core/Piranha.Azure.BlobStorage/Piranha.Azure.BlobStorage.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>5.3.0</Version>
+    <Version>5.3.1</Version>
     <Company>Piranha CMS</Company>
     <AssemblyTitle>Piranha.Azure.BlogStorage</AssemblyTitle>
     <RootNamespace>Piranha.Azure</RootNamespace>
@@ -10,6 +10,7 @@
     <ProjectReference Include="..\Piranha\Piranha.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WindowsAzure.Storage" Version="9.3.2" />
+    <PackageReference Include="Microsoft.Azure.KeyVault.Core" Version="3.0.1" />
+    <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="9.4.2" />
   </ItemGroup>
 </Project>

core/Piranha.ImageSharp/Piranha.ImageSharp.csproj

@@ -7,7 +7,7 @@
     <AssemblyTitle>Piranha.ImageSharp</AssemblyTitle>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0005" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0006" />
     <ProjectReference Include="..\Piranha\Piranha.csproj" />
   </ItemGroup>
 

core/Piranha.Manager/Areas/Manager/Controllers/PostController.cs

@@ -3,9 +3,9 @@
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
- * 
+ *
  * https://github.com/piranhacms/piranha.core
- * 
+ *
  */
 
 using System;
@@ -240,7 +240,6 @@ public IActionResult AddRegion([FromBody]Models.PageRegionModel model)
             return new NotFoundResult();
         }
 
-
         [HttpPost]
         [Route("manager/post/alias")]
         [Authorize(Policy = Permission.PostsEdit)]

core/Piranha.Manager/Areas/Manager/Models/PageListModel.cs

@@ -3,9 +3,9 @@
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
- * 
+ *
  * https://github.com/piranhacms/piranha.core
- * 
+ *
  */
 
 using System;
@@ -45,14 +45,13 @@ public class SiteInfo
         /// </summary>
         public string SiteId { get; set; }
 
-
         /// <summary>
         /// Gets/sets the current site title.
         /// </summary>
         public string SiteTitle { get; set; }
 
         /// <summary>
-        /// Gets/sets if the user should be able 
+        /// Gets/sets if the user should be able
         /// to edit the site content.
         /// </summary>
         public bool HasSiteContent { get; set; }

core/Piranha.Manager/assets/css/style.css

@@ -12040,9 +12040,9 @@ span.CodeMirror-selectedtext {
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
- * 
+ *
  * https://github.com/piranhacms/piranha.core
- * 
+ *
  */
 .dd {
   position: relative;
@@ -12091,7 +12091,6 @@ span.CodeMirror-selectedtext {
   padding: 4px 0;
 }
 .dd-item > button {
-  _display: block;
   display: none;
   position: relative;
   cursor: pointer;
@@ -12340,7 +12339,7 @@ body.collapsed .navmenu-inverse span.title {
 }
 .navmenu-inverse {
   width: 220px;
-  border: none 0px;
+  border: none 0;
 }
 .navmenu-inverse .navmenu-brand {
   text-align: center;
@@ -13228,7 +13227,7 @@ li.sitemap-item .actions.one {
   margin: 0;
 }
 .custom-editor {
-  padding: 0px 15px;
+  padding: 0 15px;
 }
 .custom-editor .custom-editor-list {
   background: #f8f8f8;
@@ -13375,7 +13374,7 @@ li.sitemap-item .actions.one {
   font-weight: 300;
 }
 #page-blocks [contenteditable]:focus {
-  outline: 0px solid transparent;
+  outline: 0 solid transparent;
 }
 #page-blocks .sortable-placeholder {
   padding: 0;
@@ -13970,7 +13969,7 @@ li.sitemap-item .actions.one {
   z-index: 1000000;
   position: fixed;
   left: 15px;
-  bottom: 0px;
+  bottom: 0;
   max-width: 500px;
 }
 .notification-alert {