From 9263e0c66aa7463975635a36ddcc85b45af0c66c Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Sat, 12 Dec 2020 15:27:40 +0200
Subject: Fixed merge conflicts

---
 API/Extensions/ConfigureDatabase.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'API/Extensions')

diff --git a/API/Extensions/ConfigureDatabase.cs b/API/Extensions/ConfigureDatabase.cs
index 57560e2..0e00870 100644
--- a/API/Extensions/ConfigureDatabase.cs
+++ b/API/Extensions/ConfigureDatabase.cs
@@ -13,15 +13,11 @@ namespace API.Extensions
 		public static void DatabaseConfiguration(this IServiceCollection services, IConfiguration configuration)
 		{
 			services.AddDbContext<DevHiveContext>(options =>
-				options.UseNpgsql(configuration.GetConnectionString("DEV")))
-				.AddAuthentication()
-				.AddJwtBearer();
+				options.UseNpgsql(configuration.GetConnectionString("DEV")));
 
 			services.AddIdentity<User, Roles>()
 				.AddEntityFrameworkStores<DevHiveContext>();
 				
-			services.AddAuthentication();
-
 			services.Configure<IdentityOptions>(options =>
 			{
 				options.User.RequireUniqueEmail = true;
@@ -39,4 +35,4 @@ namespace API.Extensions
 			app.UseAuthorization();
 		}
 	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3