From 4625295baadaf632e353f0f92591dbf7e2d8f6a3 Mon Sep 17 00:00:00 2001
From: Thomas Aunvik <contact@thaun.dev>
Date: Thu, 25 Apr 2024 22:07:59 +0200
Subject: [PATCH] Backend Changes

---
 Web/Controllers/AuthenticationController.cs | 40 +++++++++++++++++----
 Web/Controllers/CharacterController.cs      |  7 ++++
 Web/Controllers/SkillController.cs          |  3 +-
 Web/Program.cs                              | 18 ----------
 4 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/Web/Controllers/AuthenticationController.cs b/Web/Controllers/AuthenticationController.cs
index 0b27813..7ec6f44 100644
--- a/Web/Controllers/AuthenticationController.cs
+++ b/Web/Controllers/AuthenticationController.cs
@@ -2,13 +2,14 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore.Query;
+using System.IO;
 
 namespace CliveBot.Web.Controllers
 {
     /// <summary>
     /// Creates redirect urls and challanges, and signing out
     /// </summary>
-    public class AuthenticationController : Controller
+    public class AuthenticationController(IConfiguration config) : Controller
     {
         /// <summary>
         /// Signing in to the application trough Cookie
@@ -18,10 +19,19 @@ public class AuthenticationController : Controller
         [HttpGet("~/signin")]
         public IActionResult SignIn(string? redirect)
         {
+            var frontEndUrl = config.GetValue<string>("FrontendUrl");
+
             var redirectUri = "/";
-            if(IsLocalUrl(redirect))
+            if (frontEndUrl != null)
+            {
+                redirectUri = frontEndUrl;
+            }
+
+            if (IsLocalUrl(redirect) && frontEndUrl != null)
             {
-                redirectUri = redirect;
+                Uri newUri = new(new(frontEndUrl), redirect);
+
+                redirectUri = newUri.AbsoluteUri;
             }
 
             return Challenge(new AuthenticationProperties { RedirectUri = redirectUri }, "Discord");
@@ -48,13 +58,31 @@ private static bool IsLocalUrl(string? url)
         /// <returns></returns>
         [HttpGet("~/signout")]
         [HttpPost("~/signout")]
-        public IActionResult SignOutCurrentUser()
+        public IActionResult SignOutCurrentUser(string redirect)
         {
             // Instruct the cookies middleware to delete the local cookie created
             // when the user agent is redirected from the external identity provider
             // after a successful authentication flow (e.g Google or Facebook).
-            return SignOut(new AuthenticationProperties { RedirectUri = "/" },
-                CookieAuthenticationDefaults.AuthenticationScheme);
+
+            var frontEndUrl = config.GetValue<string>("FrontendUrl");
+
+            var redirectUri = "/";
+            if (frontEndUrl != null)
+            {
+                redirectUri = frontEndUrl;
+            }
+
+            if (IsLocalUrl(redirect) && frontEndUrl != null)
+            {
+                Uri newUri = new(new(frontEndUrl), redirect);
+
+                redirectUri = newUri.AbsoluteUri;
+            }
+
+            return SignOut(
+                new AuthenticationProperties { RedirectUri = redirectUri },
+                CookieAuthenticationDefaults.AuthenticationScheme
+            );
         }
     }
 }
diff --git a/Web/Controllers/CharacterController.cs b/Web/Controllers/CharacterController.cs
index 9cadbae..9efe9e2 100644
--- a/Web/Controllers/CharacterController.cs
+++ b/Web/Controllers/CharacterController.cs
@@ -6,6 +6,7 @@
 using CliveBot.Web.Policies;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
 
 namespace CliveBot.Web.Controllers
 {
@@ -20,6 +21,8 @@ public class CharacterController : ApiBaseController
         /// </summary>
         /// <returns>List of Characters</returns>
         [HttpGet]
+
+        [AllowAnonymous]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(ActionResult<List<CharacterDto>>))]
         public async Task<List<CharacterDto>> GetAllCharacters()
         {
@@ -27,6 +30,8 @@ public async Task<List<CharacterDto>> GetAllCharacters()
         }
 
         [HttpGet("{id}")]
+
+        [AllowAnonymous]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(ActionResult<CharacterDto>))]
         public async Task<CharacterDto> GetCharacter(int id)
         {
@@ -98,6 +103,8 @@ public async Task<ActionResult<CharacterVariantDto>> UpdateVariantPreviewImage(i
 
         // Notes
         [HttpGet("{characterId}/notes")]
+
+        [AllowAnonymous]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(ActionResult<List<CharacterNoteDto>>))]
         public async Task<List<CharacterNoteDto>> CreateNote(int characterId, CharacterNoteList.Query query)
         {
diff --git a/Web/Controllers/SkillController.cs b/Web/Controllers/SkillController.cs
index 775a8c3..d91306b 100644
--- a/Web/Controllers/SkillController.cs
+++ b/Web/Controllers/SkillController.cs
@@ -60,7 +60,7 @@ public async Task<ActionResult<SkillDto>> SearchSkill(string skillName)
         [HttpPost]
         [ModAuthorize(ManageSkills: true)]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(SkillDto))]
-        public async Task<ActionResult<SkillDto>> EditSkill(SkillCreate.Command skill)
+        public async Task<ActionResult<SkillDto>> CreateSkill(SkillCreate.Command skill)
         {
             return await Mediator.Send(skill);
         }
@@ -83,6 +83,7 @@ public async Task<ActionResult<SkillDto>> EditSkill(int id, SkillEdit.Command sk
         }
 
         [HttpGet("{id}/languages")]
+        [AllowAnonymous]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(List<SkillLanguageDto>))]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         public async Task<List<SkillLanguageDto>> GetSkillLanguages(int id)
diff --git a/Web/Program.cs b/Web/Program.cs
index fe41988..a49cf32 100644
--- a/Web/Program.cs
+++ b/Web/Program.cs
@@ -76,7 +76,6 @@
         options.AccessDeniedPath = "/error/accessdenied";
         options.ClientId = discordClientId;
         options.ClientSecret = discordClientSecret;
-        
     })
     .AddCookie(CookieAuthenticationDefaults.AuthenticationScheme, (options) =>
     {
@@ -89,23 +88,6 @@
         {
             options.Cookie.Domain = cookieDomain;
         }
-        options.Events.OnSignedIn = (ctx) => {
-            if (string.IsNullOrEmpty(frontendUrl))
-            {
-                return Task.CompletedTask;
-            }
-            ctx.Response.Redirect(frontendUrl);
-            return Task.CompletedTask;
-        };
-
-        options.Events.OnSigningOut = (ctx) => {
-            if (string.IsNullOrEmpty(frontendUrl))
-            {
-                return Task.CompletedTask;
-            }
-            ctx.Response.Redirect(frontendUrl);
-            return Task.CompletedTask;
-        };
     });
     //.AddBearerToken();