diff --git a/MareAPI b/MareAPI index fef2365..4e4b2da 160000 --- a/MareAPI +++ b/MareAPI @@ -1 +1 @@ -Subproject commit fef23652805ec4cd5a62e5a5597bc3b61002b0ae +Subproject commit 4e4b2dab1774cb5fb7d7e05435eab3dd83112620 diff --git a/MareSynchronosServer/MareSynchronosAuthService/Controllers/JwtController.cs b/MareSynchronosServer/MareSynchronosAuthService/Controllers/JwtController.cs index 3d79953..6de9f16 100644 --- a/MareSynchronosServer/MareSynchronosAuthService/Controllers/JwtController.cs +++ b/MareSynchronosServer/MareSynchronosAuthService/Controllers/JwtController.cs @@ -1,4 +1,5 @@ -using MareSynchronos.API.Routes; +using MareSynchronos.API.Dto; +using MareSynchronos.API.Routes; using MareSynchronosAuthService.Services; using MareSynchronosShared; using MareSynchronosShared.Data; @@ -124,6 +125,21 @@ public class JwtController : Controller return Content(token.RawData); } + [AllowAnonymous] + [HttpPost(MareAuth.Auth_CreateIdentV2)] + public async Task CreateTokenV2(string auth, string charaIdent) + { + var tokenResponse = await CreateToken(auth, charaIdent); + var tokenContent = tokenResponse as ContentResult; + if (tokenContent == null) + return tokenResponse; + return Json(new AuthReplyDto + { + Token = tokenContent.Content, + WellKnown = _configuration.GetValueOrDefault(nameof(AuthServiceConfiguration.WellKnown), string.Empty), + }); + } + [AllowAnonymous] [HttpPost(MareAuth.Auth_Register)] public async Task Register() diff --git a/MareSynchronosServer/MareSynchronosShared/Utils/Configuration/AuthServiceConfiguration.cs b/MareSynchronosServer/MareSynchronosShared/Utils/Configuration/AuthServiceConfiguration.cs index 63d4e7a..94385b7 100644 --- a/MareSynchronosServer/MareSynchronosShared/Utils/Configuration/AuthServiceConfiguration.cs +++ b/MareSynchronosServer/MareSynchronosShared/Utils/Configuration/AuthServiceConfiguration.cs @@ -13,6 +13,8 @@ public class AuthServiceConfiguration : MareConfigurationBase public int RegisterIpLimit { get; set; } = 3; public int RegisterIpDurationInMinutes { get; set; } = 10; + public string WellKnown { get; set; } = string.Empty; + public override string ToString() { StringBuilder sb = new(); @@ -21,6 +23,7 @@ public class AuthServiceConfiguration : MareConfigurationBase sb.AppendLine($"{nameof(UseGeoIP)} => {UseGeoIP}"); sb.AppendLine($"{nameof(RegisterIpLimit)} => {RegisterIpLimit}"); sb.AppendLine($"{nameof(RegisterIpDurationInMinutes)} => {RegisterIpDurationInMinutes}"); + sb.AppendLine($"{nameof(WellKnown)} => {WellKnown}"); return sb.ToString(); } }