Cleanup and pwd rules simplification

rxtur · rxtur · commit c12e8af288b8 · 2018-10-13T22:24:56.000-05:00
diff --git a/Blogifier.sln b/Blogifier.sln
@@ -27,12 +27,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{6015AFDB-9
 	ProjectSection(SolutionItems) = preProject
 		docs\AppSettings.md = docs\AppSettings.md
 		docs\Build.md = docs\Build.md
-		docs\CustomThemes.md = docs\CustomThemes.md
 		docs\Disqus.md = docs\Disqus.md
 		docs\Import.md = docs\Import.md
 		docs\Notifications.md = docs\Notifications.md
 		docs\Security.md = docs\Security.md
 		docs\SqlServer.md = docs\SqlServer.md
+		docs\Themes.md = docs\Themes.md
 		docs\VideoAudio.md = docs\VideoAudio.md
 	EndProjectSection
 EndProject
diff --git a/README.md b/README.md
@@ -17,8 +17,8 @@ Blogifier is single blog supporting multiple authors. Administrator can manage c
 
 1. Clone or download source code
 2. Run application in Visual Studio or using your code editor
-3. Use admin/Admin@pass1 to log in as admininstrator
-4. Use demo/Demo@pass1 to log in as regular user
+3. Use admin/admin to log in as admininstrator
+4. Use demo/demo to log in as regular user
 
 ## Demo site
 
diff --git a/docs/Security.md b/docs/Security.md
@@ -9,12 +9,12 @@ and publish posts and upload and manage files.
 ### Identity options
 Identity options defined in the `Startup.cs` and can be modified if do not fit requirements.
 By default, they pretty relaxed: you can use any characters in the user name and only password 
-restriction is to be at least six characters long.
+restriction is to be at least four characters long.
 
 ```csharp
 services.AddIdentity<AppUser, IdentityRole>(options => {
     options.Password.RequireDigit = false;
-    options.Password.RequiredLength = 6;
+    options.Password.RequiredLength = 4;
     options.Password.RequireNonAlphanumeric = false;
     options.Password.RequireUppercase = false;
     options.Password.RequireLowercase = false;
diff --git a/docs/Themes.md b/docs/Themes.md
diff --git a/src/App/Program.cs b/src/App/Program.cs
@@ -35,8 +35,8 @@ public static void Main(string[] args)
                 var userMgr = (UserManager<AppUser>)services.GetRequiredService(typeof(UserManager<AppUser>));
                 if (!userMgr.Users.Any())
                 {
-                    userMgr.CreateAsync(new AppUser { UserName = "admin", Email = "admin@us.com" }, "Admin@pass1");
-                    userMgr.CreateAsync(new AppUser { UserName = "demo", Email = "demo@us.com" }, "Demo@pass1");
+                    userMgr.CreateAsync(new AppUser { UserName = "admin", Email = "admin@us.com" }, "admin");
+                    userMgr.CreateAsync(new AppUser { UserName = "demo", Email = "demo@us.com" }, "demo");
                 }
 
                 // load application settings from appsettings.json
diff --git a/src/App/Startup.cs b/src/App/Startup.cs
@@ -47,7 +47,7 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddIdentity<AppUser, IdentityRole>(options => {
                 options.Password.RequireDigit = false;
-                options.Password.RequiredLength = 6;
+                options.Password.RequiredLength = 4;
                 options.Password.RequireNonAlphanumeric = false;
                 options.Password.RequireUppercase = false;
                 options.Password.RequireLowercase = false;
diff --git a/src/App/app.db b/src/App/app.db
diff --git a/src/Core/Constants.cs b/src/Core/Constants.cs
@@ -4,6 +4,5 @@ public class Constants
     {
         public static string NewestVersion = "last-version";
         public static string UpgradeDirectory = "_upgrade";
-        public static string DefaultAvatar = "lib/img/avatar.png";
     }
 }
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.0.2.3</Version>
+    <Version>2.0.2.4</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Core/Data/AppData.cs b/src/Core/Data/AppData.cs
@@ -98,7 +98,7 @@ public class SeedData
 
 #### To login:
 * User: demo
-* Pswd: Demo@pass1";
+* Pswd: demo";
 
         public static readonly string PostWhatIs = @"## What is Blogifier
 
@@ -115,8 +115,8 @@ public class SeedData
 
 1. Clone or download source code
 2. Run application in Visual Studio or using your code editor
-3. Use admin/Admin@pass1 to log in as admininstrator
-4. Use demo/Demo@pass1 to log in as user
+3. Use admin/admin to log in as admininstrator
+4. Use demo/demo to log in as user
 
 ## Demo site
 
@@ -148,7 +148,7 @@ The [demo site](http://blogifier.azurewebsites.net) is a playground to check out
 
 #### To login:
 * User: demo
-* Pswd: Demo@pass1";
+* Pswd: demo";
 
     }
 }
diff --git a/src/Core/Data/Models/AccountModel.cs b/src/Core/Data/Models/AccountModel.cs
@@ -1,21 +1,7 @@
-﻿using System;
-using System.ComponentModel.DataAnnotations;
+﻿using System.ComponentModel.DataAnnotations;
 
 namespace Core.Data.Models
 {
-    //public class LoginModel
-    //{
-    //    [Required]
-    //    public string UserName { get; set; }
-
-    //    [Required]
-    //    [DataType(DataType.Password)]
-    //    public string Password { get; set; }
-
-    //    [Display(Name = "Remember me?")]
-    //    public bool RememberMe { get; set; }
-    //}
-
     public class RegisterModel
     {
         [Required]
@@ -46,7 +32,7 @@ public class ChangePasswordModel
         public string OldPassword { get; set; }
 
         [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
+        [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 4)]
         [DataType(DataType.Password)]
         [Display(Name = "New password")]
         public string NewPassword { get; set; }
@@ -56,23 +42,4 @@ public class ChangePasswordModel
         [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
         public string ConfirmPassword { get; set; }
     }
-
-    //public class AuthorItem
-    //{
-    //    [Required]
-    //    public string Id { get; set; }
-    //    [Required]
-    //    [Display(Name="User name")]
-    //    public string UserName { get; set; }
-    //    [Required]
-    //    [EmailAddress]
-    //    public string Email { get; set; }
-    //    [Required]
-    //    [Display(Name="Display name")]
-    //    public string DisplayName { get; set; }
-    //    [Display(Name = "Avatar image")]
-    //    public string Avatar { get; set; }
-    //    public DateTime Created { get; set; }
-    //    public bool IsAdmin { get; set; }
-    //}
 }
diff --git a/src/Core/Data/Repositories/AuthorRepository.cs b/src/Core/Data/Repositories/AuthorRepository.cs
@@ -63,7 +63,7 @@ public async Task Save(Author author)
             if (author.Created == DateTime.MinValue)
             {
                 author.DisplayName = author.AppUserName;
-                author.Avatar = Constants.DefaultAvatar;
+                author.Avatar = AppSettings.Avatar;
                 author.Created = SystemClock.Now();
                 await _db.Authors.AddAsync(author);
             }
diff --git a/src/Core/Services/WebService.cs b/src/Core/Services/WebService.cs
@@ -15,7 +15,7 @@ public class WebService : IWebService
     {
         IDataService _db;
         static HttpClient client = new HttpClient();
-        static string _repoUrl = "https://api.github.com/repos/blogifierdotnet/Blogifier/releases/latest";
+        static string _repoUrl = "https://api.github.com/repos/rxtur/Sandbox/releases/latest"; // "https://api.github.com/repos/blogifierdotnet/Blogifier/releases/latest";
 
         public WebService(IDataService db)
         {
@@ -42,7 +42,8 @@ public async Task<string> CheckForLatestRelease()
                 int.TryParse(AppSettings.Version.Replace(".", "").Substring(0, 2), out current);
                 int.TryParse(repo.tag_name.ReplaceIgnoreCase("v", "").Replace(".", "").Substring(0, 2), out latest);
 
-                if(current < latest)
+                // at least version 2.1.x.x for auto-upgrade
+                if(current > 20 && current < latest)
                 {
                     var dwnUrl = repo.assets[0].browser_download_url;
                     result = $"The new Blogifier <a href='{repo.html_url}' class='alert-link' target='_blank'>{repo.name}</a> is available for download";
diff --git a/src/Upgrade/Program.cs b/src/Upgrade/Program.cs
@@ -107,45 +107,28 @@ static string NameFromPath(string path)
 
         static List<string> GetCoreFiles()
         {
-            return new List<string>
+            var fileName = $"{_upgDir}{_slash}files.txt";
+            var files = new List<string>();
+
+            var lines = File.ReadAllLines(fileName);
+            for (var i = 0; i < lines.Length; i++)
             {
-                "App.deps.json",
-                "App.dll",
-                "App.pdb",
-                "App.runtimeconfig.json",
-                "Common.dll",
-                "Core.dll",
-                "Core.pdb",
-                "HtmlAgilityPack.dll",
-                "Markdig.dll",
-                "Microsoft.Data.Sqlite.dll",
-                "Microsoft.EntityFrameworkCore.Sqlite.dll",
-                "Microsoft.SyndicationFeed.ReaderWriter.dll",
-                "ReverseMarkdown.dll",
-                "Serilog.dll",
-                "Serilog.Extensions.Logging.dll",
-                "Serilog.Sinks.File.dll",
-                "Serilog.Sinks.RollingFile.dll",
-                "SQLitePCLRaw.batteries_green.dll",
-                "SQLitePCLRaw.batteries_v2.dll",
-                "SQLitePCLRaw.core.dll",
-                "SQLitePCLRaw.provider.e_sqlite3.dll",
-                "System.Xml.XPath.XmlDocument.dll"
-            };
+                files.Add(lines[i].Trim());
+            }
+            return files;
         }
 
         static List<string> GetCoreFolders()
         {
-            return new List<string>
+            var fileName = $"{_upgDir}{_slash}folders.txt";
+            var folders = new List<string>();
+
+            var lines = File.ReadAllLines(fileName);
+            for (var i = 0; i < lines.Length; i++)
             {
-                "Pages",
-                $"Views{_slash}Shared",
-                $"Views{_slash}Themes{_slash}Standard",
-                $"wwwroot{_slash}admin",
-                $"wwwroot{_slash}lib",
-                $"wwwroot{_slash}themes{_slash}simple",
-                $"wwwroot{_slash}themes{_slash}standard"
-            };
+                folders.Add(lines[i].Trim().Replace("|", _slash));
+            }
+            return folders;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ public static void Main(string[] args)`
`35`	`35`	`var userMgr = (UserManager<AppUser>)services.GetRequiredService(typeof(UserManager<AppUser>));`
`36`	`36`	`if (!userMgr.Users.Any())`
`37`	`37`	`{`
`38`		`- userMgr.CreateAsync(new AppUser { UserName = "admin", Email = "admin@us.com" }, "Admin@pass1");`
`39`		`- userMgr.CreateAsync(new AppUser { UserName = "demo", Email = "demo@us.com" }, "Demo@pass1");`
	`38`	`+ userMgr.CreateAsync(new AppUser { UserName = "admin", Email = "admin@us.com" }, "admin");`
	`39`	`+ userMgr.CreateAsync(new AppUser { UserName = "demo", Email = "demo@us.com" }, "demo");`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`// load application settings from appsettings.json`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,5 @@ public class Constants`
`4`	`4`	`{`
`5`	`5`	`public static string NewestVersion = "last-version";`
`6`	`6`	`public static string UpgradeDirectory = "_upgrade";`
`7`		`- public static string DefaultAvatar = "lib/img/avatar.png";`
`8`	`7`	`}`
`9`	`8`	`}`