UNOV/mycorerepository
1
0
Fork 0
mirror of https://bitbucket.org/myhomie/mycorerepository.git synced 2025-12-06 01:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

MC #3 TokenService, #2 WIP Changes in TokenController, UserController + small changes

Browse Source
This commit is contained in:
ThomasFransolet 2019-08-06 00:09:39 +02:00
parent 36a745d219
commit c6df9203d5
13 changed files with 173 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/MyCore/v15/Server/sqlite3/storage.ide
View File

Binary file not shown.

BIN
.vs/MyCore/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

2
MyCore/Controllers/DeviceController.cs
View File

@ -49,7 +49,7 @@ namespace MyCore.Controllers
/// <summary>
///
/// </summary>
[HttpPost("{idDevice}")]
[HttpPost]
public IActionResult CreateDevice(int idDevice, [FromBody] Device device)
{
if (idDevice == 0)

71
MyCore/Controllers/TokenController.cs
View File

@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.IdentityModel.Tokens;
using MyCore.Models;
using MyCore.Services;
namespace MyCore.Controllers
{
@ -19,73 +20,37 @@ namespace MyCore.Controllers
[ApiController]
public class TokenController : ControllerBase
{
private TokenService _tokenService;
private UserService _userService;
public TokenController(TokenService tokenService, UserService userService)
{
_tokenService = tokenService;
_userService = userService;
}
[AllowAnonymous]
[HttpPost]
public ActionResult<UserInfo> Create(string username, string password)
public ActionResult<UserInfo> Create(string email, string password)
{
var test = GenerateSHA256String(password);
//string test = _TokenService.GenerateSHA256String(password);
if (IsValidUserAndPasswordCombination(username, password))
if (IsValidUserAndPasswordCombination(email, password))
{
UserInfo user = new UserInfo();
user.FirstName = "Thomas";
user.LastName = "Fransolet";
user.Token = GenerateToken(username).ToString();
UserInfo user = _userService.GetUser(email);
user.Token = _tokenService.GenerateToken(email).ToString();
return user;
}
//return new ObjectResult("{\"Token\":\""+GenerateToken(username)+"\"}");
return BadRequest();
}
private object GenerateToken(string username)
private bool IsValidUserAndPasswordCombination(string email, string password)
{
var secretKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes("%G2YZ=\tgN7fC9M$FXDt#q*a&]Z")); // Put the secret in a file or something
var claims = new Claim[] {
new Claim(ClaimTypes.Name, username),
new Claim(JwtRegisteredClaimNames.Email, "john.doe@blinkingcaret.com"),
new Claim(ClaimTypes.Role, "Admin")
};
var token = new JwtSecurityToken(
issuer: "MyCore App",
audience: "Miotecher",
claims: claims,
notBefore: DateTime.Now,
expires: DateTime.Now.AddDays(28),
signingCredentials: new SigningCredentials(secretKey, SecurityAlgorithms.HmacSha256)
);
string jwtToken = new JwtSecurityTokenHandler().WriteToken(token);
return jwtToken;
}
private bool IsValidUserAndPasswordCombination(string username, string password)
{
if (username == "Thomas" && password == "MonsieurMagic") { return true; }
// Test if is database and is correct
if (email == "thomas.fransolet@hotmail.be" && password == "MonsieurMagic") { return true; }
else return false;
}
public static string GenerateSHA256String(string inputString)
{
SHA256 sha256 = SHA256Managed.Create();
byte[] bytes = Encoding.UTF8.GetBytes(inputString);
byte[] hash = sha256.ComputeHash(bytes);
return GetStringFromHash(hash);
}
private static string GetStringFromHash(byte[] hash)
{
StringBuilder result = new StringBuilder();
for (int i = 0; i < hash.Length; i++)
{
result.Append(hash[i].ToString("X2"));
}
return result.ToString();
}
}
}
}

25
MyCore/Controllers/UserController.cs
View File

@ -17,11 +17,13 @@ namespace MyCore.Controllers
[ApiController]
public class UserController : ControllerBase
{
private readonly UserService _userService;
private UserService _userService;
private TokenService _tokenService;
public UserController(UserService userService)
public UserController(UserService userService, TokenService tokenService)
{
_userService = userService;
_tokenService = tokenService;
}
// GET api/user
@ -52,6 +54,25 @@ namespace MyCore.Controllers
//return _userService.GetUser(id);
}
// POST: User/Create
/// <summary>
///
/// </summary>
[AllowAnonymous]
[HttpPost]
public ActionResult<UserInfo> CreateUser([FromBody] UserInfo newUser)
{
if (newUser != null)
{
newUser.Token = _tokenService.GenerateToken(newUser.Email).ToString();
UserInfo userCreated = _userService.CreateUser(newUser);
return userCreated;
}
return StatusCode(500);
}
/*
// POST api/values
[HttpPost]

4
MyCore/Models/UserInfo.cs
View File

@ -54,10 +54,10 @@ namespace MyCore.Models
public int PostalCode { get; set; }
[BsonElement("ScreenConfigurationIds")]
public int[] ScreenConfigurationIds { get; set; }
public ScreenConfiguration[] ScreenConfigurationIds { get; set; }
[BsonElement("DeviceIds")]
public int[] DeviceIds { get; set; }
public Device[] DeviceIds { get; set; }
}
}

1
MyCore/MyCore.csproj
View File

@ -12,6 +12,7 @@
</PropertyGroup>
<ItemGroup>
<Folder Include="DTO\" />
<Folder Include="wwwroot\" />
</ItemGroup>

57
MyCore/Services/TokenService.cs Normal file
View File

@ -0,0 +1,57 @@
using Microsoft.IdentityModel.Tokens;
using System;
using System.Collections.Generic;
using System.IdentityModel.Tokens.Jwt;
using System.Linq;
using System.Security.Claims;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
namespace MyCore.Services
{
public class TokenService
{
public object GenerateToken(string username)
{
var secretKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes("%G2YZ=\tgN7fC9M$FXDt#q*a&]Z")); // Put the secret in a file or something
var claims = new Claim[] {
new Claim(ClaimTypes.Name, username),
new Claim(JwtRegisteredClaimNames.Email, "john.doe@blinkingcaret.com"),
new Claim(ClaimTypes.Role, "Admin")
};
var token = new JwtSecurityToken(
issuer: "MyCore App",
audience: "Miotecher",
claims: claims,
notBefore: DateTime.Now,
expires: DateTime.Now.AddDays(28),
signingCredentials: new SigningCredentials(secretKey, SecurityAlgorithms.HmacSha256)
);
string jwtToken = new JwtSecurityTokenHandler().WriteToken(token);
return jwtToken;
}
public static string GenerateSHA256String(string inputString)
{
SHA256 sha256 = SHA256Managed.Create();
byte[] bytes = Encoding.UTF8.GetBytes(inputString);
byte[] hash = sha256.ComputeHash(bytes);
return GetStringFromHash(hash);
}
public static string GetStringFromHash(byte[] hash)
{
StringBuilder result = new StringBuilder();
for (int i = 0; i < hash.Length; i++)
{
result.Append(hash[i].ToString("X2"));
}
return result.ToString();
}
}
}

4
MyCore/Services/UserService.cs
View File

@ -25,9 +25,9 @@ namespace MyCore.Services
return _Users.Find(m => true).ToList();
}
public UserInfo GetUser(string id)
public UserInfo GetUser(string email)
{
return _Users.Find<UserInfo>(m => m.Id == id).FirstOrDefault();
return _Users.Find<UserInfo>(m => m.Email == email).FirstOrDefault();
}
public UserInfo CreateUser(UserInfo user)

5
MyCore/Startup.cs
View File

@ -35,6 +35,9 @@ namespace MyCore
// Add the service (test purpose)
services.AddScoped<BookService>();
services.AddScoped<IoTDeviceService>();
services.AddScoped<UserService>();
services.AddScoped<TokenService>();
services.AddScoped<DeviceService>();
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
@ -85,7 +88,7 @@ namespace MyCore
{
app.UseCors(
options => options.WithOrigins("http://localhost:4200").AllowAnyMethod().AllowAnyHeader()
options => options.WithOrigins("http://localhost:4200").AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader().AllowCredentials()
);
// Enable middleware to serve generated Swagger as a JSON endpoint.

32
MyCore/bin/Debug/netcoreapp2.1/MyCore.xml
View File

@ -4,6 +4,33 @@
<name>MyCore</name>
</assembly>
<members>
<member name="M:MyCore.Controllers.DeviceController.GetAllDevices">
<summary>
</summary>
<param name="id">Id of the device you want to get informatiun</param>
</member>
<member name="M:MyCore.Controllers.DeviceController.GetDeviceInfo(System.String)">
<summary>
</summary>
<param name="idDevice">Id of the device you want to get information</param>
</member>
<member name="M:MyCore.Controllers.DeviceController.CreateDevice(System.Int32,MyCore.Models.Device)">
<summary>
</summary>
</member>
<member name="M:MyCore.Controllers.DeviceController.UpdateDevice(System.Int32,MyCore.Models.Device)">
<summary>
</summary>
</member>
<member name="M:MyCore.Controllers.DeviceController.DeleteDevice(System.Int32,System.String)">
<summary>
</summary>
</member>
<member name="M:MyCore.Controllers.IOTController.GetSmartPrinterMessages(System.Int32)">
<summary>
Retrieve all SmartPrinterMessage
@ -40,6 +67,11 @@
</summary>
<param name="id">id user</param>
</member>
<member name="M:MyCore.Controllers.UserController.CreateUser(MyCore.Models.UserInfo)">
<summary>
</summary>
</member>
<member name="M:MyCore.Controllers.ValuesController.Get">
<summary>
It's a test ! :)

32
MyCore/obj/Debug/netcoreapp2.1/MyCore.xml
View File

@ -4,6 +4,33 @@
<name>MyCore</name>
</assembly>
<members>
<member name="M:MyCore.Controllers.DeviceController.GetAllDevices">
<summary>
</summary>
<param name="id">Id of the device you want to get informatiun</param>
</member>
<member name="M:MyCore.Controllers.DeviceController.GetDeviceInfo(System.String)">
<summary>
</summary>
<param name="idDevice">Id of the device you want to get information</param>
</member>
<member name="M:MyCore.Controllers.DeviceController.CreateDevice(System.Int32,MyCore.Models.Device)">
<summary>
</summary>
</member>
<member name="M:MyCore.Controllers.DeviceController.UpdateDevice(System.Int32,MyCore.Models.Device)">
<summary>
</summary>
</member>
<member name="M:MyCore.Controllers.DeviceController.DeleteDevice(System.Int32,System.String)">
<summary>
</summary>
</member>
<member name="M:MyCore.Controllers.IOTController.GetSmartPrinterMessages(System.Int32)">
<summary>
Retrieve all SmartPrinterMessage
@ -40,6 +67,11 @@
</summary>
<param name="id">id user</param>
</member>
<member name="M:MyCore.Controllers.UserController.CreateUser(MyCore.Models.UserInfo)">
<summary>
</summary>
</member>
<member name="M:MyCore.Controllers.ValuesController.Get">
<summary>
It's a test ! :)

2
swagger.json
View File

File diff suppressed because one or more lines are too long