From 97e93e4669958ff7ac18886e0394cd63260d3c70 Mon Sep 17 00:00:00 2001 From: ivar Date: Sat, 11 Nov 2023 22:09:47 +0100 Subject: Fix usings --- .../Models/Database/Internal/PasswordResetRequest.cs | 5 +++-- code/api/src/Models/Database/Internal/Tenant.cs | 2 +- code/api/src/Models/Database/Internal/User.cs | 20 +++++++++++++------- 3 files changed, 17 insertions(+), 10 deletions(-) (limited to 'code/api/src/Models/Database/Internal') diff --git a/code/api/src/Models/Database/Internal/PasswordResetRequest.cs b/code/api/src/Models/Database/Internal/PasswordResetRequest.cs index ee73fd2..1ccb614 100644 --- a/code/api/src/Models/Database/Internal/PasswordResetRequest.cs +++ b/code/api/src/Models/Database/Internal/PasswordResetRequest.cs @@ -1,10 +1,11 @@ -namespace IOL.GreatOffice.Api.Data.Database; +namespace IOL.GreatOffice.Api.Models.Database; public class PasswordResetRequest { public PasswordResetRequest() { } - public PasswordResetRequest(User user) { + public PasswordResetRequest(User user) + { CreatedAt = AppDateTime.UtcNow; Id = Guid.NewGuid(); User = user; diff --git a/code/api/src/Models/Database/Internal/Tenant.cs b/code/api/src/Models/Database/Internal/Tenant.cs index 471164d..15e0be0 100644 --- a/code/api/src/Models/Database/Internal/Tenant.cs +++ b/code/api/src/Models/Database/Internal/Tenant.cs @@ -1,4 +1,4 @@ -namespace IOL.GreatOffice.Api.Data.Database; +namespace IOL.GreatOffice.Api.Models.Database; public class Tenant : BaseWithOwner { diff --git a/code/api/src/Models/Database/Internal/User.cs b/code/api/src/Models/Database/Internal/User.cs index f4d08ff..fa8adaa 100644 --- a/code/api/src/Models/Database/Internal/User.cs +++ b/code/api/src/Models/Database/Internal/User.cs @@ -1,10 +1,11 @@ -namespace IOL.GreatOffice.Api.Data.Database; +namespace IOL.GreatOffice.Api.Models.Database; public class User : Base { public User() { } - public User(string username) { + public User(string username) + { Username = username; } @@ -17,25 +18,30 @@ public class User : Base public ICollection Tenants { get; set; } public Guid? DeletedBy { get; set; } - public string DisplayName(bool isForGreeting = false) { + public string DisplayName(bool isForGreeting = false) + { if (!isForGreeting && FirstName.HasValue() && LastName.HasValue()) return FirstName + " " + LastName; return FirstName.HasValue() ? FirstName : Username ?? Email; } - public void HashAndSetPassword(string password) { + public void HashAndSetPassword(string password) + { Password = PasswordHelper.HashPassword(password); } - public bool VerifyPassword(string password) { + public bool VerifyPassword(string password) + { return PasswordHelper.Verify(password, Password); } - public void SetDeleted(Guid userId) { + public void SetDeleted(Guid userId) + { base.SetDeleted(); DeletedBy = userId; } - public IEnumerable DefaultClaims() { + public IEnumerable DefaultClaims() + { return new Claim[] { new(AppClaims.USER_ID, Id.ToString()), new(AppClaims.NAME, Username), -- cgit v1.3