P0
/
CodeLiturgy.Dashboard
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Working state

This commit is contained in:
CodeLiturgy 2022-09-10 23:22:04 +01:00
parent 9dc878c517
commit 4c01d1de52
33 changed files with 303 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
BlueWest.Api/Users/ApplicationUserDbContext.cs → BlueWest.Api/Context/ApplicationUserDbContext.cs
View File

@ -1,15 +1,10 @@
using System;
using System.Threading.Tasks;
using BlueWest.Data;
using BlueWest.WebApi.EF;
using BlueWest.WebApi.Context.Users;
using BlueWest.WebApi.EF.Model;
using Duende.IdentityServer.EntityFramework.Entities;
using Duende.IdentityServer.EntityFramework.Interfaces;
using Duende.IdentityServer.Stores.Serialization;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
namespace BlueWest.WebApi.Context.Users;
namespace BlueWest.WebApi.Context;
/// <summary>
/// Application User Db Context
@ -24,30 +19,27 @@ public class ApplicationUserDbContext : IdentityDbContext<
ApplicationRoleClaim,
ApplicationUserToken>
{
/// <inheritdoc />
public sealed override DbSet<ApplicationUserClaim> UserClaims { get; set; }
/// <summary>
/// Configures the schema needed for the identity framework.
/// </summary>
/// <param name="builder">
/// The builder being used to construct the model for this context.
/// </param>
/// <inheritdoc />
public sealed override DbSet<ApplicationUserRole> UserRoles { get; set; }
/// <summary>
/// Database for the context of database users
/// </summary>
/// <param name="options"></param>
/// <inheritdoc />
public sealed override DbSet<ApplicationRole> Roles { get; set; }
/// <inheritdoc />
public sealed override DbSet<ApplicationRoleClaim> RoleClaims { get; set; }
/// <inheritdoc />
public ApplicationUserDbContext(DbContextOptions<ApplicationUserDbContext> options) : base(options)
{
Database.EnsureCreated();
}
/// <summary>
/// Configures the schema needed for the identity framework.
/// </summary>
/// <param name="builder">
/// The builder being used to construct the model for this context.
/// </param>
/// <inheritdoc />
protected override void OnModelCreating(ModelBuilder builder)
{
base.OnModelCreating(builder);
@ -95,6 +87,10 @@ public class ApplicationUserDbContext : IdentityDbContext<
.WithMany(x => x.Users)
.HasForeignKey(x => x.ApplicationUserId));
builder.Entity<ApplicationRoleClaim>().ToTable("RoleClaims");
builder.Entity<ApplicationUserRole>().ToTable("UserRole");
builder.ConfigureCurrentDbModel();
}

2
BlueWest.Api/Context/ExchangeInterface.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;
using BlueWest.Tools;
using BlueWest.WebApi.Context.Users;
using BlueWest.WebApi.Context;
using BlueWest.WebApi.EF;
namespace BlueWest.WebApi.Interfaces

26
BlueWest.Api/Controllers/ApplicationUserController.cs Normal file
View File

@ -0,0 +1,26 @@
using BlueWest.WebApi.Context;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
namespace BlueWest.WebApi.Controllers
{
[ApiController]
[Route("[controller]")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
[Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)]
public class ApplicationUserController : ControllerBase
{
private readonly ApplicationUserDbContext _context;
public ApplicationUserController(ApplicationUserDbContext context)
{
_context = context;
}
}
}

26
BlueWest.Api/Controllers/AuthController.cs
View File

@ -25,7 +25,6 @@ namespace BlueWest.WebApi.Controllers;
/// <summary>
///
/// </summary>
/// <param name="mapper"></param>
/// <param name="authManager"></param>
/// <param name="userManager"></param>
public AuthController( IAuthManager authManager, IUserManager userManager)
@ -48,6 +47,11 @@ namespace BlueWest.WebApi.Controllers;
}
/// <summary>
/// Gets a bearer token
/// </summary>
/// <param name="loginViewModel"></param>
/// <returns></returns>
[AllowAnonymous]
[HttpPost("login")]
public async Task<ActionResult<IdentityResult>> GetTokenAsync(LoginViewModel loginViewModel)
@ -63,8 +67,13 @@ namespace BlueWest.WebApi.Controllers;
}
/// <summary>
/// Do Cookie based login.
/// </summary>
/// <param name="loginDto"></param>
/// <returns></returns>
[AllowAnonymous]
[HttpPost("login2")]
[HttpPost("logincookie")]
public async Task<ActionResult<IdentityResult>> DoLoginAsync(LoginViewModel loginDto)
{
var user = await _userManager.FindByEmailAsync(loginDto.Email);
@ -83,6 +92,11 @@ namespace BlueWest.WebApi.Controllers;
return Json(false);
}
/// <summary>
/// Do Cookie based logout
/// </summary>
/// <param name="loginDto"></param>
/// <returns></returns>
[AllowAnonymous]
[HttpPost("logout")]
public async Task<ActionResult<IdentityResult>> DoLogoutAsync(LoginViewModel loginDto)
@ -91,12 +105,4 @@ namespace BlueWest.WebApi.Controllers;
return Json(true);
}
[HttpGet("test")]
public ActionResult TestRequest()
{
return Ok(new {Message = "Test"});
}
}

1
BlueWest.Api/Controllers/CountryController.cs
View File

@ -19,6 +19,7 @@ namespace BlueWest.WebApi.Controllers
[Route("[controller]")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
[Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)]
[Authorize(Roles = "Administrator")]
public class CountryController : ControllerBase
{

1
BlueWest.Api/Controllers/CurrencyController.cs
View File

@ -18,6 +18,7 @@ namespace BlueWest.WebApi.Controllers
[Route("[controller]")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
[Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)]
[Authorize(Roles = "Administrator")]
public partial class CurrencyController : ControllerBase
{

1
BlueWest.Api/Controllers/FinanceController.cs
View File

@ -16,6 +16,7 @@ namespace BlueWest.WebApi.Controllers;
[Route("[controller]")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
[Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)]
[Authorize(Roles = "Administrator")]
public class FinanceController : ControllerBase
{
private readonly FinanceDbContext _dbContext;

2
BlueWest.Api/Controllers/UserController.cs
View File

@ -19,6 +19,8 @@ namespace BlueWest.WebApi.Controllers
[Route("[controller]")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
[Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)]
[Authorize(Roles = "Administrator")]
public class UserController : ControllerBase
{

7
BlueWest.Api/StartupExtensions.cs
View File

@ -3,6 +3,7 @@ using System.Text;
using System.Threading.Tasks;
using BlueWest.Cryptography;
using BlueWest.Data;
using BlueWest.WebApi.Context;
using BlueWest.WebApi.Context.Users;
using BlueWest.WebApi.EF;
using Microsoft.AspNetCore.Authentication;
@ -104,7 +105,7 @@ namespace BlueWest.WebApi
}
public static IServiceCollection AddAuthServerServices(this IServiceCollection services, string origins, IConfiguration configuration , IWebHostEnvironment environment)
internal static IServiceCollection AddAuthServerServices(this IServiceCollection services, string origins, IConfiguration configuration , IWebHostEnvironment environment)
{
services.AddScoped<IJwtTokenHandler, JwtTokenHandler>();
@ -113,13 +114,13 @@ namespace BlueWest.WebApi
services
.AddScoped< UserRepository>()
.AddScoped<IUserManager, UserManager>()
.AddScoped<IUserManager, ApplicationUserManager>()
.AddScoped<IAuthManager, AuthManager>()
.AddScoped<IHasher, Hasher>();
services
.AddIdentityCore<ApplicationUser>(opt => { opt.User.RequireUniqueEmail = true; })
.AddUserManager<UserManager>()
.AddUserManager<ApplicationUserManager>()
.AddUserStore<UserRepository>();
// Database Context and Swagger

7
BlueWest.Api/Users/UserManager.cs → BlueWest.Api/Users/ApplicationUserManager.cs
View File

@ -10,11 +10,14 @@ using Microsoft.Extensions.Options;
namespace BlueWest.WebApi.Context.Users;
public class UserManager : UserManager<ApplicationUser>, IUserManager
/// <summary>
/// User Manager Object
/// </summary>
internal class ApplicationUserManager : UserManager<ApplicationUser>, IUserManager
{
private readonly IHasher _hasher;
private readonly UserRepository _usersRepo;
public UserManager(UserRepository store, IOptions<IdentityOptions> optionsAccessor,
public ApplicationUserManager(UserRepository store, IOptions<IdentityOptions> optionsAccessor,
IHasher passwordHasher, IEnumerable<IUserValidator<ApplicationUser>> userValidators,
IEnumerable<IPasswordValidator<ApplicationUser>> passwordValidators, ILookupNormalizer keyNormalizer,
IdentityErrorDescriber errors, IServiceProvider services, ILogger<UserManager<ApplicationUser>> logger) : base(store,

2
BlueWest.Api/Users/Auth/AuthManager.cs
View File

@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Identity;
namespace BlueWest.WebApi.Context.Users;
public class AuthManager : IAuthManager
internal class AuthManager : IAuthManager
{
private readonly IUserManager _userManager;
private readonly UserRepository _usersRepo;

3
BlueWest.Api/Users/Auth/AuthSettings.cs
View File

@ -2,5 +2,8 @@ namespace BlueWest.WebApi.Context.Users;
public class AuthSettings
{
/// <summary>
/// SecretKey
/// </summary>
public string SecretKey { get; set; }
}

3
BlueWest.Api/Users/Auth/SignInManager.cs
View File

@ -28,9 +28,6 @@ internal class SignInManager : SignInManager<ApplicationUser>
}
public override async Task<ClaimsPrincipal> CreateUserPrincipalAsync(ApplicationUser user) => await ClaimsFactory.CreateAsync(user);
}

8
BlueWest.Api/Users/Claims/ClaimsDbExtensions.cs Normal file
View File

@ -0,0 +1,8 @@
namespace BlueWest.WebApi.Context.Users
{
internal class ClaimsDbExtensions
{
}
}

15
BlueWest.Api/Users/Constants.cs
View File

@ -2,16 +2,31 @@ namespace BlueWest.WebApi.Context.Users;
public static class Constants
{
/// <summary>
/// AdminRoleName
/// </summary>
public const string AdminRoleName = "Admin";
/// <summary>
/// UserRoleName
/// </summary>
public const string UserRoleName = "User";
public const string ExpectatorRoleName = "Expectator";
/// <summary>
/// JwtClaimIdentifiers
/// </summary>
public static class JwtClaimIdentifiers
{
public const string Rol = "rol", Id = "id";
}
/// <summary>
/// JwtClaims
/// </summary>
public static class JwtClaims
{
/// <summary>
/// JwtClaims.ApiAccess
/// </summary>
public const string ApiAccess = "api_access";
}
}

12
BlueWest.Api/Users/Crypto/BaseCryptoItem.cs
View File

@ -5,7 +5,7 @@ using System.Text;
namespace BlueWest.Cryptography
{
public abstract class BaseCryptoItem
internal abstract class BaseCryptoItem
{
public enum HashAlgorithm
{
@ -19,6 +19,11 @@ namespace BlueWest.Cryptography
SHA3_512 = 3
}
/// <summary>
/// HexStringToByteArray
/// </summary>
/// <param name="stringInHexFormat"></param>
/// <returns></returns>
protected byte[] HexStringToByteArray(string stringInHexFormat)
{
var converted = Enumerable.Range(0, stringInHexFormat.Length)
@ -29,6 +34,11 @@ namespace BlueWest.Cryptography
return converted;
}
/// <summary>
/// ByteArrayToString
/// </summary>
/// <param name="bytes"></param>
/// <returns></returns>
protected string ByteArrayToString(byte[] bytes)
{
var sb = new StringBuilder();

33
BlueWest.Api/Users/Crypto/Hasher.cs
View File

@ -8,20 +8,35 @@ using Microsoft.AspNetCore.Identity;
namespace BlueWest.Cryptography
{
public class Hasher : BaseCryptoItem, IHasher
/// <summary>
/// Hasher
/// </summary>
internal class Hasher : BaseCryptoItem, IHasher
{
private const int SaltLength = 64;
/// <summary>
/// CreateHash
/// </summary>
/// <param name="text"></param>
/// <param name="algorithm"></param>
/// <returns></returns>
public string CreateHash(string text, BaseCryptoItem.HashAlgorithm algorithm)
{
var salt = CreateRandomString(SaltLength);
return CreateHash(text, salt, algorithm, true);
}
/// <summary>
/// CreateHash
/// </summary>
/// <param name="text"></param>
/// <param name="saltName"></param>
/// <param name="algorithm"></param>
/// <returns></returns>
public string CreateHash(string text, string saltName, BaseCryptoItem.HashAlgorithm algorithm)
{
var salt = "TODOFIXME";
return CreateHash(text, salt, algorithm, false);
return CreateHash(text, saltName, algorithm, false);
}
private string CreateHash(string text, string salt, HashAlgorithm algorithm, bool storeSalt)
@ -45,6 +60,12 @@ namespace BlueWest.Cryptography
return hash;
}
/// <summary>
/// Check for a matching hash.
/// </summary>
/// <param name="text"></param>
/// <param name="hash"></param>
/// <returns></returns>
public bool MatchesHash(string text, string hash)
{
string salt = "";
@ -58,6 +79,12 @@ namespace BlueWest.Cryptography
return hashed == hash;
}
/// <summary>
/// Hash password
/// </summary>
/// <param name="ApplicationUser"></param>
/// <param name="password"></param>
/// <returns></returns>
public string HashPassword(ApplicationUser ApplicationUser, string password)
{
return CreateHash(password, HashAlgorithm.SHA3_512);

24
BlueWest.Api/Users/Crypto/IHasher.cs
View File

@ -4,9 +4,31 @@ using Microsoft.AspNetCore.Identity;
namespace BlueWest.Cryptography;
public interface IHasher : IPasswordHasher<ApplicationUser>
/// <summary>
/// IHasher contract
/// </summary>
internal interface IHasher : IPasswordHasher<ApplicationUser>
{
/// <summary>
/// Create hash
/// </summary>
/// <param name="text"></param>
/// <param name="algorithm"></param>
/// <returns></returns>
string CreateHash(string text, BaseCryptoItem.HashAlgorithm algorithm);
/// <summary>
/// Create hash
/// </summary>
/// <param name="text"></param>
/// <param name="salt"></param>
/// <param name="algorithm"></param>
/// <returns></returns>
string CreateHash(string text, string salt, BaseCryptoItem.HashAlgorithm algorithm);
/// <summary>
/// MatchesHash
/// </summary>
/// <param name="text"></param>
/// <param name="hash"></param>
/// <returns></returns>
bool MatchesHash(string text, string hash);
}

19
BlueWest.Api/Users/Crypto/SHA_512.cs
View File

@ -3,8 +3,18 @@ using System.Text;
using Microsoft.AspNetCore.Cryptography.KeyDerivation;
namespace BlueWest.Cryptography
{
public class SHA2_512 : BaseCryptoItem
/// <summary>
/// SHA2_512 : BaseCryptoItem
/// </summary>
internal class SHA2_512 : BaseCryptoItem
{
/// <summary>
/// Hash with the provided salt
/// </summary>
/// <param name="text"></param>
/// <param name="salt"></param>
/// <param name="storeSalt"></param>
/// <returns></returns>
public string Hash(string text, string salt, bool storeSalt)
{
var fullText = string.Concat(text, salt);
@ -25,6 +35,13 @@ namespace BlueWest.Cryptography
}
/// <summary>
/// Hash_PBKDF2 algorithm.
/// </summary>
/// <param name="plainText"></param>
/// <param name="salt"></param>
/// <param name="saveSaltInResult"></param>
/// <returns></returns>
public string Hash_PBKDF2(string plainText, string salt, bool saveSaltInResult)
{
var saltAsBytes = Encoding.ASCII.GetBytes(salt);

2
BlueWest.Api/Users/Jwt/ITokenFactory.cs
View File

@ -1,6 +1,6 @@
namespace BlueWest.WebApi.Context.Users;
public interface ITokenFactory
internal interface ITokenFactory
{
string GenerateToken(int size= 32);
}

2
BlueWest.Api/Users/Jwt/JwtFactory.cs
View File

@ -8,7 +8,7 @@ using static BlueWest.WebApi.Context.Users.Constants;
namespace BlueWest.WebApi.Context.Users;
public class JwtFactory : IJwtFactory
internal class JwtFactory : IJwtFactory
{
private readonly IJwtTokenHandler _jwtTokenHandler;
private readonly JwtIssuerOptions _jwtOptions;

2
BlueWest.Api/Users/Jwt/JwtIssuerOptions.cs
View File

@ -4,7 +4,7 @@ using Microsoft.IdentityModel.Tokens;
namespace BlueWest.WebApi.Context.Users;
public class JwtIssuerOptions
internal class JwtIssuerOptions
{
/// <summary>
/// 4.1.1. "iss" (Issuer) Claim - The "iss" (issuer) claim identifies the principal that issued the JWT.

16
BlueWest.Api/Users/Jwt/JwtTokenHandler.cs
View File

@ -9,17 +9,31 @@ public class JwtTokenHandler : IJwtTokenHandler
{
private readonly JwtSecurityTokenHandler _jwtSecurityTokenHandler;
/// <summary>
/// JwtTokenHandler
/// </summary>
public JwtTokenHandler()
{
if (_jwtSecurityTokenHandler == null)
_jwtSecurityTokenHandler = new JwtSecurityTokenHandler();
}
/// <summary>
/// Write token
/// </summary>
/// <param name="jwt"></param>
/// <returns></returns>
public string WriteToken(JwtSecurityToken jwt)
{
return _jwtSecurityTokenHandler.WriteToken(jwt);
}
/// <summary>
/// Validate Token
/// </summary>
/// <param name="token"></param>
/// <param name="tokenValidationParameters"></param>
/// <returns></returns>
/// <exception cref="SecurityTokenException"></exception>
public ClaimsPrincipal ValidateToken(string token, TokenValidationParameters tokenValidationParameters)
{
try

7
BlueWest.Api/Users/Models/RegisterViewModel.cs
View File

@ -23,6 +23,9 @@ public class RegisterViewModel
[DataType(DataType.Password)]
[Display(Name = "Password")]
public string Password { get; set; }
/// <summary>
/// Username
/// </summary>
public string Username { get; set; }
/// <summary>
@ -33,6 +36,10 @@ public class RegisterViewModel
[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
public string ConfirmPassword { get; set; }
/// <summary>
/// Convert RegisterViewModel to ApplicationUser
/// </summary>
/// <returns></returns>
public ApplicationUser ToUser()
{
var newUser = new ApplicationUser();

15
BlueWest.Api/Users/Models/ResetPasswordViewModel.cs
View File

@ -2,21 +2,36 @@ using System.ComponentModel.DataAnnotations;
namespace BlueWest.WebApi.Context.Users;
/// <summary>
/// Reset password view model
/// </summary>
public class ResetPasswordViewModel
{
/// <summary>
/// Email address from which the password needs to be reset.
/// </summary>
[Required]
[EmailAddress]
public string Email { get; set; }
/// <summary>
/// Password
/// </summary>
[Required]
[StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
[DataType(DataType.Password)]
public string Password { get; set; }
/// <summary>
/// Password confirmation
/// </summary>
[DataType(DataType.Password)]
[Display(Name = "Confirm password")]
[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
public string ConfirmPassword { get; set; }
/// <summary>
/// The code to reset password.
/// </summary>
public string Code { get; set; }
}

12
BlueWest.Api/Users/Roles/ApplicationRole.cs
View File

@ -4,6 +4,16 @@ namespace BlueWest.WebApi.Context.Users
{
/// <inheritdoc />
public class ApplicationRole : IdentityRole<string>
{ }
{
/// <inheritdoc />
public sealed override string Id { get; set; }
/// <inheritdoc />
public sealed override string Name { get; set; }
/// <inheritdoc />
public sealed override string NormalizedName { get; set; }
}
}

7
BlueWest.Api/Users/Roles/ApplicationRoleClaim.cs
View File

@ -7,4 +7,11 @@ namespace BlueWest.WebApi.Context.Users;
public class ApplicationRoleClaim : IdentityRoleClaim<string>
{
public sealed override int Id { get; set; }
public sealed override string RoleId { get; set; }
public sealed override string ClaimType { get; set; }
public sealed override string ClaimValue { get; set; }
}

22
BlueWest.Api/Users/Roles/ApplicationUserClaim.cs
View File

@ -5,5 +5,27 @@ namespace BlueWest.WebApi.Context.Users;
/// <inheritdoc />
public class ApplicationUserClaim : IdentityUserClaim<string>
{
/// <inheritdoc />
public sealed override int Id { get; set; }
/// <inheritdoc />
public sealed override string UserId { get; set; }
/// <inheritdoc />
public sealed override string ClaimType { get; set; }
/// <inheritdoc />
public sealed override string ClaimValue { get; set; }
public ApplicationUserClaim(ApplicationUserClaim applicationUserClaim)
{
Id = applicationUserClaim.Id;
UserId = applicationUserClaim.UserId;
ClaimType = applicationUserClaim.ClaimType;
ClaimValue = applicationUserClaim.ClaimValue;
}
public ApplicationUserClaim()
{
}
}

9
BlueWest.Api/Users/Roles/ApplicationUserRole.cs
View File

@ -4,4 +4,11 @@ using Microsoft.AspNetCore.Identity;
namespace BlueWest.WebApi.Context.Users;
/// <inheritdoc />
public class ApplicationUserRole : IdentityUserRole<string> { }
public class ApplicationUserRole : IdentityUserRole<string>
{
/// <inheritdoc />
public sealed override string UserId { get; set; }
/// <inheritdoc />
public sealed override string RoleId { get; set; }
}

102
BlueWest.Api/Users/Roles/RoleStore.cs
View File

@ -3,6 +3,7 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
namespace BlueWest.WebApi.Context.Users;
@ -10,104 +11,7 @@ namespace BlueWest.WebApi.Context.Users;
/// <summary>
/// Role storage management
/// </summary>
public class RoleStore : IRoleStore<ApplicationRole>
/*public class RoleStore : RoleStore<ApplicationRole>
{
private ApplicationUserDbContext _dbContext;
/// <summary>
/// Role Store constructor
/// </summary>
/// <param name="dbContext"></param>
public RoleStore(ApplicationUserDbContext dbContext)
{
_dbContext = dbContext;
}
/// <summary>
///
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public void Dispose()
{
_dbContext = null;
}
/// <summary>
/// Get role name
/// </summary>
/// <param name="role"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public async Task<string> GetRoleNameAsync(ApplicationUserRole role, CancellationToken cancellationToken)
{
var foundRole = await _dbContext.Roles
.FirstOrDefaultAsync(x => x.Id == role.RoleId, cancellationToken: cancellationToken);
if (foundRole != null)
{
return foundRole.Name;
}
return string.Empty;
}
public async Task<IdentityResult> CreateAsync(ApplicationRole role, CancellationToken cancellationToken)
{
_dbContext.Roles.Add(role);
return await _dbContext.SaveChangesAsync(cancellationToken) >= 0 ? IdentityResult.Success : IdentityResult.Failed();
}
public async Task<IdentityResult> UpdateAsync(ApplicationRole role, CancellationToken cancellationToken)
{
_dbContext.Roles.Update(role);
return await _dbContext.SaveChangesAsync(cancellationToken) >= 0 ? IdentityResult.Success : IdentityResult.Failed();
}
public async Task<IdentityResult> DeleteAsync(ApplicationRole role, CancellationToken cancellationToken)
{
_dbContext.Roles.Remove(role);
return await _dbContext.SaveChangesAsync(cancellationToken) >= 0 ? IdentityResult.Success : IdentityResult.Failed();
}
public async Task<string> GetRoleIdAsync(ApplicationRole role, CancellationToken cancellationToken)
{
var x = await _dbContext.Roles.FirstOrDefaultAsync(x => x.Id == role.Id, cancellationToken: cancellationToken);
if (x != null)
{
return x.Id;
}
return string.Empty;
}
public Task<string> GetRoleNameAsync(ApplicationRole role, CancellationToken cancellationToken)
{
throw new NotImplementedException();
}
public Task SetRoleNameAsync(ApplicationRole role, string roleName, CancellationToken cancellationToken)
{
throw new NotImplementedException();
}
public Task<string> GetNormalizedRoleNameAsync(ApplicationRole role, CancellationToken cancellationToken)
{
throw new NotImplementedException();
}
public Task SetNormalizedRoleNameAsync(ApplicationRole role, string normalizedName, CancellationToken cancellationToken)
{
throw new NotImplementedException();
}
public Task<ApplicationRole> FindByIdAsync(string roleId, CancellationToken cancellationToken)
{
throw new NotImplementedException();
}
public Task<ApplicationRole> FindByNameAsync(string normalizedRoleName, CancellationToken cancellationToken)
{
throw new NotImplementedException();
}
}
}*/

191
BlueWest.Api/Users/UserRepository.cs
View File

@ -13,10 +13,23 @@ namespace BlueWest.WebApi.Context.Users;
/// <summary>
/// Users Repository
/// </summary>
public class UserRepository : UserStore<ApplicationUser, ApplicationRole, ApplicationUserDbContext>
public class UserRepository : UserStore<ApplicationUser,
ApplicationRole,
ApplicationUserDbContext,
string,
ApplicationUserClaim,
ApplicationUserRole,
ApplicationUserLogin,
ApplicationUserToken,
ApplicationRoleClaim>
{
private readonly ApplicationUserDbContext _context;
/// <summary>
/// User repository
/// </summary>
/// <param name="context"></param>
/// <param name="describer"></param>
public UserRepository(ApplicationUserDbContext context, IdentityErrorDescriber describer = null) : base(context, describer)
{
_context = context;
@ -32,137 +45,6 @@ public class UserRepository : UserStore<ApplicationUser, ApplicationRole, Applic
return users;
}
/// <summary>
/// Create Application User
/// </summary>
/// <param name="user"></param>
/*public override async Task<IdentityResult> CreateAsync(ApplicationUser user, CancellationToken cancellationToken = default(CancellationToken))
{
cancellationToken.ThrowIfCancellationRequested();
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException(nameof(user));
}
await _context.AddAsync(user, cancellationToken);
await _context.SaveChangesAsync(cancellationToken);
return IdentityResult.Success;
}*/
/// <summary>
/// Save Changes
/// </summary>
/*
public async Task SaveChanges()
{
await _context.SaveChangesAsync();
}
*/
/*
private async Task<bool> SaveChanges(ApplicationUser user)
{
_context.Users.Update(user);
return await _context.SaveChangesAsync() > 0;
}
*/
/// <summary>
/// Dispose repository
/// </summary>
/*
public void Dispose()
{
_context.Dispose();
}
*/
/*
/// <inheritdoc />
public override Task<string> GetUserIdAsync(ApplicationUser user, CancellationToken cancellationToken = default)
{
if (cancellationToken.IsCancellationRequested)
{
return Task.FromCanceled<string>(cancellationToken);
}
return Task.FromResult(user.Id.ToString());
}
/// <inheritdoc />
public override Task<string> GetUserNameAsync(ApplicationUser user, CancellationToken cancellationToken)
{
if (cancellationToken.IsCancellationRequested)
{
return Task.FromCanceled<string>(cancellationToken);
}
return Task.FromResult(user.UserName);
}
*/
/// <inheritdoc />
/*
public override async Task SetUserNameAsync(ApplicationUser user, string userName, CancellationToken cancellationToken)
{
var foundUser = await _context.Users.FirstOrDefaultAsync(x => x.Id == user.Id, cancellationToken: cancellationToken);
if (foundUser == null) return;
foundUser.UserName = userName;
await SaveChanges(user);
}
*/
/*
/// <inheritdoc />
public override Task<string> GetNormalizedUserNameAsync(ApplicationUser user, CancellationToken cancellationToken)
{
if (cancellationToken.IsCancellationRequested)
{
return Task.FromCanceled<string>(cancellationToken);
}
return Task.FromResult(user.NormalizedUserName);
}
/// <inheritdoc />
public override async Task<IdentityResult> UpdateAsync(ApplicationUser user, CancellationToken cancellationToken)
{
_context.Users.Update(user);
var success = await _context.SaveChangesAsync(cancellationToken) > 0;
if (success) return IdentityResult.Success;
return IdentityResult.Failed();
}
/// <inheritdoc />
public override async Task<IdentityResult> DeleteAsync(ApplicationUser user, CancellationToken cancellationToken)
{
var foundUser = await _context.Users.FirstOrDefaultAsync(x=> x.Id == user.Id, cancellationToken: cancellationToken);
var error = new IdentityError {Description = "ApplicationUser Not found"};
if (foundUser == null) return IdentityResult.Failed(error);
_context.Users.Remove(foundUser);
return IdentityResult.Success;
}
/// <inheritdoc />
public async Task<ApplicationUser> GetUserById(string id)
{
var db = _context.Users;
var user = await db.FirstOrDefaultAsync(u => u.Id.ToString() == id);
return user;
}
*/
/// <inheritdoc />
public override Task<string> GetPasswordHashAsync(ApplicationUser user, CancellationToken cancellationToken = default)
{
@ -185,49 +67,4 @@ public class UserRepository : UserStore<ApplicationUser, ApplicationRole, Applic
return Task.FromResult(!string.IsNullOrEmpty(user.PasswordHash));
}
/*
/// <inheritdoc />
public override Task<string> GetEmailAsync(ApplicationUser user, CancellationToken cancellationToken = default)
{
if (cancellationToken.IsCancellationRequested)
{
return Task.FromCanceled<string>(cancellationToken);
}
return Task.FromResult(user.Email);
}
/// <inheritdoc />
public override Task<bool> GetEmailConfirmedAsync(ApplicationUser user, CancellationToken cancellationToken = default)
{
if (cancellationToken.IsCancellationRequested)
{
return Task.FromCanceled<bool>(cancellationToken);
}
return Task.FromResult(user.EmailConfirmed);
}
/// <inheritdoc />
public override async Task<ApplicationUser> FindByEmailAsync(string normalizedEmail, CancellationToken cancellationToken = default)
{
ApplicationUser user = null;
var db = _context.Users;
user = await db.FirstOrDefaultAsync(u => u.NormalizedEmail == normalizedEmail, cancellationToken: cancellationToken);
return user;
}
/// <inheritdoc />
public override Task<string> GetNormalizedEmailAsync(ApplicationUser user, CancellationToken cancellationToken = default)
{
base.GetNormalizedEmailAsync(user, cancellationToken);
if (cancellationToken.IsCancellationRequested)
{
return Task.FromCanceled<string>(cancellationToken);
}
return Task.FromResult(user.NormalizedEmail);
}*/
}

2
BlueWest.Frontend

@ -1 +1 @@
Subproject commit f7249c3bb1ac4fd12a6bdd83f902733530d04bc7
Subproject commit b6750d7128057b72e5ab97ee9ff602abe80d334b

2
include/BlueWest.EfMethods

@ -1 +1 @@
Subproject commit 2ac7524e8bc6c5f8430e944958e0890b090a4a55
Subproject commit 6fd065fc4798699394837e770d087ef110aa8e55