v1.20.1.0

RoleName: - Administrator RoleGroupName: - Administrator Username/psw: Administrator/Admin123 CreateAdminRolesRoleGroupsUsers létrehozza a fentieket

v1.20.1.0
RoleName: - Administrator RoleGroupName: - Administrator Username/psw: Administrator/Admin123 CreateAdminRolesRoleGroupsUsers létrehozza a fentieket
Schwirg László
1 parent 55003105
Showing 3 changed files with 33 additions and 13 deletions Show diff stats
Vrh.Log4Pro.MaintenanceConsole/Manager - UserManager.cs
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
Vrh.Log4Pro.MaintenanceConsole/Tools - Membership.cs
@@ -161,7 +161,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.UserManagerNS
 			if (adminpsw.ToUpper() == "*") { adminpsw=null; }
 			try
 			{ 
-				MembershipTools.Users.CreateAdminRolesAndUsers(adminun,adminpsw);
+				MembershipTools.Users.CreateAdminRolesRoleGroupsUsers(adminun,adminpsw);
 				ColorConsole.WriteLine($"Creating admin users was successful!", ConsoleColor.Green);
 			}
 			catch (Exception ex) { ColorConsole.WriteLine(ex.Message, ConsoleColor.Red); }
@@ -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.20.0.0")]
-[assembly: AssemblyFileVersion("1.20.0.0")]
+[assembly: AssemblyVersion("1.20.1.0")]
+[assembly: AssemblyFileVersion("1.20.1.0")]
@@ -44,9 +44,10 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
 		{
 			public const string SCHEMA_NAME = "UAdmin";
-			public const string ROLENAME_USERADMINISTRATOR = "UserAdministrator";
+			public const string ROLENAME_USERADMINISTRATOR = "Administrator";
 			public const string USERNAME_ADMINISTRATOR = "Administrator";
-			public const string PASSWORD_ADMINISTRATOR = "Admin123";
+			public const string ROLEGROUPNAME_ADMINISTRATOR = "Administrator";
+			public const string PASSWORD_ADMIN123 = "Admin123";
 			public static readonly string[] SYSTEMUSERNAMELIST = new string[] { USERNAME_ADMINISTRATOR };
 			public static readonly DateTime NEVERONLINE = new DateTime(2000, 1, 1);
 		}
@@ -116,7 +117,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
 				}
 				#endregion ellenőrzések
-				CreateAdminRolesAndUsers();//alapértelmezett Administrator/Admin123 user létrehozása
+				CreateAdminRolesRoleGroupsUsers();//alapértelmezett Administrator/Admin123 user létrehozása
 				MembershipUser user = Membership.GetUser(username);
 				if (user == null)
 				{
@@ -138,7 +139,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
 						if (!Users.IsInRole(username, rn)) { System.Web.Security.Roles.AddUserToRole(username, rn); }
 					}
 				}
-				else if (administrator) { CreateAdminRolesAndUsers(username, password); }
+				else if (administrator) { CreateAdminRolesRoleGroupsUsers(username, password); }
 				string[] selectedrolenames;
 				if (rolenames != null && rolenames.Any())
@@ -169,18 +170,30 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
 				return user;
 			}
 			#endregion Create
-			#region CreateAdminRolesAndUsers
-			public static void CreateAdminRolesAndUsers(string adminun=null, string adminpsw=null)
+			#region CreateAdminRolesRoleGroupsUsers
+			/// <summary>
+			/// Létrehozza az Administrator szerepet és szerepkört, 
+			/// a megnevezett usert a megadott jelszóval létrehozza,
+			/// a user-t hozzárendeli az Administrátor szerephez és szerepkörhöz.
+			/// </summary>
+			/// <param name="adminun"></param>
+			/// <param name="adminpsw"></param>
+			public static void CreateAdminRolesRoleGroupsUsers(string adminun=null, string adminpsw=null)
 			{
 				if (string.IsNullOrWhiteSpace(adminun)) adminun = Constants.USERNAME_ADMINISTRATOR;
-				if (string.IsNullOrWhiteSpace(adminpsw)) adminpsw = Constants.PASSWORD_ADMINISTRATOR;
+				if (string.IsNullOrWhiteSpace(adminpsw)) adminpsw = Constants.PASSWORD_ADMIN123;
 				if (!System.Web.Security.Roles.RoleExists(Constants.ROLENAME_USERADMINISTRATOR)) { System.Web.Security.Roles.CreateRole(Constants.ROLENAME_USERADMINISTRATOR); }
-				MembershipUser user = Membership.GetUser(Constants.USERNAME_ADMINISTRATOR);
-				if (user == null) { user = Membership.CreateUser(Constants.USERNAME_ADMINISTRATOR, Constants.PASSWORD_ADMINISTRATOR); }
+				if (!MembershipTools.RoleGroups.IsRoleGroupExist(Constants.ROLEGROUPNAME_ADMINISTRATOR)) MembershipTools.RoleGroups.Create(Constants.ROLEGROUPNAME_ADMINISTRATOR);
+				MembershipTools.Assign.RolesToRoleGroups(Constants.ROLENAME_USERADMINISTRATOR, Constants.ROLEGROUPNAME_ADMINISTRATOR);
+
+				MembershipUser user = Membership.GetUser(adminun);
+				if (user == null) { user = Membership.CreateUser(adminun, adminpsw); }
 				if (!System.Web.Security.Roles.IsUserInRole(Constants.USERNAME_ADMINISTRATOR, Constants.ROLENAME_USERADMINISTRATOR)) { System.Web.Security.Roles.AddUserToRole(Constants.USERNAME_ADMINISTRATOR, Constants.ROLENAME_USERADMINISTRATOR); }
+
+				Assign.RoleGroupsToUsers(Constants.ROLEGROUPNAME_ADMINISTRATOR, adminun);
 			}
-			#endregion CreateAdminRolesAndUsers
+			#endregion CreateAdminRolesRoleGroupsUsers
 			#region IsInRole public method
 			/// <summary>
 			/// Annak jelzése, hogy a <paramref name="userName"/>-ben megadott nevű felhasználó
@@ -356,6 +369,13 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
 				MembershipDBContext.RoleGroups.Add(new DAL.RoleGroup { Name = name, });
 				MembershipDBContext.SaveChanges();
 			}
+
+			/// <summary>
+			/// true-val tér vissza, ha a megnevezett rolegroup létezik
+			/// </summary>
+			/// <param name="name"></param>
+			/// <returns></returns>
+			public static bool IsRoleGroupExist(string name) { return MembershipDBContext.RoleGroups.Any(x => x.Name == name); }
 			#endregion Create method
 			#region Remove methods