From 8deaca7922e05256dc84e6b7a51d858dd896b2cf Mon Sep 17 00:00:00 2001 From: Wannes Gennar Date: Sat, 18 May 2024 19:41:50 +0200 Subject: [PATCH 1/2] fix ArrowHead numbers exceeding int32 mappings --- src/Helldivers-2-Models/ArrowHead/Assignment.cs | 2 +- src/Helldivers-2-Models/ArrowHead/Assignments/Reward.cs | 4 ++-- src/Helldivers-2-Models/ArrowHead/Assignments/Task.cs | 4 ++-- src/Helldivers-2-Models/ArrowHead/Status/Campaign.cs | 2 +- src/Helldivers-2-Models/V1/Assignment.cs | 2 +- src/Helldivers-2-Models/V1/Assignments/Reward.cs | 2 +- src/Helldivers-2-Models/V1/Assignments/Task.cs | 4 ++-- src/Helldivers-2-Models/V1/Campaign.cs | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Helldivers-2-Models/ArrowHead/Assignment.cs b/src/Helldivers-2-Models/ArrowHead/Assignment.cs index 6266884..6020e6d 100644 --- a/src/Helldivers-2-Models/ArrowHead/Assignment.cs +++ b/src/Helldivers-2-Models/ArrowHead/Assignment.cs @@ -11,7 +11,7 @@ namespace Helldivers.Models.ArrowHead; /// Contains detailed information on this assignment like briefing, rewards, ... public sealed record Assignment( long Id32, - List Progress, + List Progress, long ExpiresIn, Setting Setting ); diff --git a/src/Helldivers-2-Models/ArrowHead/Assignments/Reward.cs b/src/Helldivers-2-Models/ArrowHead/Assignments/Reward.cs index 6582855..c372462 100644 --- a/src/Helldivers-2-Models/ArrowHead/Assignments/Reward.cs +++ b/src/Helldivers-2-Models/ArrowHead/Assignments/Reward.cs @@ -8,6 +8,6 @@ /// The amount of the players will receive upon completion. public sealed record Reward( int Type, - int Id32, - int Amount + ulong Id32, + ulong Amount ); diff --git a/src/Helldivers-2-Models/ArrowHead/Assignments/Task.cs b/src/Helldivers-2-Models/ArrowHead/Assignments/Task.cs index 3713520..303bdf2 100644 --- a/src/Helldivers-2-Models/ArrowHead/Assignments/Task.cs +++ b/src/Helldivers-2-Models/ArrowHead/Assignments/Task.cs @@ -9,6 +9,6 @@ /// A list of numerical values, purpose unknown. public sealed record Task( int Type, - List Values, - List ValueTypes + List Values, + List ValueTypes ); diff --git a/src/Helldivers-2-Models/ArrowHead/Status/Campaign.cs b/src/Helldivers-2-Models/ArrowHead/Status/Campaign.cs index fb63048..d8dea8b 100644 --- a/src/Helldivers-2-Models/ArrowHead/Status/Campaign.cs +++ b/src/Helldivers-2-Models/ArrowHead/Status/Campaign.cs @@ -11,5 +11,5 @@ public sealed record Campaign( int Id, int PlanetIndex, int Type, - int Count + ulong Count ); diff --git a/src/Helldivers-2-Models/V1/Assignment.cs b/src/Helldivers-2-Models/V1/Assignment.cs index 22177d7..7c2f1ec 100644 --- a/src/Helldivers-2-Models/V1/Assignment.cs +++ b/src/Helldivers-2-Models/V1/Assignment.cs @@ -18,7 +18,7 @@ namespace Helldivers.Models.V1; /// The date when the assignment will expire. public sealed record Assignment( long Id, - List Progress, + List Progress, LocalizedMessage Title, LocalizedMessage Briefing, LocalizedMessage Description, diff --git a/src/Helldivers-2-Models/V1/Assignments/Reward.cs b/src/Helldivers-2-Models/V1/Assignments/Reward.cs index e0337da..45b4e62 100644 --- a/src/Helldivers-2-Models/V1/Assignments/Reward.cs +++ b/src/Helldivers-2-Models/V1/Assignments/Reward.cs @@ -7,5 +7,5 @@ /// The amount of that will be awarded. public sealed record Reward( int Type, // TODO: map to enum - int Amount + ulong Amount ); diff --git a/src/Helldivers-2-Models/V1/Assignments/Task.cs b/src/Helldivers-2-Models/V1/Assignments/Task.cs index eed61ce..c48bd25 100644 --- a/src/Helldivers-2-Models/V1/Assignments/Task.cs +++ b/src/Helldivers-2-Models/V1/Assignments/Task.cs @@ -9,6 +9,6 @@ /// A list of numbers, purpose unknown public sealed record Task( int Type, - List Values, - List ValueTypes + List Values, + List ValueTypes ); diff --git a/src/Helldivers-2-Models/V1/Campaign.cs b/src/Helldivers-2-Models/V1/Campaign.cs index 086da7a..d94c151 100644 --- a/src/Helldivers-2-Models/V1/Campaign.cs +++ b/src/Helldivers-2-Models/V1/Campaign.cs @@ -11,5 +11,5 @@ public record Campaign( int Id, Planet Planet, int Type, // TODO: map to enum - int Count + ulong Count ); From c5cb3a78b2d2929f3a35bc558d17965ab9ad0de5 Mon Sep 17 00:00:00 2001 From: Wannes Gennar Date: Sat, 18 May 2024 19:51:46 +0200 Subject: [PATCH 2/2] sneaking in a dev key fix --- src/Helldivers-2-API/Controllers/DevelopmentController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Helldivers-2-API/Controllers/DevelopmentController.cs b/src/Helldivers-2-API/Controllers/DevelopmentController.cs index a058e3e..c1f28db 100644 --- a/src/Helldivers-2-API/Controllers/DevelopmentController.cs +++ b/src/Helldivers-2-API/Controllers/DevelopmentController.cs @@ -25,6 +25,7 @@ public static IResult CreateToken([FromQuery] string name, [FromQuery] int limit audience: options.Value.Authentication.ValidAudiences.First(), claims: [ new Claim("sub", name), + new Claim(ClaimTypes.Name, name), new Claim("nbf", $"{DateTime.UtcNow.Subtract(DateTime.UnixEpoch).TotalSeconds:0}"), new Claim("iat", $"{DateTime.UtcNow.Subtract(DateTime.UnixEpoch).TotalSeconds:0}"), new Claim("exp", $"{DateTime.UtcNow.AddDays(30).Subtract(DateTime.UnixEpoch).TotalSeconds:0}"),