darkstack/LaDOSE
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Ordering files

Browse Source
This commit is contained in:
Darkstack
2018-10-06 13:05:38 +02:00
parent f670cd78a8
commit d3cdc93c14
11 changed files with 89 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
LaDOSE.Src/LaDOSE.Api/Context/LaDOSEDbContext.cs
View File

@@ -1,21 +0,0 @@

using System;
using LaDOSE.Entity;
using Microsoft.EntityFrameworkCore;
namespace LaDOSE.Api.Context
{
public class LaDOSEDbContext : DbContext
{
public DbSet<Game> Game { get; set; }
public DbSet<ApplicationUser> ApplicationUser { get; set; }
public LaDOSEDbContext(DbContextOptions options) : base(options)
{
}
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
base.OnModelCreating(modelBuilder);
}
}
}

2
LaDOSE.Src/LaDOSE.Api/Controllers/GameController.cs
View File

@@ -2,8 +2,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using LaDOSE.Api.Context;
using LaDOSE.Entity;
using LaDOSE.Entity.Context;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

53
LaDOSE.Src/LaDOSE.Api/Controllers/UsersController.cs
View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Security.Claims;
using System.Text;
using System.Threading.Tasks;
using LaDOSE.Api.Services;
using LaDOSE.Business.Interface;
using LaDOSE.Entity;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@@ -32,24 +32,9 @@ namespace LaDOSE.Api.Controllers
_configuration = configuration;
}
[AllowAnonymous]
[HttpGet("test")]
public String Test()
{
return "DEAD";
}
[HttpGet("test2")]
public String Test2()
{
return "DEAD";
}
[AllowAnonymous]
[HttpPost("authenticate")]
[HttpPost("auth")]
public IActionResult Authenticate([FromBody]ApplicationUser userDto)
{
var user = _userService.Authenticate(userDto.Username, userDto.Password);
@@ -82,25 +67,25 @@ namespace LaDOSE.Api.Controllers
});
}
[AllowAnonymous]
[HttpPost("register")]
public IActionResult Register([FromBody]ApplicationUser userDto)
{
// map dto to entity
//[AllowAnonymous]
//[HttpPost("register")]
//public IActionResult Register([FromBody]ApplicationUser userDto)
//{
// // map dto to entity
try
{
// save
_userService.Create(userDto, userDto.Password);
return Ok();
}
catch (Exception ex)
{
// return error message if there was an exception
return BadRequest(new { message = ex.Message });
}
}
// try
// {
// // save
// _userService.Create(userDto, userDto.Password);
// return Ok();
// }
// catch (Exception ex)
// {
// // return error message if there was an exception
// return BadRequest(new { message = ex.Message });
// }
//}
}

2
LaDOSE.Src/LaDOSE.Api/LaDOSE.Api.csproj
View File

@@ -5,6 +5,7 @@
</PropertyGroup>
<ItemGroup>
<Folder Include="Services\" />
<Folder Include="wwwroot\" />
</ItemGroup>
@@ -15,6 +16,7 @@
<ItemGroup>
<ProjectReference Include="..\LaDOSE.Entity\LaDOSE.Entity.csproj" />
<ProjectReference Include="..\LaDOSE.Service\LaDOSE.Business.csproj" />
</ItemGroup>
<ItemGroup>

154
LaDOSE.Src/LaDOSE.Api/Services/UserService.cs
View File

@@ -1,154 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using LaDOSE.Api.Context;
using LaDOSE.Entity;
namespace LaDOSE.Api.Services
{
public interface IUserService
{
ApplicationUser Authenticate(string username, string password);
IEnumerable<ApplicationUser> GetAll();
ApplicationUser GetById(int id);
ApplicationUser Create(ApplicationUser user, string password);
void Update(ApplicationUser user, string password = null);
void Delete(int id);
}
public class UserService : IUserService
{
private LaDOSEDbContext _context;
public UserService(LaDOSEDbContext context)
{
_context = context;
}
public ApplicationUser Authenticate(string username, string password)
{
if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password))
return null;
var user = _context.ApplicationUser.SingleOrDefault(x => x.Username == username);
// check if username exists
if (user == null)
return null;
// check if password is correct
if (!VerifyPasswordHash(password, user.PasswordHash, user.PasswordSalt))
return null;
// authentication successful
return user;
}
public IEnumerable<ApplicationUser> GetAll()
{
return _context.ApplicationUser;
}
public ApplicationUser GetById(int id)
{
return _context.ApplicationUser.Find(id);
}
public ApplicationUser Create(ApplicationUser user, string password)
{
// validation
if (string.IsNullOrWhiteSpace(password))
throw new Exception("Password is required");
if (_context.ApplicationUser.Any(x => x.Username == user.Username))
throw new Exception("Username \"" + user.Username + "\" is already taken");
byte[] passwordHash, passwordSalt;
CreatePasswordHash(password, out passwordHash, out passwordSalt);
user.PasswordHash = passwordHash;
user.PasswordSalt = passwordSalt;
_context.ApplicationUser.Add(user);
_context.SaveChanges();
return user;
}
public void Update(ApplicationUser userParam, string password = null)
{
var user = _context.ApplicationUser.Find(userParam.Id);
if (user == null)
throw new Exception("User not found");
if (userParam.Username != user.Username)
{
// username has changed so check if the new username is already taken
if (_context.ApplicationUser.Any(x => x.Username == userParam.Username))
throw new Exception("Username " + userParam.Username + " is already taken");
}
// update user properties
user.FirstName = userParam.FirstName;
user.LastName = userParam.LastName;
user.Username = userParam.Username;
// update password if it was entered
if (!string.IsNullOrWhiteSpace(password))
{
byte[] passwordHash, passwordSalt;
CreatePasswordHash(password, out passwordHash, out passwordSalt);
user.PasswordHash = passwordHash;
user.PasswordSalt = passwordSalt;
}
_context.ApplicationUser.Update(user);
_context.SaveChanges();
}
public void Delete(int id)
{
var user = _context.ApplicationUser.Find(id);
if (user != null)
{
_context.ApplicationUser.Remove(user);
_context.SaveChanges();
}
}
// private helper methods
private static void CreatePasswordHash(string password, out byte[] passwordHash, out byte[] passwordSalt)
{
if (password == null) throw new ArgumentNullException("password");
if (string.IsNullOrWhiteSpace(password)) throw new ArgumentException("Value cannot be empty or whitespace only string.", "password");
using (var hmac = new System.Security.Cryptography.HMACSHA512())
{
passwordSalt = hmac.Key;
passwordHash = hmac.ComputeHash(System.Text.Encoding.UTF8.GetBytes(password));
}
}
private static bool VerifyPasswordHash(string password, byte[] storedHash, byte[] storedSalt)
{
if (password == null) throw new ArgumentNullException("password");
if (string.IsNullOrWhiteSpace(password)) throw new ArgumentException("Value cannot be empty or whitespace only string.", "password");
if (storedHash.Length != 64) throw new ArgumentException("Invalid length of password hash (64 bytes expected).", "passwordHash");
if (storedSalt.Length != 128) throw new ArgumentException("Invalid length of password salt (128 bytes expected).", "passwordHash");
using (var hmac = new System.Security.Cryptography.HMACSHA512(storedSalt))
{
var computedHash = hmac.ComputeHash(System.Text.Encoding.UTF8.GetBytes(password));
for (int i = 0; i < computedHash.Length; i++)
{
if (computedHash[i] != storedHash[i]) return false;
}
}
return true;
}
}
}

8
LaDOSE.Src/LaDOSE.Api/Startup.cs
View File

@@ -3,9 +3,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using LaDOSE.Api.Context;
using LaDOSE.Api.Services;
using LaDOSE.Business.Interface;
using LaDOSE.Business.Service;
using LaDOSE.Entity;
using LaDOSE.Entity.Context;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
@@ -18,7 +19,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.Tokens;
using Pomelo.EntityFrameworkCore.MySql;
using Pomelo.EntityFrameworkCore.MySql;
using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
namespace LaDOSE.Api
@@ -45,6 +46,7 @@ namespace LaDOSE.Api
options => options.UseMySql($"Server={MySqlServer};Database={MySqlDatabase};User={MySqlUser};Password={MySqlPassword};", // replace with your Connection String
mysqlOptions =>
{
mysqlOptions.ServerVersion(new Version(10, 1, 16), ServerType.MariaDb); // replace with your Server Version and Type
}
));