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 ++------
 API/Startup.cs                      | 27 +++++----------------------
 2 files changed, 7 insertions(+), 28 deletions(-)

(limited to 'API')

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
+}
diff --git a/API/Startup.cs b/API/Startup.cs
index 49dd794..de108a5 100644
--- a/API/Startup.cs
+++ b/API/Startup.cs
@@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-<<<<<<< HEAD
 using Microsoft.OpenApi.Models;
 using Data.Models.Classes;
 using Data.Models.Options;
@@ -13,9 +12,10 @@ using Microsoft.IdentityModel.Tokens;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using System.Text;
 using System.Threading.Tasks;
-=======
 using API.Extensions;
->>>>>>> 8bd7295dc4694c1c0ed6fbc05d390223bfc4ef05
+using API.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.Identity;
 
 namespace API
 {
@@ -33,19 +33,6 @@ namespace API
 		{
 			services.AddControllers();
 
-			services.AddDbContext<DevHiveContext>(options =>
-				options.UseNpgsql(Configuration.GetConnectionString("DEV")));
-
-			services.AddIdentity<User, UserRoles>()
-				.AddEntityFrameworkStores<DevHiveContext>();
-
-			services.Configure<IdentityOptions>(options =>
-			{
-				options.User.RequireUniqueEmail = true;
-
-				options.Password.RequiredLength = 5;
-			});
-
 			services.AddSingleton<JWTOptions>(
 					new JWTOptions(Configuration.GetSection("AppSettings").GetSection("Secret").Value));
 
@@ -78,11 +65,6 @@ namespace API
                 };
             });
 
-    		services.AddSwaggerGen(c =>
-			{
-				c.SwaggerDoc("v1", new OpenApiInfo { Title = "API", Version = "v1" });
-			});
-
 			services.DatabaseConfiguration(Configuration);
 			services.SwaggerConfiguration();
 			services.JWTConfiguration();
@@ -105,8 +87,9 @@ namespace API
 				app.UseHsts();
 			}
 
+			app.UseDatabaseConfiguration();
 			app.UseJWTConfiguration();
-
+			
 			app.UseEndpoints(endpoints =>
 			{
 				endpoints.MapControllerRoute(
-- 
cgit v1.2.3