server/AyaNova/models/User.cs

@@ -56,26 +56,9 @@ namespace AyaNova.Models
         public bool Active { get; set; }
         [Required, MaxLength(255)]
         public string Name { get; set; }
-
         public DateTime? LastLogin { get; set; }
-
         public string Login { get; set; }
         public string Password { get; set; }
-
-        [JsonIgnore]
-        public string Salt { get; set; }
-        [JsonIgnore]
-        public string CurrentAuthToken { get; set; }
-        [JsonIgnore]
-        public string DlKey { get; set; }
-        [JsonIgnore]
-        public DateTime? DlKeyExpire { get; set; }
-
-        [JsonIgnore]
-        public string PasswordResetCode { get; set; }
-        [JsonIgnore]
-        public DateTime? PasswordResetCodeExpire { get; set; }
-
         [Required]
         public AuthorizationRoles Roles { get; set; }
         [Required]
@@ -88,9 +71,24 @@ namespace AyaNova.Models
         public long? VendorId { get; set; }
         public string Wiki { get; set; }
         public string CustomFields { get; set; }
-
         public List<string> Tags { get; set; }
 
+        //======================
+        //NOT IN DTUSER CLASS
+        [JsonIgnore]
+        public string Salt { get; set; }//---
+        [JsonIgnore]
+        public string CurrentAuthToken { get; set; }//---
+        [JsonIgnore]
+        public string DlKey { get; set; }//---
+        [JsonIgnore]
+        public DateTime? DlKeyExpire { get; set; }//---
+        [JsonIgnore]
+        public string PasswordResetCode { get; set; }//---
+        [JsonIgnore]
+        public DateTime? PasswordResetCodeExpire { get; set; }//---
+        //==========================
+
         //relations
         //https://docs.microsoft.com/en-us/ef/core/modeling/relationships#other-relationship-patterns
         [JsonIgnore]//hide from being returned (as null anyway) with User object in routes