Merge branch 'bugfix/#111' into develop

Author: i4004

src/Simplify.Web/Modules/LanguageManager.cs

@@ -50,7 +50,12 @@ public void SetCookieLanguage(string language)
 			if (string.IsNullOrEmpty(language))
 				throw new ArgumentNullException(nameof(language));
 
-			_responseCookies.Append(CookieLanguageFieldName, language, new CookieOptions { Expires = DateTime.Now.AddYears(5) });
+			_responseCookies.Append(CookieLanguageFieldName, language, new CookieOptions
+			{
+				Expires = DateTime.Now.AddYears(5),
+				SameSite = SameSiteMode.None,
+				Secure = true
+			});
 		}
 
 		/// <summary>

src/Simplify.Web/Modules/Redirector.cs

@@ -1,6 +1,7 @@
 #nullable disable
 
 using System;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 
 namespace Simplify.Web.Modules
@@ -50,7 +51,11 @@ public Redirector(IWebContext context)
 		public string PreviousPageUrl
 		{
 			get => _context.Request.Cookies[PreviousPageUrlCookieFieldName];
-			set => _context.Response.Cookies.Append(PreviousPageUrlCookieFieldName, value);
+			set => _context.Response.Cookies.Append(PreviousPageUrlCookieFieldName, value, new CookieOptions
+			{
+				SameSite = SameSiteMode.None,
+				Secure = true
+			});
 		}
 
 		/// <summary>
@@ -62,7 +67,11 @@ public string PreviousPageUrl
 		public string RedirectUrl
 		{
 			get => _context.Request.Cookies[RedirectUrlCookieFieldName];
-			set => _context.Response.Cookies.Append(RedirectUrlCookieFieldName, value);
+			set => _context.Response.Cookies.Append(RedirectUrlCookieFieldName, value, new CookieOptions
+			{
+				SameSite = SameSiteMode.None,
+				Secure = true
+			});
 		}
 
 		/// <summary>
@@ -74,7 +83,11 @@ public string RedirectUrl
 		public string LoginReturnUrl
 		{
 			get => _context.Request.Cookies[LoginReturnUrlCookieFieldName];
-			set => _context.Response.Cookies.Append(LoginReturnUrlCookieFieldName, value);
+			set => _context.Response.Cookies.Append(LoginReturnUrlCookieFieldName, value, new CookieOptions
+			{
+				SameSite = SameSiteMode.None,
+				Secure = true
+			});
 		}
 
 		/// <summary>
@@ -86,7 +99,11 @@ public string LoginReturnUrl
 		public string PreviousNavigatedUrl
 		{
 			get => _context.Request.Cookies[PreviousNavigatedUrlCookieFieldName];
-			set => _context.Response.Cookies.Append(PreviousNavigatedUrlCookieFieldName, value);
+			set => _context.Response.Cookies.Append(PreviousNavigatedUrlCookieFieldName, value, new CookieOptions
+			{
+				SameSite = SameSiteMode.None,
+				Secure = true
+			});
 		}
 
 		/// <summary>