New ValidationString implementation; Simplified PictureProfile

3 files changed, 15 insertions, 7 deletions

diff --git a/API/Controllers/UserController.cs b/API/Controllers/UserController.cs
index 6cb1f54..8503922 100644
--- a/API/Controllers/UserController.cs
+++ b/API/Controllers/UserController.cs
@@ -6,7 +6,6 @@ using Microsoft.AspNetCore.Mvc;
 using Data.Models.DTOs;
 using Microsoft.AspNetCore.Authorization;
 using Data.Models.Options;
-using Microsoft.Extensions.Configuration;
 
 namespace API.Controllers
 {
diff --git a/API/Extensions/ConfigureJWT.cs b/API/Extensions/ConfigureJWT.cs
index 1de2aa5..22ada98 100644
--- a/API/Extensions/ConfigureJWT.cs
+++ b/API/Extensions/ConfigureJWT.cs
@@ -12,11 +12,17 @@ namespace API.Extensions
 	{
 		public static void JWTConfiguration(this IServiceCollection services, IConfiguration configuration)
 		{
-			services.AddSingleton<JWTOptions>(
-					new JWTOptions(configuration.GetSection("AppSettings").GetSection("Secret").Value));
+			services.AddSingleton(new JWTOptions(configuration
+						.GetSection("AppSettings")
+						.GetSection("Secret")
+						.Value));
 
 			// Get key from appsettings.json
-			var key = Encoding.ASCII.GetBytes(configuration.GetSection("AppSettings").GetSection("Secret").Value);
+			var key = Encoding.ASCII.GetBytes(configuration
+						.GetSection("AppSettings")
+						.GetSection("Secret")
+						.Value);
+
 			// Setup Jwt Authentication
 			services.AddAuthentication(x =>
 			{
diff --git a/API/Service/UserService.cs b/API/Service/UserService.cs
index 797a924..c57b4b7 100644
--- a/API/Service/UserService.cs
+++ b/API/Service/UserService.cs
@@ -34,6 +34,8 @@ namespace API.Service
 			if (user == null)
 				return new NotFoundObjectResult("User does not exist!");
 
+			//TODO: Clean it
+
 			// Get key from appsettings.json
 			var key = Encoding.ASCII.GetBytes(_jwtOptions.Secret);  
 
@@ -57,9 +59,9 @@ namespace API.Service
             var tokenString = tokenHandler.WriteToken(token);
 
 			return new OkObjectResult(new 
-				{
-					Token = tokenString
-				});
+			{
+				Token = tokenString
+			});
 		}
 
 		public async Task<IActionResult> RegisterUser(RegisterDTO registerDTO)
@@ -80,6 +82,7 @@ namespace API.Service
 
 		private string GeneratePasswordHash(string password)
 		{
+			//TODO: Hash password
 			return password; // TEMPORARY!
 		}