Merge branch 'f/6-backend-authentifizierung' into 'develop'

Resolve "Backend Authentifizierung"

Closes #6

See merge request fia72-dev/eva_lernsituation!20

Backend/EVABackend/EVABackend/Areas/Identity/IdentityHostingStartup.cs

@@ -1,12 +1,10 @@
 using EVABackend.Areas.Identity.Data;
 using EVABackend.Models;
-using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 
 [assembly: HostingStartup(typeof(EVABackend.Areas.Identity.IdentityHostingStartup))]
 namespace EVABackend.Areas.Identity
@@ -18,10 +16,9 @@ namespace EVABackend.Areas.Identity
             builder.ConfigureServices((context, services) =>
             {
                 services.AddDbContext<EVABackendIdentityContext>(options =>
-                    options.UseSqlite(
+                    options.UseSqlite(context.Configuration.GetConnectionString("EVABackendIdentityContextConnection")));
-                        context.Configuration.GetConnectionString("EVABackendIdentityContextConnection")));
 
-                services.AddDefaultIdentity<EVABackendUser>()
+                services.AddIdentity<EVABackendUser, IdentityRole>()
                     .AddRoles<IdentityRole>()
                     .AddEntityFrameworkStores<EVABackendIdentityContext>()
                     .AddDefaultTokenProviders();
@@ -29,6 +26,9 @@ namespace EVABackend.Areas.Identity
                 services.ConfigureApplicationCookie(options =>
                 {
                     options.Cookie.Name = "EVABackend_Token";
+                    options.LoginPath = $"/unauthorized";
+                    options.LogoutPath = $"/unauthorized";
+                    options.AccessDeniedPath = $"/unauthorized";
                 });
             });
         }

Backend/EVABackend/EVABackend/Controllers/EVAController.cs

@@ -1,7 +1,5 @@
 using EVABackend.Areas.Identity.Data;
 using EVABackend.Models;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
@@ -32,7 +30,27 @@ namespace EVABackend.Controllers
         [AllowAnonymous]
         public ActionResult Login()
         {
-            return Ok(new { status = "Nicht unterstützt" });
+            return StatusCode(404, new { status = "Nicht unerstützt" });
+        }
+
+        [HttpGet]
+        [Route("unauthorized")]
+        [AllowAnonymous]
+        public ActionResult GetUnauthorized()
+        {
+            return StatusCode(401, new { status = "401 - Unauthorized" });
+        }
+
+#if DEBUG
+        [HttpGet]
+        [Route("login_test")]
+        [AllowAnonymous]
+        public async Task<ActionResult> LoginTest() 
+        {
+            var user = await _userManager.FindByNameAsync("Test");
+            await _signInManager.SignInAsync(user, true);
+
+            return Ok(new { status = "Eingeloggt als Test" });
         }
 
         [HttpGet]
@@ -42,7 +60,6 @@ namespace EVABackend.Controllers
         {
             if (_userManager.FindByNameAsync("Test") == null)
             {
-
                 var user = new EVABackendUser
                 {
                     UserName = "Test",
@@ -66,6 +83,7 @@ namespace EVABackend.Controllers
 
             return Ok();
         }
+#endif
 
         [HttpPost]
         [Route("login")]
@@ -78,15 +96,18 @@ namespace EVABackend.Controllers
                 return Ok();
             }
 
-            return Unauthorized();
+            return GetUnauthorized();
         }
 
         [HttpPost]
+#if DEBUG
+        [HttpGet]
+#endif
         [Route("logout")]
         [Authorize]
         public async Task<ActionResult> Logout()
         {
-            await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+            await _signInManager.SignOutAsync();
 
             return Ok();
         }
@@ -146,7 +167,7 @@ namespace EVABackend.Controllers
             await _context.SaveChangesAsync();
 
             antrag.Instrumente = instrumente.Select(i => new AntragInstrument { AntragId = antrag.Id, InstrumentId = i.Id }).ToList();
-            
+
             await _context.SaveChangesAsync();
 
             return Ok();
@@ -172,7 +193,7 @@ namespace EVABackend.Controllers
             var model = rooms.Select(r => new
             {
                 RaumID = r.Id,
-                RaumName= r.Name,
+                RaumName = r.Name,
                 Instrumente = r.Instrumente.Select(i => new
                 {
                     InstrumentID = i.InstrumentId,
@@ -188,7 +209,7 @@ namespace EVABackend.Controllers
         [Authorize(Roles = "Verwaltung")]
         public async Task<ActionResult> CreateRooms(CreateRooms model)
         {
-
+            throw new System.NotImplementedException();
         }
     }
 }

Backend/EVABackend/EVABackend/Dockerfile

@@ -5,7 +5,7 @@ EXPOSE 443
 
 FROM mcr.microsoft.com/dotnet/core/sdk:2.1-stretch AS build
 WORKDIR /src
-COPY ["EVABackend.csproj", "EVABackend/"]
+COPY ["EVABackend/EVABackend.csproj", "EVABackend/"]
 RUN dotnet restore "EVABackend/EVABackend.csproj"
 COPY . .
 WORKDIR "/src/EVABackend"

Backend/EVABackend/EVABackend/Startup.cs

@@ -1,7 +1,5 @@
-using EVABackend.Areas.Identity.Data;
+using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -37,7 +35,6 @@ namespace EVABackend
 
             app.UseStaticFiles();
             app.UseAuthentication();
-            app.UseHttpsRedirection();
             app.UseMvc();
         }
     }