From 2a85613d6827f5a1d151b856739863fbe9782143 Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Sun, 28 Feb 2021 13:14:23 +0200
Subject: Removed JwtOptions

---
 src/Services/DevHive.Services/Options/JwtOptions.cs        | 14 --------------
 .../DevHive.Web/Configurations/Extensions/ConfigureJwt.cs  | 14 ++++----------
 src/Web/DevHive.Web/appsettings.json                       |  3 ---
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 src/Services/DevHive.Services/Options/JwtOptions.cs

(limited to 'src')

diff --git a/src/Services/DevHive.Services/Options/JwtOptions.cs b/src/Services/DevHive.Services/Options/JwtOptions.cs
deleted file mode 100644
index d973f45..0000000
--- a/src/Services/DevHive.Services/Options/JwtOptions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Microsoft.Extensions.Options;
-
-namespace DevHive.Services.Options
-{
-	public class JwtOptions
-	{
-		public JwtOptions(string secret)
-		{
-			this.Secret = secret;
-		}
-
-		public string Secret { get; init; }
-	}
-}
diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureJwt.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureJwt.cs
index 8d387bd..18127bc 100644
--- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureJwt.cs
+++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureJwt.cs
@@ -1,6 +1,5 @@
 using System.Text;
 using System.Threading.Tasks;
-using DevHive.Services.Options;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -12,15 +11,10 @@ namespace DevHive.Web.Configurations.Extensions
 	{
 		public static void JWTConfiguration(this IServiceCollection services, IConfiguration configuration)
 		{
-			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")
+			var signingKey = Encoding.ASCII.GetBytes(configuration
+						.GetSection("Jwt")
+						.GetSection("signingKey")
 						.Value);
 
 			// Setup Jwt Authentication
@@ -42,7 +36,7 @@ namespace DevHive.Web.Configurations.Extensions
 				x.SaveToken = true;
 				x.TokenValidationParameters = new TokenValidationParameters
 				{
-					IssuerSigningKey = new SymmetricSecurityKey(key),
+					IssuerSigningKey = new SymmetricSecurityKey(signingKey),
 					ValidateIssuer = false,
 					ValidateAudience = false
 				};
diff --git a/src/Web/DevHive.Web/appsettings.json b/src/Web/DevHive.Web/appsettings.json
index b7e0ce5..fcf9805 100644
--- a/src/Web/DevHive.Web/appsettings.json
+++ b/src/Web/DevHive.Web/appsettings.json
@@ -1,7 +1,4 @@
 {
-  "AppSettings": {
-    "Secret": ""
-  },
   "Jwt": {
     "signingKey": "",
     "validationIssuer": "",
-- 
cgit v1.2.3