Winsomnia/MireaBackend
1
0
Fork 0
Code Pull Requests Actions Projects Releases Activity

fix: get sub url without first "api"

Browse Source
This commit is contained in:
Polianin Nikita 2024-07-05 01:59:36 +03:00
parent ac4804e864
commit 820828276e
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Endpoint/Common/Services/UrlHelper.cs
View File

@ -18,5 +18,29 @@ public static class UrlHelper
}
public static string GetSubPath => CreateSubPath(Environment.GetEnvironmentVariable("ACTUAL_SUB_PATH"));
public static string GetSubPathWithoutFirstApiName
{
get
{
var path = GetSubPath;
if (string.IsNullOrEmpty(path) || path == "/")
return CreateSubPath(null);
var parts = path.Split('/', StringSplitOptions.RemoveEmptyEntries);
for (int i = 0; i < parts.Length; i++)
{
if (!parts[i].Equals("api", StringComparison.CurrentCultureIgnoreCase)) continue;
parts = parts.Take(i).Concat(parts.Skip(i + 1)).ToArray();
break;
}
return CreateSubPath(string.Join("/", parts));
}
}
public static string GetSubPathSwagger => CreateSubPath(Environment.GetEnvironmentVariable("SWAGGER_SUB_PATH"));
}

2
Endpoint/Controllers/Configuration/SetupController.cs
View File

@ -69,7 +69,7 @@ public partial class SetupController(
Response.Cookies.Append("AuthToken", token, new CookieOptions
{
Path = UrlHelper.GetSubPath + "api",
Path = UrlHelper.GetSubPathWithoutFirstApiName + "api",
Domain = UrlHelper.CurrentDomain(ControllerContext.HttpContext),
Secure = true,
HttpOnly = true

2
Endpoint/Controllers/V1/AuthController.cs
View File

@ -29,7 +29,7 @@ public class AuthController(IOptionsSnapshot<Admin> user, AuthService auth, Pass
var cookieOptions = new CookieOptions
{
Expires = expires,
Path = UrlHelper.GetSubPath + "api",
Path = UrlHelper.GetSubPathWithoutFirstApiName + "api",
Domain = UrlHelper.CurrentDomain(ControllerContext.HttpContext),
Secure = true,
HttpOnly = true