#5 Add log and initial Integration Test

ImageBase.WebApp.IntegrationTests/ControllersTests/AuthenticationControllerTests.cs

@@ -0,0 +1,84 @@
+using ImageBase.WebApp.Controllers;
+using ImageBase.WebApp.Dtos.AuthenticationDto;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace ImageBase.WebApp.IntegrationTests.ControllersTests
+{
+    public class AuthenticationControllerTests : IClassFixture<AuthenticationController>
+    {
+        private ImageBaseWebAppFactory _factory;
+        private HttpClient _client;
+
+        [Fact]
+        public void GivenARequestToTheController()
+        {
+            //Act
+            _factory = new ImageBaseWebAppFactory();
+            _client = _factory.CreateClient();
+        }
+
+        [Theory]
+        [InlineData("/")]
+        [InlineData("/api/Authentication")]
+        [InlineData("/api/Authentication/register")]
+        public async Task AuthenticationAPIEnsure(string url)
+        {
+            // Arrange
+            var response = await _client.GetAsync(url);
+
+            //Act
+            response.EnsureSuccessStatusCode();
+
+            // Assert
+            Assert.Equal("text/html; charset=utf-8",
+                response.Content.Headers.ContentType.ToString());
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task RegisterUserPOSTOK()
+        {
+            // Arrange
+            var content = new RegisterUserDto() { Email = "[email protected]", Password = "Qwert12345", PasswordConfirm = "Qwert1234" };
+            var jsonContent = new StringContent(JsonConvert.SerializeObject(content), Encoding.UTF8, "application/json");
+
+            //Act
+            var result = await _client.PostAsync("/api/Authentication/register", jsonContent);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, result.StatusCode);
+            Assert.Equal(HttpStatusCode.Redirect, result.StatusCode);
+        }
+
+        [Fact]
+        public async Task RegisterUserPOSTBad()
+        {
+            // Arrange
+            var content = new RegisterUserDto();
+            var jsonContent = new StringContent(JsonConvert.SerializeObject(content), Encoding.UTF8, "application/json");
+
+            //Act
+            var result = await _client.PostAsync("/api/Authentication/register", jsonContent);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, result.StatusCode);
+            Assert.Equal(HttpStatusCode.Redirect, result.StatusCode);
+        }
+
+        [Fact]
+        public void TearDown()
+        {
+            //Act
+            _client.Dispose();
+            _factory.Dispose();
+        }
+    }
+}

ImageBase.WebApp.IntegrationTests/ImageBase.WebApp.IntegrationTests.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.9" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ImageBase.WebApp\ImageBase.WebApp.csproj" />
+  </ItemGroup>
+
+</Project>

ImageBase.WebApp.IntegrationTests/ImageBaseWebAppFactory.cs

@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Mvc.Testing;
+
+
+namespace ImageBase.WebApp.IntegrationTests
+{
+    public class ImageBaseWebAppFactory : WebApplicationFactory<Startup>
+    {
+    }
+}

ImageBase.WebApp.IntegrationTests/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:54576/",
+      "sslPort": 44325
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "ImageBase.WebApp.IntegrationTests": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+    }
+  }
+}

ImageBase.WebApp/Dtos/AuthenticationDto/LoginUserDto.cs

@@ -1,13 +1,18 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace ImageBase.WebApp.Dtos.AuthenticationDto
 {
     public class LoginUserDto
     {
+        [Required(ErrorMessage = "You have not entered your email")]
         public string Email { get; set; }
+
+        [Required(ErrorMessage = "You have not entered your password")]
         public string Password { get; set; }
+
     }
 }

ImageBase.WebApp/Dtos/AuthenticationDto/RegisterUserDto.cs

@@ -9,8 +9,11 @@ namespace ImageBase.WebApp.Dtos.AuthenticationDto
     public class RegisterUserDto
     {
         public string Email { get; set; }
+
+        [MinLength(6, ErrorMessage = "String length must be more than 6 characters")]
         public string Password { get; set; }
-        [Compare("Password", ErrorMessage = "Пароли не совпадают")]
+
+        [Compare("Password", ErrorMessage = "Passwords do not match")]
         public string PasswordConfirm { get; set; }
     }
 }

ImageBase.WebApp/ImageBase.WebApp.csproj

@@ -17,7 +17,11 @@
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.4" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
   </ItemGroup>
 
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+
 
 </Project>

ImageBase.WebApp/Program.cs

@@ -1,23 +1,44 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Serilog;
+
 
 namespace ImageBase.WebApp
 {
     public class Program
     {
         public static void Main(string[] args)
         {
-            CreateHostBuilder(args).Build().Run();
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json").Build();
+            Log.Logger = new LoggerConfiguration().ReadFrom.Configuration(configuration)
+                .CreateLogger();
+            try
+            {
+                Log.Information("Start web host");
+                CreateHostBuilder(args).Build().Run();
+            }
+            catch (Exception e)
+            {
+                Log.Fatal(e, "Host terminated unexpectedly");
+            }
+            finally
+            {
+                Log.CloseAndFlush();
+            }
         }
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
+                .UseSerilog()
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();

ImageBase.WebApp/Properties/launchSettings.json

@@ -1,5 +1,4 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
+{
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
@@ -8,11 +7,10 @@
       "sslPort": 44319
     }
   },
+  "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "weatherforecast",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
@@ -21,10 +19,10 @@
       "commandName": "Project",
       "launchBrowser": true,
       "launchUrl": "weatherforecast",
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
     }
   }
-}
+}

ImageBase.WebApp/Startup.cs

@@ -16,6 +16,7 @@
 using ImageBase.WebApp.Models.Authentication;
 using Microsoft.AspNetCore.Identity;
 using Newtonsoft.Json.Serialization;
+using Serilog;
 
 namespace ImageBase.WebApp
 {
@@ -54,6 +55,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             app.UseHttpsRedirection();
 
+            app.UseSerilogRequestLogging();
+
             app.UseRouting();
 
             app.UseAuthentication();