diff --git a/Vrh.Log4Pro.MaintenanceConsole/Manager - UserManager.cs b/Vrh.Log4Pro.MaintenanceConsole/Manager - UserManager.cs index 6f33968..a141b04 100644 --- a/Vrh.Log4Pro.MaintenanceConsole/Manager - UserManager.cs +++ b/Vrh.Log4Pro.MaintenanceConsole/Manager - UserManager.cs @@ -42,7 +42,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.UserManagerNS var menufunctions = new Menu("Log4Pro User Manager", "Select function!") .AddMenuItem(new Menu.Item(CLP.Module.Log4ProUserManager.Functions.CreateSuperuser.KEY, "Create superuser", CreateSuperuser, new Menu.ExecutorParameter(cfg: config))) - .AddMenuItem(new Menu.Item(CLP.Module.Log4ProUserManager.Functions.CreateAdminusers.KEY, "Create Admin and Administrator roles and users", CreateAdminusers, new Menu.ExecutorParameter(cfg: config, null))) + .AddMenuItem(new Menu.Item(CLP.Module.Log4ProUserManager.Functions.CreateAdminusers.KEY, "Create Admin and Administrator roles and users", CreateAdminuser, new Menu.ExecutorParameter(cfg: config, null))) .AddMenuItem(new Menu.Item(CLP.Module.Log4ProUserManager.Functions.DeleteUsers.KEY, "Remove user", DeleteUsers, new Menu.ExecutorParameter(cfg: config, null))) .AddMenuItem(new Menu.Item(CLP.Module.Log4ProUserManager.Functions.ExecuteInitAction.KEY, "Execute init actionblock", ExecuteInitActionBlock, new Menu.ExecutorParameter(cfg: config, null))) .SetMenuHeaderDisplayer(UserListDisplayer) @@ -149,16 +149,19 @@ namespace Vrh.Log4Pro.MaintenanceConsole.UserManagerNS } #endregion CreateSuperuser #region CreateAdminusers - private static object CreateAdminusers(object parameter, object o) + private static object CreateAdminuser(object parameter, object o) { var config = (parameter as Menu.ExecutorParameter).GetConfig(); - var adminun = ColorConsole.ReadLine($"Enter administrator name:", ConsoleColor.Yellow); + var adminun = ColorConsole.ReadLine($"Enter administrator name (* for Administrator):", ConsoleColor.Yellow); if (adminun.ToUpper() == "EX") { return null; } - var adminpsw = ColorConsole.ReadLine($"Enter administrator password:", ConsoleColor.Yellow); + if (adminun.ToUpper() == "*") { adminun=null; } + + var adminpsw = ColorConsole.ReadLine($"Enter administrator password (* for Admin123):", ConsoleColor.Yellow); if (adminpsw.ToUpper() == "EX") { return null; } + if (adminpsw.ToUpper() == "*") { adminpsw=null; } try { - MembershipTools.Users.CreateAdminRolesAndUsers(adminpsw); + MembershipTools.Users.CreateAdminRolesAndUsers(adminun,adminpsw); ColorConsole.WriteLine($"Creating admin users was successful!", ConsoleColor.Green); } catch (Exception ex) { ColorConsole.WriteLine(ex.Message, ConsoleColor.Red); } diff --git a/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs b/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs index 4fd1a52..059c498 100644 --- a/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs +++ b/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.19.5.0")] -[assembly: AssemblyFileVersion("1.19.5.0")] +[assembly: AssemblyVersion("1.20.0.0")] +[assembly: AssemblyFileVersion("1.20.0.0")] diff --git a/Vrh.Log4Pro.MaintenanceConsole/Tools - Membership.cs b/Vrh.Log4Pro.MaintenanceConsole/Tools - Membership.cs index af9327f..8cc8a1e 100644 --- a/Vrh.Log4Pro.MaintenanceConsole/Tools - Membership.cs +++ b/Vrh.Log4Pro.MaintenanceConsole/Tools - Membership.cs @@ -44,12 +44,10 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS { public const string SCHEMA_NAME = "UAdmin"; - public const string ROLENAME_ADMINISTRATOR = "Administrator"; - public const string ROLENAME_ADMIN = "Admin"; + public const string ROLENAME_USERADMINISTRATOR = "UserAdministrator"; public const string USERNAME_ADMINISTRATOR = "Administrator"; - public const string USERNAME_ADMIN = "Admin"; public const string PASSWORD_ADMINISTRATOR = "Admin123"; - public static readonly string[] SYSTEMUSERNAMELIST = new string[] { ROLENAME_ADMIN, USERNAME_ADMINISTRATOR }; + public static readonly string[] SYSTEMUSERNAMELIST = new string[] { USERNAME_ADMINISTRATOR }; public static readonly DateTime NEVERONLINE = new DateTime(2000, 1, 1); } #endregion Constants @@ -118,7 +116,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS } #endregion ellenőrzések - CreateAdminRolesAndUsers(username,password); + CreateAdminRolesAndUsers();//alapértelmezett Administrator/Admin123 user létrehozása MembershipUser user = Membership.GetUser(username); if (user == null) { @@ -140,11 +138,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS if (!Users.IsInRole(username, rn)) { System.Web.Security.Roles.AddUserToRole(username, rn); } } } - else if (administrator) - { - if (!System.Web.Security.Roles.IsUserInRole(username, Constants.ROLENAME_ADMINISTRATOR)) { System.Web.Security.Roles.AddUserToRole(username, Constants.ROLENAME_ADMINISTRATOR); } - if (!System.Web.Security.Roles.IsUserInRole(username, Constants.ROLENAME_ADMIN)) { System.Web.Security.Roles.AddUserToRole(username, Constants.ROLENAME_ADMIN); } - } + else if (administrator) { CreateAdminRolesAndUsers(username, password); } string[] selectedrolenames; if (rolenames != null && rolenames.Any()) @@ -178,26 +172,13 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS #region CreateAdminRolesAndUsers public static void CreateAdminRolesAndUsers(string adminun=null, string adminpsw=null) { - if (string.IsNullOrWhiteSpace(adminpsw)) adminun = Constants.USERNAME_ADMIN; - MembershipUser user; - if (!System.Web.Security.Roles.RoleExists(Constants.ROLENAME_ADMINISTRATOR)) { System.Web.Security.Roles.CreateRole(Constants.ROLENAME_ADMINISTRATOR); } - if (!System.Web.Security.Roles.RoleExists(Constants.ROLENAME_ADMIN)) { System.Web.Security.Roles.CreateRole(Constants.ROLENAME_ADMIN); } + if (string.IsNullOrWhiteSpace(adminun)) adminun = Constants.USERNAME_ADMINISTRATOR; + if (string.IsNullOrWhiteSpace(adminpsw)) adminpsw = Constants.PASSWORD_ADMINISTRATOR; + if (!System.Web.Security.Roles.RoleExists(Constants.ROLENAME_USERADMINISTRATOR)) { System.Web.Security.Roles.CreateRole(Constants.ROLENAME_USERADMINISTRATOR); } - user = Membership.GetUser(Constants.USERNAME_ADMIN); - if (user == null) - { - user = Membership.CreateUser(Constants.USERNAME_ADMIN, Constants.PASSWORD_ADMINISTRATOR); - } - if (!System.Web.Security.Roles.IsUserInRole(Constants.USERNAME_ADMIN, Constants.ROLENAME_ADMINISTRATOR)) { System.Web.Security.Roles.AddUserToRole(Constants.USERNAME_ADMIN, Constants.ROLENAME_ADMINISTRATOR); } - if (!System.Web.Security.Roles.IsUserInRole(Constants.USERNAME_ADMIN, Constants.ROLENAME_ADMIN)) { System.Web.Security.Roles.AddUserToRole(Constants.USERNAME_ADMIN, Constants.ROLENAME_ADMIN); } - - user = Membership.GetUser(Constants.USERNAME_ADMINISTRATOR); - if (user == null) - { - user = Membership.CreateUser(Constants.USERNAME_ADMINISTRATOR, Constants.PASSWORD_ADMINISTRATOR); - } - if (!System.Web.Security.Roles.IsUserInRole(Constants.USERNAME_ADMINISTRATOR, Constants.ROLENAME_ADMINISTRATOR)) { System.Web.Security.Roles.AddUserToRole(Constants.USERNAME_ADMINISTRATOR, Constants.ROLENAME_ADMINISTRATOR); } - if (!System.Web.Security.Roles.IsUserInRole(Constants.USERNAME_ADMINISTRATOR, Constants.ROLENAME_ADMIN)) { System.Web.Security.Roles.AddUserToRole(Constants.USERNAME_ADMINISTRATOR, Constants.ROLENAME_ADMIN); } + MembershipUser user = Membership.GetUser(Constants.USERNAME_ADMINISTRATOR); + if (user == null) { user = Membership.CreateUser(Constants.USERNAME_ADMINISTRATOR, Constants.PASSWORD_ADMINISTRATOR); } + if (!System.Web.Security.Roles.IsUserInRole(Constants.USERNAME_ADMINISTRATOR, Constants.ROLENAME_USERADMINISTRATOR)) { System.Web.Security.Roles.AddUserToRole(Constants.USERNAME_ADMINISTRATOR, Constants.ROLENAME_USERADMINISTRATOR); } } #endregion CreateAdminRolesAndUsers #region IsInRole public method -- libgit2 0.21.2