Rework launcher<->gateway handshake interaction.

URI to news list JSON file is now provided in the handshake.

Author: alexrp

Directory.Packages.props

@@ -41,8 +41,6 @@
                         Version="1.21.0" />
         <PackageVersion Include="Injectio"
                         Version="3.1.0" />
-        <PackageVersion Include="Markdig"
-                        Version="0.34.0" />
         <PackageVersion Include="Marten.AspNetCore"
                         Version="6.4.1" />
         <PackageVersion Include="Marten.NodaTime"
@@ -111,7 +109,5 @@
                         Version="2.1.7" />
         <PackageVersion Include="Vezel.Ruptura.Memory"
                         Version="2.1.7" />
-        <PackageVersion Include="YamlDotNet"
-                        Version="13.7.1" />
     </ItemGroup>
 </Project>

src/server/gateway/Controllers/LauncherController.cs

@@ -0,0 +1,21 @@
+using Arise.Server.Gateway.Net;
+
+namespace Arise.Server.Gateway.Controllers;
+
+[AllowAnonymous]
+[DisableRateLimiting]
+internal sealed class LauncherController : ApiController
+{
+    [HttpGet]
+    public IActionResult Hello(IOptions<GatewayOptions> options, GameDownloadLinks links)
+    {
+        return Ok(new LauncherHelloResponse
+        {
+            NewsUri = options.Value.NewsUri is { } uri ? new(uri) : null,
+            TeraManifestUri = links.TeraManifestUri,
+            TeraDownloadFormat = links.TeraDownloadUri,
+            AriseManifestUri = links.AriseManifestUri,
+            AriseDownloadFormat = links.AriseDownloadUri,
+        });
+    }
+}

src/server/gateway/Controllers/NewsController.cs

@@ -1,4 +1,4 @@
-namespace Arise.Cryptography;
+namespace Arise.Server.Gateway.Cryptography;
 
 public sealed class Pbkdf2PasswordStrategy : PasswordStrategy
 {

src/server/gateway/Controllers/VersionController.cs

@@ -32,7 +32,7 @@ internal sealed class GatewayOptions : IOptions<GatewayOptions>
 
     public Duration AccountSessionKeyTime { get; set; } = Duration.FromHours(12);
 
-    public int NewsPageSize { get; set; } = 10;
+    public string? NewsUri { get; set; }
 
     GatewayOptions IOptions<GatewayOptions>.Value => this;
 

src/shared/gateway/Cryptography/Pbkdf2PasswordStrategy.cs renamed to src/server/gateway/Cryptography/Pbkdf2PasswordStrategy.cs

@@ -2,7 +2,6 @@
 using Arise.Server.Gateway.Controllers;
 using Arise.Server.Gateway.Email;
 using Arise.Server.Gateway.ModelBinding;
-using Arise.Server.Gateway.News;
 using Arise.Server.Gateway.RateLimiting;
 
 namespace Arise.Server.Gateway;
@@ -59,7 +58,6 @@ public static IServiceCollection AddGatewayServices(this IServiceCollection serv
                 opts.LowercaseQueryStrings = true;
             })
             .AddAriseServerGateway()
-            .AddHostedService(static provider => provider.GetRequiredService<NewsArticleProvider>())
             .AddHostedService(static provider => provider.GetRequiredService<EmailSender>());
     }
 }

src/server/gateway/GatewayOptions.cs

@@ -13,10 +13,6 @@
         <Using Include="Arise.Server.Storage.Documents" />
         <Using Include="EmailValidation" />
         <Using Include="Injectio.Attributes" />
-        <Using Include="Markdig" />
-        <Using Include="Markdig.Extensions.AutoIdentifiers" />
-        <Using Include="Markdig.Extensions.Yaml" />
-        <Using Include="Markdig.Syntax" />
         <Using Include="Marten" />
         <Using Include="Marten.Exceptions" />
         <Using Include="Microsoft.AspNetCore.Authentication" />
@@ -43,7 +39,6 @@
         <Using Include="SendGrid.Helpers.Errors.Model" />
         <Using Include="SendGrid.Helpers.Mail" />
         <Using Include="System.Threading.RateLimiting" />
-        <Using Include="YamlDotNet.RepresentationModel" />
     </ItemGroup>
 
     <ItemGroup>
@@ -54,33 +49,11 @@
     <ItemGroup>
         <PackageReference Include="Injectio"
                           PrivateAssets="all" />
-        <PackageReference Include="Markdig" />
         <PackageReference Include="Marten.AspNetCore" />
         <PackageReference Include="SendGrid" />
-        <PackageReference Include="YamlDotNet" />
     </ItemGroup>
 
     <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>
-
-    <Target Name="_AddNewsArticles"
-            BeforeTargets="AssignTargetPaths">
-        <MSBuild Projects="$(AriseVendorProjectPath)"
-                 Targets="GetNewsArticlesPath">
-            <Output TaskParameter="TargetOutputs"
-                    ItemName="AriseNewsArticlesPath" />
-        </MSBuild>
-
-        <PropertyGroup>
-            <_NewsArticlesPath>@(AriseNewsArticlesPath)</_NewsArticlesPath>
-        </PropertyGroup>
-
-        <ItemGroup>
-            <_NewsArticle Include="$(_NewsArticlesPath)/**" />
-            <Content Include="@(_NewsArticle)"
-                     Link="articles/%(RecursiveDir)%(Filename)%(Extension)"
-                     CopyToOutputDirectory="PreserveNewest" />
-        </ItemGroup>
-    </Target>
 </Project>

src/server/gateway/GatewayServiceCollectionExtensions.cs

@@ -6,8 +6,7 @@ namespace Arise.Gateway;
 [JsonSerializable(typeof(AccountsRecoverRequest))]
 [JsonSerializable(typeof(AccountsUpdateRequest))]
 [JsonSerializable(typeof(AccountsVerifyRequest))]
-[JsonSerializable(typeof(NewsListResponse))]
-[JsonSerializable(typeof(VersionCheckResponse))]
+[JsonSerializable(typeof(LauncherHelloResponse))]
 [JsonSourceGenerationOptions(WriteIndented = true)]
 internal sealed partial class GatewayJsonSerializerContext : JsonSerializerContext
 {

src/server/gateway/News/NewsArticle.cs

@@ -30,10 +30,6 @@ public abstract Task<IApiResponse> UpdateAccountAsync(
     [Patch("/Accounts/Recover")]
     public abstract Task<IApiResponse> RecoverAccountAsync([Body] AccountsRecoverRequest body);
 
-    [Delete("/Accounts/Delete")]
-    public abstract Task<IApiResponse> RecoverAccountAsync(
-        [Header(EmailHeader)] string email, [Header(PasswordHeader)] string password);
-
     [Patch("/Accounts/Delete")]
     public abstract Task<IApiResponse> DeleteAccountAsync(
         [Header(EmailHeader)] string email, [Header(PasswordHeader)] string password);
@@ -46,12 +42,6 @@ public abstract Task<IApiResponse> RestoreAccountAsync(
     public abstract Task<IApiResponse<AccountsAuthenticateResponse>> AuthenticateAccountAsync(
         [Header(EmailHeader)] string email, [Header(PasswordHeader)] string password);
 
-    [Get("/News/List")]
-    public abstract Task<IApiResponse<NewsListResponse>> ListNewsAsync([Body] NewsListRequest body);
-
-    [Get("/News/Get")]
-    public abstract Task<IApiResponse<NewsGetResponse>> GetNewsAsync([Body] NewsGetRequest body);
-
-    [Get("/Version/Check")]
-    public abstract Task<IApiResponse<VersionCheckResponse>> CheckVersionAsync();
+    [Get("/Launcher/Hello")]
+    public abstract Task<IApiResponse<LauncherHelloResponse>> LauncherHelloAsync();
 }

src/server/gateway/News/NewsArticleProvider.cs

@@ -1,7 +1,9 @@
 namespace Arise.Gateway;
 
-public sealed class VersionCheckResponse
+public sealed class LauncherHelloResponse
 {
+    public required Uri? NewsUri { get; init; }
+
     public required Uri TeraManifestUri { get; init; }
 
     public required Uri TeraDownloadFormat { get; init; }