Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
{
<tr @onclick="@(() => GroupClicked(group))" class="cursor-pointer @((SelectedGroup != null) ? ((SelectedGroup.Name == group.Name) ? "active" : "") : "")">
<th>@group.Name</th>
<th>@group.Created</th>
<th>@group.Modified</th>
<th>@group._Created</th>
<th>@group._Modified</th>
</tr>
}
</tbody>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
<tr @onclick="@(() => RowClicked(user))" class="cursor-pointer @((SelectedUser != null) ? ((SelectedUser.UserName == user.UserName) ? "active" : "") : "")">
<th>@user.UserName</th>
<td>@user.CanUserChangePassword</td>
<td>@user.Created</td>
<td>@user.Modified</td>
<td>@user._Created</td>
<td>@user._Modified</td>
</tr>
}
</tbody>
Expand Down Expand Up @@ -272,7 +272,7 @@
SelectedUser.EnableAutoLogOut = Input.EnableAutoLogOut;
SelectedUser.AutoLogOutTimeOutMinutes = Input.AutoLogOutTimeOutMinutes ?? 30;

SelectedUser.Modified = DateTime.Now;
SelectedUser._Modified = DateTime.Now;

//SelectedUser.RoleHash = Hasher.CalculateHash(SelectedUser.Roles, _model.Username);
var result = await _userManager.UpdateAsync(SelectedUser);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public interface IBrowsableDataObject

string _EntityId { get; set; }

DateTime? ModifiedAt { get; set; }
DateTime? CreatedAt { get; set; }
DateTime _Modified { get; set; }
DateTime _Created { get; set; }
}
}
6 changes: 3 additions & 3 deletions src/base/src/AXOpen.Base.Abstractions/Data/RepositoryBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@ public void Create(string identifier, T data)
}
try
{
data?.CreatedAt = DateTime.Now;
data?.ModifiedAt = DateTime.Now;
data?._Created = DateTime.Now;
data?._Modified = DateTime.Now;
CreateNvi(identifier, data);
}
catch (Exception e)
Expand Down Expand Up @@ -411,7 +411,7 @@ public void Update(string identifier, T data)
}
try
{
data?.ModifiedAt = DateTime.Now;
data?._Modified = DateTime.Now;
UpdateNvi(identifier, data);
}
catch (Exception e)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ public class PersistentRecord : IBrowsableDataObject
public DateTime _Created { set; get; }
public DateTime _Modified { set; get; }

// Added due to IBrowsableDataObject interface and compatibility with Prometheus.
public DateTime? ModifiedAt { get { return _Modified; } set { _Modified = value.Value; } }

// Added due to IBrowsableDataObject interface and compatibility with Prometheus.
public DateTime? CreatedAt { get { return _Created; } set { _Created = value.Value; } }

public List<TagObject> Tags = new();
}
}
4 changes: 2 additions & 2 deletions src/data/src/AXOpen.Data/Entity/Pocos/AxoDataEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public List<ValueChangeItem> Changes

public string Hash { get; set; }

public DateTime? ModifiedAt { get; set; }
public DateTime? CreatedAt { get; set; }
public DateTime _Modified { get; set; }
public DateTime _Created { get; set; }
}
}
15 changes: 4 additions & 11 deletions src/security/src/AXOpen.Security/Entities/Group.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,17 @@ public class Group : IBrowsableDataObject
public string Name { get; set; }
public ObservableCollection<string> Roles { get; set; }
public string RolesHash { get; set; }
public DateTime Created { get; set; }
public DateTime Modified { get; set; }

// Added due to IBrowsableDataObject interface and compatibility with Prometheus.
public DateTime? ModifiedAt { get { return Modified; } set { Modified = value.Value; } }

// Added due to IBrowsableDataObject interface and compatibility with Prometheus.
public DateTime? CreatedAt { get { return Created; } set { Created = value.Value; } }

public DateTime _Created { get; set; }
public DateTime _Modified { get; set; }

public List<string> Changes = new List<string>();

public Group(string name)
{
Name = name;
Roles = new ObservableCollection<string>();
Created = DateTime.Now;
Modified = DateTime.Now;
_Created = DateTime.Now;
_Modified = DateTime.Now;
}
}
}
14 changes: 4 additions & 10 deletions src/security/src/AXOpen.Security/Entities/User.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,8 @@ public class User : IdentityUser<string>, IBrowsableDataObject
public bool CanUserChangePassword { get; set; }
public dynamic RecordId { get; set; }
public string _EntityId { get; set; }
public DateTime Created { get; set; }
public DateTime Modified { get; set; }

// Added due to IBrowsableDataObject interface and compatibility with Prometheus.
public DateTime? ModifiedAt { get { return Modified; } set { Modified = value.Value; } }

// Added due to IBrowsableDataObject interface and compatibility with Prometheus.
public DateTime? CreatedAt { get { return Created; } set { Created = value.Value; } }
public DateTime _Created { get; set; }
public DateTime _Modified { get; set; }

public bool EnableAutoLogOut { get; set; }
public uint AutoLogOutTimeOutMinutes { get; set; }
Expand All @@ -35,8 +29,8 @@ public User(string username, string email, string phoneNumber, string group, boo
CanUserChangePassword = canUserChangePassword;
ExternalAuthId = externalAuthId;
Id = Guid.NewGuid().ToString();
Created = DateTime.Now;
Modified = DateTime.Now;
_Created = DateTime.Now;
_Modified = DateTime.Now;
EnableAutoLogOut = enableAutoLogOut;
AutoLogOutTimeOutMinutes = autoLogOutTimeOutMinutes;
}
Expand Down
6 changes: 3 additions & 3 deletions src/security/src/AXOpen.Security/RoleGroupManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public IdentityResult AddRoleToGroup(string group, string role)
{
data.Roles.Add(role);
data.RolesHash = new PasswordHasher<Group>().HashPassword(data, String.Join(",", data.Roles));
data.Modified = DateTime.Now;
data._Modified = DateTime.Now;
}
else
{
Expand Down Expand Up @@ -134,7 +134,7 @@ public IdentityResult AddRolesToGroup(string group, IEnumerable<string> roles)
data.Roles.Add(role);
}
data.RolesHash = new PasswordHasher<Group>().HashPassword(data, String.Join(",", data.Roles));
data.Modified = DateTime.Now;
data._Modified = DateTime.Now;
}
else
{
Expand Down Expand Up @@ -171,7 +171,7 @@ public IdentityResult RemoveRolesFromGroup(string group, IEnumerable<string> rol
data.Roles.Remove(role);
}
data.RolesHash = new PasswordHasher<Group>().HashPassword(data, String.Join(",", data.Roles));
data.Modified = DateTime.Now;
data._Modified = DateTime.Now;
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/security/src/AXOpen.Security/Stores/UserStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public Task<IdentityResult> UpdateAsync(User user, CancellationToken cancellatio
userData.Group = user.Group;
userData.GroupHash = new PasswordHasher<User>().HashPassword(user, user.Group);
userData.CanUserChangePassword = user.CanUserChangePassword;
userData.Modified = user.Modified;
userData._Modified = user._Modified;
userData.AutoLogOutTimeOutMinutes = user.AutoLogOutTimeOutMinutes;
userData.EnableAutoLogOut = user.EnableAutoLogOut;
userData.ExternalAuthId = user.ExternalAuthId;
Expand Down
Loading