JastUsaLibrary: Fix JAST USA api integration not working due to changes in API #617

Author: darklinkpower

source/Library/JastUsaLibrary/Services/JastUsaIntegration/Infrastructure/DTOs/GetGamesResponse.cs

@@ -20,20 +20,32 @@ public class GetGamesResponse
         [JsonProperty("@type")]
         public string Type { get; set; }
 
-        [JsonProperty("hydra:member")]
-        public HydraMember[] HydraMember { get; set; }
+        [JsonProperty("products")]
+        public Product[] Products { get; set; }
 
-        [JsonProperty("hydra:totalItems")]
-        public int HydraTotalItems { get; set; }
+        [JsonProperty("total")]
+        public int Total { get; set; }
 
-        [JsonProperty("hydra:view")]
-        public HydraView HydraView { get; set; }
+        [JsonProperty("pages")]
+        public int Pages { get; set; }
+    }
+
+    public class Product
+    {
+        [JsonProperty("@id")]
+        public string Id { get; set; }
+
+        [JsonProperty("@type")]
+        public ProductType Type { get; set; }
+
+        [JsonProperty("variants")]
+        public Variant[] Variants { get; set; }
 
-        [JsonProperty("hydra:search")]
-        public HydraSearch HydraSearch { get; set; }
+        [JsonProperty("variant")]
+        public Variant Variant { get; set; }
     }
 
-    public class HydraMember
+    public class Variant
     {
         [JsonProperty("@id")]
         public string Id { get; set; }
@@ -66,7 +78,7 @@ public class HydraMember
         public int GameId { get; set; }
 
         [JsonProperty("userGameTags")]
-        public UserGameTags UserGameTags { get; set; }
+        public List<UserGameTag> UserGameTags { get; set; }
 
         [JsonProperty("hasPatches_en_US")]
         public bool HasPatchesEnUs { get; set; }
@@ -132,47 +144,22 @@ public class Platform
         public JastPlatforms ZhHant { get; set; }
     }
 
-    public class UserGameTags
+    public class UserGameTag
     {
-    }
-
-    public class HydraSearch
-    {
-        [JsonProperty("@type")]
-        public string Type { get; set; }
-
-        [JsonProperty("hydra:template")]
-        public string HydraTemplate { get; set; }
-
-        [JsonProperty("hydra:variableRepresentation")]
-        public string HydraVariableRepresentation { get; set; }
-
-        [JsonProperty("hydra:mapping")]
-        public HydraMapping[] HydraMapping { get; set; }
-    }
+        [JsonProperty("@id")]
+        public string Id { get; set; }
 
-    public class HydraMapping
-    {
         [JsonProperty("@type")]
-        public string Type { get; set; }
-
-        [JsonProperty("variable")]
-        public string Variable { get; set; }
+        public UserGameTagType Type { get; set; }
 
-        [JsonProperty("property")]
-        public string Property { get; set; }
-
-        [JsonProperty("required")]
-        public bool HydraMappingRequired { get; set; }
-    }
+        [JsonProperty("id")]
+        public long UserGameTagId { get; set; }
 
-    public class HydraView
-    {
-        [JsonProperty("@id")]
-        public string Id { get; set; }
+        [JsonProperty("locale", NullValueHandling = NullValueHandling.Ignore)]
+        public Locale? Locale { get; set; }
 
-        [JsonProperty("@type")]
-        public string Type { get; set; }
+        [JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
+        public string UserGameTagType { get; set; }
     }
 
     public enum Locale
@@ -191,6 +178,10 @@ public enum JastPlatforms { Linux, Mac, Windows };
 
     public enum HydraMemberType { ProductVariant };
 
+    public enum ProductType { Product };
+
+    public enum UserGameTagType { UserGameTag };
+
     internal static class Converter
     {
         public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings

source/Library/JastUsaLibrary/Services/JastUsaIntegration/Infrastructure/External/JastUrls.cs

@@ -16,7 +16,7 @@ public static class Api
             public static class Authentication
             {
                 private const string RouteBase = "shop/";
-                public static string AuthenticationToken => $"{BaseApiUrl}{RouteBase}authentication-token";
+                public static string AuthenticationToken => $"{BaseApiUrl}{RouteBase}customers/token";
                 public static string TokenRefresh(string refreshToken) => $"{BaseApiUrl}{RouteBase}authentication-refresh?refresh_token={refreshToken}";
             }
 

source/Library/JastUsaLibrary/Services/JastUsaIntegration/Infrastructure/External/JastUsaApiClient.cs

@@ -80,15 +80,15 @@ public async Task<GameTranslationsResponse> GetGameTranslationsAsync(Authenticat
             return result.IsSuccess ? Serialization.FromJson<GameTranslationsResponse>(result.Content) : null;
         }
 
-        public async Task<List<HydraMember>> GetProductsAsync(AuthenticationToken token, CancellationToken cancellationToken = default)
+        public async Task<List<Variant>> GetProductsAsync(AuthenticationToken token, CancellationToken cancellationToken = default)
         {
             var headers = new Dictionary<string, string>
             {
                 ["Authorization"] = $"Bearer {token.Token.UrlDecode()}",
                 ["Accept-Encoding"] = "utf-8"
             };
 
-            var products = new List<HydraMember>();
+            var products = new List<Variant>();
             var page = 1;
             while (true)
             {
@@ -105,13 +105,14 @@ public async Task<List<HydraMember>> GetProductsAsync(AuthenticationToken token,
                 }
 
                 var response = Serialization.FromJson<GetGamesResponse>(result.Content);
-                products.AddRange(response.HydraMember);
-                page++;
-
-                if (!response.HydraMember.Any())
+                var variants = response.Products?.Select(x => x.Variant).ToList();
+                products.AddRange(variants);
+                if (!variants.Any() || page == response.Pages)
                 {
                     break;
                 }
+
+                page++;
             }
 
             return products;