Refactoring (#314)

* Refactoring * Refactoring * Check for a valid email. * Fixed missing character. * Moved logic to the Utilities class. * Rename template .sql file * Modified null and empty string check. * Check for a valid email. * Fixed missing character. * Moved logic to the Utilities class. * Added Favicon support, Progressive Web App support, page title and url support, and private/public user registration options * Refactoring * Refactoring * Check for a valid email. * Moved logic to the Utilities class. Co-authored-by: Aubrey <aubrey.b@treskcow.tech> Co-authored-by: MIchael Atwood <matwood@dragonmastery.com> Co-authored-by: Shaun Walker <shaun.walker@siliqon.com>
2020-03-31 17:21:05 +03:00
parent c9baa2bb56
commit 66ad089088
82 changed files with 958 additions and 829 deletions
--- a/Oqtane.Client/Modules/Admin/Users/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Add.razor
@ -76,16 +76,16 @@
 }

@code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private string username = string.Empty;
+    private string password = string.Empty;
+    private string confirm = string.Empty;
+    private string email = string.Empty;
+    private string displayname = string.Empty;
+    private List<Profile> profiles;
+    private Dictionary<string, string> settings;
+    private string category = string.Empty;

-    string username = "";
-    string password = "";
-    string confirm = "";
-    string email = "";
-    string displayname = "";
-    List<Profile> profiles;
-    Dictionary<string, string> settings;
-    string category = "";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;

    protected override async Task OnInitializedAsync()
    {
@ -105,11 +105,11 @@
    {
        try
        {
-            if (username != "" && password != "" && confirm != "" && email != "")
+            if (username != string.Empty && password != string.Empty && confirm != string.Empty && email != string.Empty)
            {
                if (password == confirm)
                {
-                    User user = new User();
+                    var user = new User();
                    user.SiteId = PageState.Site.SiteId;
                    user.Username = username;
                    user.Password = password;
@ -150,7 +150,7 @@

    private void ProfileChanged(ChangeEventArgs e, string SettingName)
    {
-        string value = (string)e.Value;
+        var value = (string)e.Value;
        settings = SettingService.SetSetting(settings, SettingName, value);
    }

--- a/Oqtane.Client/Modules/Admin/Users/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor
@ -106,26 +106,26 @@
 }

@code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private int userid;
+    private string username = string.Empty;
+    private string password = string.Empty;
+    private string confirm = string.Empty;
+    private string email = string.Empty;
+    private string displayname = string.Empty;
+    private FileManager filemanager;
+    private int photofileid = -1;
+    private List<Profile> profiles;
+    private Dictionary<string, string> settings;
+    private string category = string.Empty;
+    private string createdby;
+    private DateTime createdon;
+    private string modifiedby;
+    private DateTime modifiedon;
+    private string deletedby;
+    private DateTime? deletedon;
+    private string isdeleted;

-    int userid;
-    string username = "";
-    string password = "";
-    string confirm = "";
-    string email = "";
-    string displayname = "";
-    FileManager filemanager;
-    int photofileid = -1;
-    List<Profile> profiles;
-    Dictionary<string, string> settings;
-    string category = "";
-    string createdby;
-    DateTime createdon;
-    string modifiedby;
-    DateTime modifiedon;
-    string deletedby;
-    DateTime? deletedon;
-    string isdeleted;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;

    protected override async Task OnInitializedAsync()
    {
@ -134,16 +134,18 @@
            profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);

            userid = Int32.Parse(PageState.QueryString["id"]);
-            User user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+            var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
            if (user != null)
            {
                username = user.Username;
                email = user.Email;
                displayname = user.DisplayName;
+                
                if (user.PhotoFileId != null)
                {
                    photofileid = user.PhotoFileId.Value;
                }
+                
                settings = await SettingService.GetUserSettingsAsync(user.UserId);
                createdby = user.CreatedBy;
                createdon = user.CreatedOn;
@ -162,19 +164,17 @@
    }

    private string GetProfileValue(string SettingName, string DefaultValue)
-    {
-        return SettingService.GetSetting(settings, SettingName, DefaultValue);
-    }
+        => SettingService.GetSetting(settings, SettingName, DefaultValue);

    private async Task SaveUser()
    {
        try
        {
-            if (username != "" && password != "" && confirm != "" && email != "")
+            if (username != string.Empty && password != string.Empty && confirm != string.Empty && email != string.Empty)
            {
                if (password == confirm)
                {
-                    User user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                    var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
                    user.SiteId = PageState.Site.SiteId;
                    user.Username = username;
                    user.Password = password;
@ -182,10 +182,12 @@
                    user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
                    user.PhotoFileId = null;
                    photofileid = filemanager.GetFileId();
+                    
                    if (photofileid != -1)
                    {
                        user.PhotoFileId = photofileid;
                    }
+                    
                    user.IsDeleted = (isdeleted == null ? true : Boolean.Parse(isdeleted));

                    user = await UserService.UpdateUserAsync(user);
@ -213,7 +215,7 @@

    private void ProfileChanged(ChangeEventArgs e, string SettingName)
    {
-        string value = (string)e.Value;
+        var value = (string)e.Value;
        settings = SettingService.SetSetting(settings, SettingName, value);
    }

--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@ -28,9 +28,9 @@ else
 }

@code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private List<UserRole> userroles;

-    List<UserRole> userroles;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;

    protected override async Task OnInitializedAsync()
    {
@ -42,7 +42,7 @@ else
    {
        try
        {
-            User user = await UserService.GetUserAsync(UserRole.UserId, PageState.Site.SiteId);
+            var user = await UserService.GetUserAsync(UserRole.UserId, PageState.Site.SiteId);
            if (user != null)
            {
                await UserService.DeleteUserAsync(user.UserId);
--- a/Oqtane.Client/Modules/Admin/Users/Roles.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor
@ -65,14 +65,14 @@ else
 }

@code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private int userid;
+    private List<Role> roles;
+    private int roleid = -1;
+    private string effectivedate = string.Empty;
+    private string expirydate = string.Empty;
+    private List<UserRole> userroles;

-    int userid;
-    List<Role> roles;
-    int roleid = -1;
-    string effectivedate = "";
-    string expirydate = "";
-    List<UserRole> userroles;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;

    protected override async Task OnInitializedAsync()
    {
@ -109,7 +109,7 @@ else
        {
            if (roleid != -1)
            {
-                UserRole userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
+                var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
                if (userrole != null)
                {
                    if (string.IsNullOrEmpty(effectivedate))
@ -120,6 +120,7 @@ else
                    {
                        userrole.EffectiveDate = DateTime.Parse(effectivedate);
                    }
+                    
                    if (string.IsNullOrEmpty(expirydate))
                    {
                        userrole.ExpiryDate = null;
@ -135,6 +136,7 @@ else
                    userrole = new UserRole();
                    userrole.UserId = userid;
                    userrole.RoleId = roleid;
+                    
                    if (string.IsNullOrEmpty(effectivedate))
                    {
                        userrole.EffectiveDate = null;
@ -143,6 +145,7 @@ else
                    {
                        userrole.EffectiveDate = DateTime.Parse(effectivedate);
                    }
+                    
                    if (string.IsNullOrEmpty(expirydate))
                    {
                        userrole.ExpiryDate = null;
@ -151,8 +154,10 @@ else
                    {
                        userrole.ExpiryDate = DateTime.Parse(expirydate);
                    }
+                    
                    await UserRoleService.AddUserRoleAsync(userrole);
                }
+                
                await GetUserRoles();
                await logger.LogInformation("User Assigned To Role {UserRole}", userrole);
                AddModuleMessage("User Assigned To Role", MessageType.Success);