Merge pull request #17 from rtm516/revert-the-revert

TitleOS · web-flow · commit a18d08a8e51a · 2022-02-07T08:01:35.000-06:00
Remerge #16 with fixes to tests.
diff --git a/StoreLib/Models/FE3.cs b/StoreLib/Models/FE3.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Xml.XPath;
+using Newtonsoft.Json;
 
 namespace StoreLib.Models
{
@@ -11,14 +9,95 @@ public class PackageInstance
 public string PackageMoniker;
 public Uri PackageUri;
 public PackageType PackageType;
+ public ApplicabilityBlob ApplicabilityBlob;
+ public String UpdateId;
 
- public PackageInstance(string PackageMoniker, Uri PackageUri, PackageType packageType)
+ public PackageInstance(string PackageMoniker, Uri PackageUri, PackageType PackageType, ApplicabilityBlob ApplicabilityBlob, String UpdateId)
{
 this.PackageMoniker = PackageMoniker;
 this.PackageUri = PackageUri;
- this.PackageType = packageType;
+ this.PackageType = PackageType;
+ this.ApplicabilityBlob = ApplicabilityBlob;
+ this.UpdateId = UpdateId;
 }
+ }
+
+ // Root myDeserializedClass = JsonConvert.DeserializeObject<Root>(myJsonResponse); 
+ public class ContentTargetPlatform
+{
+ [JsonProperty("platform.maxVersionTested")]
+ public long PlatformMaxVersionTested{get; set}
+
+ [JsonProperty("platform.minVersion")]
+ public long PlatformMinVersion{get; set}
+
+ [JsonProperty("platform.target")]
+ public int PlatformTarget{get; set}
+ }
+
+ public class Policy
+{
+ [JsonProperty("category.first")]
+ public string CategoryFirst{get; set}
+
+ [JsonProperty("category.second")]
+ public string CategorySecond{get; set}
+
+ [JsonProperty("category.third")]
+ public string CategoryThird{get; set}
+
+ [JsonProperty("optOut.backupRestore")]
+ public bool OptOutBackupRestore{get; set}
+
+ [JsonProperty("optOut.removeableMedia")]
+ public bool OptOutRemoveableMedia{get; set}
+ }
+
+ public class ThirdPartyAppRating
+{
+ [JsonProperty("level")]
+ public int Level{get; set}
+
+ [JsonProperty("systemId")]
+ public int SystemId{get; set}
+ }
+
+ public class Policy2
+{
+ [JsonProperty("ageRating")]
+ public int AgeRating{get; set}
+
+ [JsonProperty("optOut.DVR")]
+ public bool OptOutDVR{get; set}
+
+ [JsonProperty("thirdPartyAppRatings")]
+ public List<ThirdPartyAppRating> ThirdPartyAppRatings{get; set}
+ }
+
+ public class ApplicabilityBlob
+{
+ [JsonProperty("blob.version")]
+ public long BlobVersion{get; set}
+
+ [JsonProperty("content.isMain")]
+ public bool ContentIsMain{get; set}
+
+ [JsonProperty("content.packageId")]
+ public string ContentPackageId{get; set}
+
+ [JsonProperty("content.productId")]
+ public string ContentProductId{get; set}
+
+ [JsonProperty("content.targetPlatforms")]
+ public List<ContentTargetPlatform> ContentTargetPlatforms{get; set}
+
+ [JsonProperty("content.type")]
+ public int ContentType{get; set}
+
+ [JsonProperty("policy")]
+ public Policy Policy{get; set}
 
- 
+ [JsonProperty("policy2")]
+ public Policy2 Policy2{get; set}
 }
 }
diff --git a/StoreLib/Services/DisplayCatalogHandler.cs b/StoreLib/Services/DisplayCatalogHandler.cs
@@ -43,18 +43,20 @@ public static DisplayCatalogHandler ProductionConfig()
 /// Returns an IList of Uris containing the direct download links for the product's apps and dependacies. (if it has any). 
 /// </summary>
 /// <returns>IList of Direct File URLs</returns>
- public async Task<IList<PackageInstance>> GetPackagesForProductAsync()
+ public async Task<IList<PackageInstance>> GetPackagesForProductAsync(string MSAToken = null)
{
- string xml = await FE3Handler.SyncUpdatesAsync(ProductListing.Product.DisplaySkuAvailabilities[0].Sku.Properties.FulfillmentData.WuCategoryId);
+ string xml = await FE3Handler.SyncUpdatesAsync(ProductListing.Product.DisplaySkuAvailabilities[0].Sku.Properties.FulfillmentData.WuCategoryId, MSAToken);
 IList<string> RevisionIDs;
 IList<string> PackageNames;
 IList<string> UpdateIDs;
 FE3Handler.ProcessUpdateIDs(xml, out RevisionIDs, out PackageNames, out UpdateIDs);
- IList<PackageInstance> PackageInstances = await FE3Handler.GetPackageInstancesAsync(ProductListing.Product.DisplaySkuAvailabilities[0].Sku.Properties.FulfillmentData.WuCategoryId);
- IList<Uri> Files = await FE3Handler.GetFileUrlsAsync(UpdateIDs, RevisionIDs);
+ IList<PackageInstance> PackageInstances = await FE3Handler.GetPackageInstancesAsync(xml);
+ IList<Uri> Files = await FE3Handler.GetFileUrlsAsync(UpdateIDs, RevisionIDs, MSAToken);
 foreach(PackageInstance package in PackageInstances)
{
- package.PackageUri = Files[PackageInstances.IndexOf(package)];
+ int id = PackageInstances.IndexOf(package);
+ package.PackageUri = Files[id];
+ package.UpdateId = UpdateIDs[id];
 }
 return PackageInstances;
 }
diff --git a/StoreLib/Services/FE3Handler.cs b/StoreLib/Services/FE3Handler.cs
@@ -10,22 +10,24 @@
 using System.Threading.Tasks;
 using System.Web;
 using System.Xml;
+using Newtonsoft.Json;
 
 
 namespace StoreLib.Services
{
 public static class FE3Handler
{
 private static readonly MSHttpClient _httpClient = new MSHttpClient();
+ private static readonly String _msaToken = "<Device>dAA9AEUAdwBBAHcAQQBzAE4AMwBCAEEAQQBVADEAYgB5AHMAZQBtAGIAZQBEAFYAQwArADMAZgBtADcAbwBXAHkASAA3AGIAbgBnAEcAWQBtAEEAQQBMAGoAbQBqAFYAVQB2AFEAYwA0AEsAVwBFAC8AYwBDAEwANQBYAGUANABnAHYAWABkAGkAegBHAGwAZABjADEAZAAvAFcAeQAvAHgASgBQAG4AVwBRAGUAYwBtAHYAbwBjAGkAZwA5AGoAZABwAE4AawBIAG0AYQBzAHAAVABKAEwARAArAFAAYwBBAFgAbQAvAFQAcAA3AEgAagBzAEYANAA0AEgAdABsAC8AMQBtAHUAcgAwAFMAdQBtAG8AMABZAGEAdgBqAFIANwArADQAcABoAC8AcwA4ADEANgBFAFkANQBNAFIAbQBnAFIAQwA2ADMAQwBSAEoAQQBVAHYAZgBzADQAaQB2AHgAYwB5AEwAbAA2AHoAOABlAHgAMABrAFgAOQBPAHcAYQB0ADEAdQBwAFMAOAAxAEgANgA4AEEASABzAEoAegBnAFQAQQBMAG8AbgBBADIAWQBBAEEAQQBpAGcANQBJADMAUQAvAFYASABLAHcANABBAEIAcQA5AFMAcQBhADEAQgA4AGsAVQAxAGEAbwBLAEEAdQA0AHYAbABWAG4AdwBWADMAUQB6AHMATgBtAEQAaQBqAGgANQBkAEcAcgBpADgAQQBlAEUARQBWAEcAbQBXAGgASQBCAE0AUAAyAEQAVwA0ADMAZABWAGkARABUAHoAVQB0AHQARQBMAEgAaABSAGYAcgBhAGIAWgBsAHQAQQBUAEUATABmAHMARQBGAFUAYQBRAFMASgB4ADUAeQBRADgAagBaAEUAZQAyAHgANABCADMAMQB2AEIAMgBqAC8AUgBLAGEAWQAvAHEAeQB0AHoANwBUAHYAdAB3AHQAagBzADYAUQBYAEIAZQA4AHMAZwBJAG8AOQBiADUAQQBCADcAOAAxAHMANgAvAGQAUwBFAHgATgBEAEQAYQBRAHoAQQBYAFAAWABCAFkAdQBYAFEARQBzAE8AegA4AHQAcgBpAGUATQBiAEIAZQBUAFkAOQBiAG8AQgBOAE8AaQBVADcATgBSAEYAOQAzAG8AVgArAFYAQQBiAGgAcAAwAHAAUgBQAFMAZQBmAEcARwBPAHEAdwBTAGcANwA3AHMAaAA5AEoASABNAHAARABNAFMAbgBrAHEAcgAyAGYARgBpAEMAUABrAHcAVgBvAHgANgBuAG4AeABGAEQAbwBXAC8AYQAxAHQAYQBaAHcAegB5AGwATABMADEAMgB3AHUAYgBtADUAdQBtAHAAcQB5AFcAYwBLAFIAagB5AGgAMgBKAFQARgBKAFcANQBnAFgARQBJADUAcAA4ADAARwB1ADIAbgB4AEwAUgBOAHcAaQB3AHIANwBXAE0AUgBBAFYASwBGAFcATQBlAFIAegBsADkAVQBxAGcALwBwAFgALwB2AGUATAB3AFMAawAyAFMAUwBIAGYAYQBLADYAagBhAG8AWQB1AG4AUgBHAHIAOABtAGIARQBvAEgAbABGADYASgBDAGEAYQBUAEIAWABCAGMAdgB1AGUAQwBKAG8AOQA4AGgAUgBBAHIARwB3ADQAKwBQAEgAZQBUAGIATgBTAEUAWABYAHoAdgBaADYAdQBXADUARQBBAGYAZABaAG0AUwA4ADgAVgBKAGMAWgBhAEYASwA3AHgAeABnADAAdwBvAG4ANwBoADAAeABDADYAWgBCADAAYwBZAGoATAByAC8ARwBlAE8AegA5AEcANABRAFUASAA5AEUAawB5ADAAZAB5AEYALwByAGUAVQAxAEkAeQBpAGEAcABwAGgATwBQADgAUwAyAHQANABCAHIAUABaAFgAVAB2AEMAMABQADcAegBPACsAZgBHAGsAeABWAG0AKwBVAGYAWgBiAFEANQA1AHMAdwBFAD0AJgBwAD0A</Device>";
 
 /// <summary>
 /// Returns raw xml containing various (Revision, Update, Package) IDs and info.
 /// </summary>
 /// <param name="WuCategoryID"></param>
 /// <returns></returns>
- public static async Task<string> SyncUpdatesAsync(string WuCategoryID)
+ public static async Task<string> SyncUpdatesAsync(string WuCategoryID, string MSAToken = null)
{
- HttpContent httpContent = new StringContent(String.Format(GetResourceTextFile("WUIDRequest.xml"), await GetCookieAsync(), WuCategoryID), Encoding.UTF8, "application/soap+xml"); //Load in the Xml for this FE3 request and format it a cookie and the provided WuCategoryID.
+ HttpContent httpContent = new StringContent(String.Format(GetResourceTextFile("WUIDRequest.xml"), await GetCookieAsync(), WuCategoryID, MSAToken ?? _msaToken), Encoding.UTF8, "application/soap+xml"); //Load in the Xml for this FE3 request and format it a cookie and the provided WuCategoryID.
 HttpRequestMessage httpRequest = new HttpRequestMessage();
 httpRequest.RequestUri = Endpoints.FE3Delivery;
 httpRequest.Content = httpContent;
@@ -36,29 +38,32 @@ public static async Task<string> SyncUpdatesAsync(string WuCategoryID)
 return content;
 }
 
- public static async Task<IList<PackageInstance>> GetPackageInstancesAsync(string WuCategoryID)
+ public static async Task<IList<PackageInstance>> GetPackageInstancesAsync(string WuCategoryID, string MSAToken)
{
- IList<PackageInstance> PackageInstances = new List<PackageInstance>();
- HttpContent httpContent = new StringContent(String.Format(GetResourceTextFile("WUIDRequest.xml"), await GetCookieAsync(), WuCategoryID), Encoding.UTF8, "application/soap+xml"); //Load in the Xml for this FE3 request and format it a cookie and the provided WuCategoryID.
+ HttpContent httpContent = new StringContent(String.Format(GetResourceTextFile("WUIDRequest.xml"), await GetCookieAsync(), WuCategoryID, MSAToken ?? _msaToken), Encoding.UTF8, "application/soap+xml"); //Load in the Xml for this FE3 request and format it a cookie and the provided WuCategoryID.
 HttpRequestMessage httpRequest = new HttpRequestMessage();
 httpRequest.RequestUri = Endpoints.FE3Delivery;
 httpRequest.Content = httpContent;
 httpRequest.Method = HttpMethod.Post;
 HttpResponseMessage httpResponse = await _httpClient.SendAsync(httpRequest, new System.Threading.CancellationToken());
 string content = await httpResponse.Content.ReadAsStringAsync();
 content = HttpUtility.HtmlDecode(content);
+ return await GetPackageInstancesAsync(content);
+ }
+
+ public static async Task<IList<PackageInstance>> GetPackageInstancesAsync(string content)
+{
+ IList<PackageInstance> PackageInstances = new List<PackageInstance>();
 XmlDocument doc = new XmlDocument();
 doc.LoadXml(content);
 XmlNodeList nodes = doc.GetElementsByTagName("AppxMetadata");
 foreach(XmlNode node in nodes)
{
 if(node.Attributes.Count >= 3)
{
- PackageInstance package = new PackageInstance(node.Attributes.GetNamedItem("PackageMoniker").Value, new Uri("http://test.com"), Utilities.TypeHelpers.StringToPackageType(node.Attributes.GetNamedItem("PackageType").Value));
+ PackageInstance package = new PackageInstance(node.Attributes.GetNamedItem("PackageMoniker").Value, new Uri("http://test.com"), Utilities.TypeHelpers.StringToPackageType(node.Attributes.GetNamedItem("PackageType").Value), JsonConvert.DeserializeObject<ApplicabilityBlob>(node.FirstChild.InnerText), "");
 PackageInstances.Add(package);
 }
- 
-
 }
 return PackageInstances;
 
@@ -111,13 +116,13 @@ public static void ProcessUpdateIDs(string Xml, out IList<string> RevisionIDs, o
 /// <param name="UpdateIDs"></param>
 /// <param name="RevisionIDs"></param>
 /// <returns>IList of App Package Download Uris</returns>
- public static async Task<IList<Uri>> GetFileUrlsAsync(IList<string> UpdateIDs, IList<string> RevisionIDs)
+ public static async Task<IList<Uri>> GetFileUrlsAsync(IList<string> UpdateIDs, IList<string> RevisionIDs, string MSAToken = null)
{
 XmlDocument doc = new XmlDocument();
 IList<Uri> uris = new List<Uri>();
 foreach (string ID in UpdateIDs)
{
- HttpContent httpContent = new StringContent(String.Format(GetResourceTextFile("FE3FileUrl.xml"), ID, RevisionIDs[UpdateIDs.IndexOf(ID)]), Encoding.UTF8, "application/soap+xml");//Loading the request xml from a file to keep things nice and tidy.
+ HttpContent httpContent = new StringContent(String.Format(GetResourceTextFile("FE3FileUrl.xml"), ID, RevisionIDs[UpdateIDs.IndexOf(ID)], MSAToken ?? _msaToken), Encoding.UTF8, "application/soap+xml");//Loading the request xml from a file to keep things nice and tidy.
 HttpRequestMessage httpRequest = new HttpRequestMessage();
 httpRequest.RequestUri = Endpoints.FE3DeliverySecured;
 httpRequest.Content = httpContent;
diff --git a/StoreLib/Xml/FE3FileUrl.xml b/StoreLib/Xml/FE3FileUrl.xml
@@ -16,7 +16,7 @@
 				xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
 				xmlns:wuws="http://schemas.microsoft.com/msus/2014/10/WindowsUpdateAuthorization">
 <TicketType Name="MSA" Version="1.0" Policy="MBI_SSL">
- <Device>dAA9AEUAdwBBAHcAQQBzAE4AMwBCAEEAQQBVADEAYgB5AHMAZQBtAGIAZQBEAFYAQwArADMAZgBtADcAbwBXAHkASAA3AGIAbgBnAEcAWQBtAEEAQQBQAHoANQBoAFoAaQBtAGYAYwA1AE0AbgBVADMAYwAvADQARgAyAEwAawBFAFkAKwAwADkAMABhAEwAUgBOAEYAUwBTAE0AeQB3AGsAZAAyAC8ARQBZADMAWQB1AFUAeQBzACsAWABDAFIARQBoAEUAUwA3AGcAeQBBAGgAawByAGUAZQBHAHUAOABSAG4AYwBWAEYAVgBiAFUAUgBYAE0AWgBMAEMATQBWAEcARABTAFYANgB2ADMAeQBJAE0AYwBXAEwARgBUAC8ATgBuAE4ATgBRAE0ARgArAHAAWgBuAHYAZABaADAAcwBOAGwAMABwAEEARAA4AHMAMgBDAGgAcgBiAE0AZQBoAGsATwB2AEEATgA0AHUATwAyAFUAVgAwAFcAagBLAG8ARABPAEsAagBJAHkAMABXAE4AMQBnAGUASABwAC8AVwBhAEwANABTAFkAVwBBADIAWQBBAEEAQQBqAFEAZwA5AGwAUQAwAFoATwA3AEMAWQBBAEIAagAyAHgAZwB0AFQATQBuAFUAdgBkAHQAYQBOAE0AbwBxAG4AYwB3AFUATABEAHIAQQBhAG0ATQA0ADMAKwBwAGEAMwA3AG4ANgBTAEsARwBBAHYAdwB1AEwAaQAzAEQAZAB4AEcAVAAvAFEAaQAzAEYAZQBTAEUAcgA3AGkANwBiAG8ANwBoAFUAKwB2AGkASQBtAHEAVABRAG4AKwA2AEQAMgB0AEUAZgBHAGMAZQBaADgAUgB1AGoAdAAzAFIAVQBkAHIAQwB5AC8ASgBOAFIAZwBRAGcATABWAHcANABGAEwAOQB6AEsAMwBMAE8AKwBTAHoARgA0AFQAQgBuADYAbwB6AEIAcABJAHQAYgBZAHAARwAxAE8ASwBtAEoAdwBDAHIANwBqAGEAUAA2AGoASwBlAGYAbQA3AFQASQBlAEQAegBOADIAcQBMAHUAMwB5AFIAOABIAE4ANABPAFMAeABWAGsATQA4AGIANgBkAEwAVgB6AHQANwBhAEYAdABsADIANABEAFcAUwB2AG0AVwBMAG8AKwArADMAbwA0ACsASQBGAHcAagBlAHYATABuADgAYgBjAGoARwBTAEEARgBlAFAAYQBtADUAcAA0ADQANQBlAEcAegBQAFAANABiAFMASAB2AEsAbwBQAFEASwBFAG4AUQBwAEoATQBKAFIAZAA4AEcAZgBNAG4AOQA1ADgAZgBtADYALwBzADcANgBYAHEAMgBSAGUAQQBIAGUAcwBvAHoAWQBOAHYAVABlADYAQQAvAHAATgBnAFoAWQAzAGkAYgAzAEcAaABuAFYAWgBUAGcAdAA1AG4AOQBWAGoAbABwAEMAawBZAHMAOAA1AGEAbQBSADcAdQAwAGgAZAByADkALwBYAEsANgBxAGkATQBFAC8ASwAwAEQAWgBnAEEASQBSAEYAUgBuAE4AQQAxAEUAZgB4AGcARABNAEIAWgBoAFUAbgBqAHgAMABwAHcANgBPAHgAYgB3AHgAMQA5AEgAcABIAE4AOAB0ACsAQgBoAC8AVABvAE0AVABKAHoANQAvAG8AcgBzAFcATwBDAGQARgB1AHIARAAzAHUAbABWAHQAMAB1AGkAegBHAE4AVABQAEkARABsAGkAcgBkAFUAbQBFAGkAbQA4AFMAdQAyAEMANQBuAHoAbwB1AGMARQBpAGIAZgBmAGYAWAA2AFIATwBMAHcATABsAFIAYwBoAFIAMABhAFkAWQA2AEIANgB2AEEAVgB4AHYAbgA5ADMATQBNAEwAawBaAEcAYQBQACsAdQBHACsAWgA1AEoALwBqAFAANwBWAC8ASwB1AFgAOQB4ADkAUABvADUAVABmAEkATwAxAHMAdwBFAD0AJgBwAD0A</Device>
+{2}
 </TicketType>
 </wuws:WindowsUpdateTicketsToken>
 </o:Security>
diff --git a/StoreLib/Xml/WUIDRequest.xml b/StoreLib/Xml/WUIDRequest.xml
@@ -16,7 +16,7 @@
 				xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
 				xmlns:wuws="http://schemas.microsoft.com/msus/2014/10/WindowsUpdateAuthorization">
 				<TicketType Name="MSA" Version="1.0" Policy="MBI_SSL">
-					<Device>dAA9AEUAdwBBAHcAQQBzAE4AMwBCAEEAQQBVADEAYgB5AHMAZQBtAGIAZQBEAFYAQwArADMAZgBtADcAbwBXAHkASAA3AGIAbgBnAEcAWQBtAEEAQQBMAGoAbQBqAFYAVQB2AFEAYwA0AEsAVwBFAC8AYwBDAEwANQBYAGUANABnAHYAWABkAGkAegBHAGwAZABjADEAZAAvAFcAeQAvAHgASgBQAG4AVwBRAGUAYwBtAHYAbwBjAGkAZwA5AGoAZABwAE4AawBIAG0AYQBzAHAAVABKAEwARAArAFAAYwBBAFgAbQAvAFQAcAA3AEgAagBzAEYANAA0AEgAdABsAC8AMQBtAHUAcgAwAFMAdQBtAG8AMABZAGEAdgBqAFIANwArADQAcABoAC8AcwA4ADEANgBFAFkANQBNAFIAbQBnAFIAQwA2ADMAQwBSAEoAQQBVAHYAZgBzADQAaQB2AHgAYwB5AEwAbAA2AHoAOABlAHgAMABrAFgAOQBPAHcAYQB0ADEAdQBwAFMAOAAxAEgANgA4AEEASABzAEoAegBnAFQAQQBMAG8AbgBBADIAWQBBAEEAQQBpAGcANQBJADMAUQAvAFYASABLAHcANABBAEIAcQA5AFMAcQBhADEAQgA4AGsAVQAxAGEAbwBLAEEAdQA0AHYAbABWAG4AdwBWADMAUQB6AHMATgBtAEQAaQBqAGgANQBkAEcAcgBpADgAQQBlAEUARQBWAEcAbQBXAGgASQBCAE0AUAAyAEQAVwA0ADMAZABWAGkARABUAHoAVQB0AHQARQBMAEgAaABSAGYAcgBhAGIAWgBsAHQAQQBUAEUATABmAHMARQBGAFUAYQBRAFMASgB4ADUAeQBRADgAagBaAEUAZQAyAHgANABCADMAMQB2AEIAMgBqAC8AUgBLAGEAWQAvAHEAeQB0AHoANwBUAHYAdAB3AHQAagBzADYAUQBYAEIAZQA4AHMAZwBJAG8AOQBiADUAQQBCADcAOAAxAHMANgAvAGQAUwBFAHgATgBEAEQAYQBRAHoAQQBYAFAAWABCAFkAdQBYAFEARQBzAE8AegA4AHQAcgBpAGUATQBiAEIAZQBUAFkAOQBiAG8AQgBOAE8AaQBVADcATgBSAEYAOQAzAG8AVgArAFYAQQBiAGgAcAAwAHAAUgBQAFMAZQBmAEcARwBPAHEAdwBTAGcANwA3AHMAaAA5AEoASABNAHAARABNAFMAbgBrAHEAcgAyAGYARgBpAEMAUABrAHcAVgBvAHgANgBuAG4AeABGAEQAbwBXAC8AYQAxAHQAYQBaAHcAegB5AGwATABMADEAMgB3AHUAYgBtADUAdQBtAHAAcQB5AFcAYwBLAFIAagB5AGgAMgBKAFQARgBKAFcANQBnAFgARQBJADUAcAA4ADAARwB1ADIAbgB4AEwAUgBOAHcAaQB3AHIANwBXAE0AUgBBAFYASwBGAFcATQBlAFIAegBsADkAVQBxAGcALwBwAFgALwB2AGUATAB3AFMAawAyAFMAUwBIAGYAYQBLADYAagBhAG8AWQB1AG4AUgBHAHIAOABtAGIARQBvAEgAbABGADYASgBDAGEAYQBUAEIAWABCAGMAdgB1AGUAQwBKAG8AOQA4AGgAUgBBAHIARwB3ADQAKwBQAEgAZQBUAGIATgBTAEUAWABYAHoAdgBaADYAdQBXADUARQBBAGYAZABaAG0AUwA4ADgAVgBKAGMAWgBhAEYASwA3AHgAeABnADAAdwBvAG4ANwBoADAAeABDADYAWgBCADAAYwBZAGoATAByAC8ARwBlAE8AegA5AEcANABRAFUASAA5AEUAawB5ADAAZAB5AEYALwByAGUAVQAxAEkAeQBpAGEAcABwAGgATwBQADgAUwAyAHQANABCAHIAUABaAFgAVAB2AEMAMABQADcAegBPACsAZgBHAGsAeABWAG0AKwBVAGYAWgBiAFEANQA1AHMAdwBFAD0AJgBwAD0A</Device>
+					{2}
 				</TicketType>
 			</wuws:WindowsUpdateTicketsToken>
 		</o:Security>
@@ -39,6 +39,7 @@
 					<int>544</int>
 					<int>549</int>
 					<int>2359974</int>
+					<int>2359977</int>
 					<int>5169044</int>
 					<int>8788830</int>
 					<int>23110993</int>
@@ -69,6 +70,7 @@
 					<int>130040031</int>
 					<int>132387090</int>
 					<int>132393049</int>
+					<int>133399034</int>
 					<int>138537048</int>
 					<int>140377312</int>
 					<int>143747671</int>

-Original file line number
+Diff line change
@@ @@ -1,8 +1,6 @@ @@
 usingSystem;
 usingSystem.Collections.Generic;
 -usingSystem.IO;
 -usingSystem.Text;
 -usingSystem.Xml.XPath;
 +usingNewtonsoft.Json;
 namespaceStoreLib.Models
+{
 publicstringPackageMoniker;
 publicUriPackageUri;
 publicPackageTypePackageType;
 +publicApplicabilityBlobApplicabilityBlob;
 +publicStringUpdateId;
 -publicPackageInstance(stringPackageMoniker,UriPackageUri,PackageTypepackageType)
 +publicPackageInstance(stringPackageMoniker,UriPackageUri,PackageTypePackageType,ApplicabilityBlobApplicabilityBlob,StringUpdateId)
+{
 this.PackageMoniker=PackageMoniker;
 this.PackageUri=PackageUri;
 -this.PackageType=packageType;
 +this.PackageType=PackageType;
 +this.ApplicabilityBlob=ApplicabilityBlob;
 +this.UpdateId=UpdateId;
+}
 +}
++
 +// Root myDeserializedClass = JsonConvert.DeserializeObject<Root>(myJsonResponse);
 +publicclassContentTargetPlatform
 +{
 +[JsonProperty("platform.maxVersionTested")]
 +publiclongPlatformMaxVersionTested{get;set;}
++
 +[JsonProperty("platform.minVersion")]
 +publiclongPlatformMinVersion{get;set;}
++
 +[JsonProperty("platform.target")]
 +publicintPlatformTarget{get;set;}
 +}
++
 +publicclassPolicy
 +{
 +[JsonProperty("category.first")]
 +publicstringCategoryFirst{get;set;}
++
 +[JsonProperty("category.second")]
 +publicstringCategorySecond{get;set;}
++
 +[JsonProperty("category.third")]
 +publicstringCategoryThird{get;set;}
++
 +[JsonProperty("optOut.backupRestore")]
 +publicboolOptOutBackupRestore{get;set;}
++
 +[JsonProperty("optOut.removeableMedia")]
 +publicboolOptOutRemoveableMedia{get;set;}
 +}
++
 +publicclassThirdPartyAppRating
 +{
 +[JsonProperty("level")]
 +publicintLevel{get;set;}
++
 +[JsonProperty("systemId")]
 +publicintSystemId{get;set;}
 +}
++
 +publicclassPolicy2
 +{
 +[JsonProperty("ageRating")]
 +publicintAgeRating{get;set;}
++
 +[JsonProperty("optOut.DVR")]
 +publicboolOptOutDVR{get;set;}
++
 +[JsonProperty("thirdPartyAppRatings")]
 +publicList<ThirdPartyAppRating>ThirdPartyAppRatings{get;set;}
 +}
++
 +publicclassApplicabilityBlob
 +{
 +[JsonProperty("blob.version")]
 +publiclongBlobVersion{get;set;}
++
 +[JsonProperty("content.isMain")]
 +publicboolContentIsMain{get;set;}
++
 +[JsonProperty("content.packageId")]
 +publicstringContentPackageId{get;set;}
++
 +[JsonProperty("content.productId")]
 +publicstringContentProductId{get;set;}
++
 +[JsonProperty("content.targetPlatforms")]
 +publicList<ContentTargetPlatform>ContentTargetPlatforms{get;set;}
++
 +[JsonProperty("content.type")]
 +publicintContentType{get;set;}
++
 +[JsonProperty("policy")]
 +publicPolicyPolicy{get;set;}
+-
 +[JsonProperty("policy2")]
 +publicPolicy2Policy2{get;set;}
+}
+}
-Original file line number
+Diff line change
 /// Returns an IList of Uris containing the direct download links for the product's apps and dependacies. (if it has any).
 /// </summary>
 /// <returns>IList of Direct File URLs</returns>
 -publicasyncTask<IList<PackageInstance>>GetPackagesForProductAsync()
 +publicasyncTask<IList<PackageInstance>>GetPackagesForProductAsync(stringMSAToken=null)
+{
 -stringxml=awaitFE3Handler.SyncUpdatesAsync(ProductListing.Product.DisplaySkuAvailabilities[0].Sku.Properties.FulfillmentData.WuCategoryId);
 +stringxml=awaitFE3Handler.SyncUpdatesAsync(ProductListing.Product.DisplaySkuAvailabilities[0].Sku.Properties.FulfillmentData.WuCategoryId,MSAToken);
 IList<string>RevisionIDs;
 IList<string>PackageNames;
 IList<string>UpdateIDs;
 FE3Handler.ProcessUpdateIDs(xml,outRevisionIDs,outPackageNames,outUpdateIDs);
 -IList<PackageInstance>PackageInstances=awaitFE3Handler.GetPackageInstancesAsync(ProductListing.Product.DisplaySkuAvailabilities[0].Sku.Properties.FulfillmentData.WuCategoryId);
 -IList<Uri>Files=awaitFE3Handler.GetFileUrlsAsync(UpdateIDs,RevisionIDs);
 +IList<PackageInstance>PackageInstances=awaitFE3Handler.GetPackageInstancesAsync(xml);
 +IList<Uri>Files=awaitFE3Handler.GetFileUrlsAsync(UpdateIDs,RevisionIDs,MSAToken);
 foreach(PackageInstancepackageinPackageInstances)
+{
 -package.PackageUri=Files[PackageInstances.IndexOf(package)];
 +intid=PackageInstances.IndexOf(package);
 +package.PackageUri=Files[id];
 +package.UpdateId=UpdateIDs[id];
+}
 returnPackageInstances;
+}
-Original file line number
+Diff line change
 usingSystem.Threading.Tasks;
 usingSystem.Web;
 usingSystem.Xml;
 +usingNewtonsoft.Json;
 namespaceStoreLib.Services
+{
 publicstaticclassFE3Handler
+{
 privatestaticreadonlyMSHttpClient_httpClient=newMSHttpClient();
 +privatestaticreadonlyString_msaToken="<Device>dAA9AEUAdwBBAHcAQQBzAE4AMwBCAEEAQQBVADEAYgB5AHMAZQBtAGIAZQBEAFYAQwArADMAZgBtADcAbwBXAHkASAA3AGIAbgBnAEcAWQBtAEEAQQBMAGoAbQBqAFYAVQB2AFEAYwA0AEsAVwBFAC8AYwBDAEwANQBYAGUANABnAHYAWABkAGkAegBHAGwAZABjADEAZAAvAFcAeQAvAHgASgBQAG4AVwBRAGUAYwBtAHYAbwBjAGkAZwA5AGoAZABwAE4AawBIAG0AYQBzAHAAVABKAEwARAArAFAAYwBBAFgAbQAvAFQAcAA3AEgAagBzAEYANAA0AEgAdABsAC8AMQBtAHUAcgAwAFMAdQBtAG8AMABZAGEAdgBqAFIANwArADQAcABoAC8AcwA4ADEANgBFAFkANQBNAFIAbQBnAFIAQwA2ADMAQwBSAEoAQQBVAHYAZgBzADQAaQB2AHgAYwB5AEwAbAA2AHoAOABlAHgAMABrAFgAOQBPAHcAYQB0ADEAdQBwAFMAOAAxAEgANgA4AEEASABzAEoAegBnAFQAQQBMAG8AbgBBADIAWQBBAEEAQQBpAGcANQBJADMAUQAvAFYASABLAHcANABBAEIAcQA5AFMAcQBhADEAQgA4AGsAVQAxAGEAbwBLAEEAdQA0AHYAbABWAG4AdwBWADMAUQB6AHMATgBtAEQAaQBqAGgANQBkAEcAcgBpADgAQQBlAEUARQBWAEcAbQBXAGgASQBCAE0AUAAyAEQAVwA0ADMAZABWAGkARABUAHoAVQB0AHQARQBMAEgAaABSAGYAcgBhAGIAWgBsAHQAQQBUAEUATABmAHMARQBGAFUAYQBRAFMASgB4ADUAeQBRADgAagBaAEUAZQAyAHgANABCADMAMQB2AEIAMgBqAC8AUgBLAGEAWQAvAHEAeQB0AHoANwBUAHYAdAB3AHQAagBzADYAUQBYAEIAZQA4AHMAZwBJAG8AOQBiADUAQQBCADcAOAAxAHMANgAvAGQAUwBFAHgATgBEAEQAYQBRAHoAQQBYAFAAWABCAFkAdQBYAFEARQBzAE8AegA4AHQAcgBpAGUATQBiAEIAZQBUAFkAOQBiAG8AQgBOAE8AaQBVADcATgBSAEYAOQAzAG8AVgArAFYAQQBiAGgAcAAwAHAAUgBQAFMAZQBmAEcARwBPAHEAdwBTAGcANwA3AHMAaAA5AEoASABNAHAARABNAFMAbgBrAHEAcgAyAGYARgBpAEMAUABrAHcAVgBvAHgANgBuAG4AeABGAEQAbwBXAC8AYQAxAHQAYQBaAHcAegB5AGwATABMADEAMgB3AHUAYgBtADUAdQBtAHAAcQB5AFcAYwBLAFIAagB5AGgAMgBKAFQARgBKAFcANQBnAFgARQBJADUAcAA4ADAARwB1ADIAbgB4AEwAUgBOAHcAaQB3AHIANwBXAE0AUgBBAFYASwBGAFcATQBlAFIAegBsADkAVQBxAGcALwBwAFgALwB2AGUATAB3AFMAawAyAFMAUwBIAGYAYQBLADYAagBhAG8AWQB1AG4AUgBHAHIAOABtAGIARQBvAEgAbABGADYASgBDAGEAYQBUAEIAWABCAGMAdgB1AGUAQwBKAG8AOQA4AGgAUgBBAHIARwB3ADQAKwBQAEgAZQBUAGIATgBTAEUAWABYAHoAdgBaADYAdQBXADUARQBBAGYAZABaAG0AUwA4ADgAVgBKAGMAWgBhAEYASwA3AHgAeABnADAAdwBvAG4ANwBoADAAeABDADYAWgBCADAAYwBZAGoATAByAC8ARwBlAE8AegA5AEcANABRAFUASAA5AEUAawB5ADAAZAB5AEYALwByAGUAVQAxAEkAeQBpAGEAcABwAGgATwBQADgAUwAyAHQANABCAHIAUABaAFgAVAB2AEMAMABQADcAegBPACsAZgBHAGsAeABWAG0AKwBVAGYAWgBiAFEANQA1AHMAdwBFAD0AJgBwAD0A</Device>";
 /// <summary>
 /// Returns raw xml containing various (Revision, Update, Package) IDs and info.
 /// </summary>
 /// <param name="WuCategoryID"></param>
 /// <returns></returns>
 -publicstaticasyncTask<string>SyncUpdatesAsync(stringWuCategoryID)
 +publicstaticasyncTask<string>SyncUpdatesAsync(stringWuCategoryID,stringMSAToken=null)
+{
 -HttpContenthttpContent=newStringContent(String.Format(GetResourceTextFile("WUIDRequest.xml"),awaitGetCookieAsync(),WuCategoryID),Encoding.UTF8,"application/soap+xml");//Load in the Xml for this FE3 request and format it a cookie and the provided WuCategoryID.
 +HttpContenthttpContent=newStringContent(String.Format(GetResourceTextFile("WUIDRequest.xml"),awaitGetCookieAsync(),WuCategoryID,MSAToken??_msaToken),Encoding.UTF8,"application/soap+xml");//Load in the Xml for this FE3 request and format it a cookie and the provided WuCategoryID.
 HttpRequestMessagehttpRequest=newHttpRequestMessage();
 httpRequest.RequestUri=Endpoints.FE3Delivery;
 httpRequest.Content=httpContent;
 returncontent;
+}
 -publicstaticasyncTask<IList<PackageInstance>>GetPackageInstancesAsync(stringWuCategoryID)
 +publicstaticasyncTask<IList<PackageInstance>>GetPackageInstancesAsync(stringWuCategoryID,stringMSAToken)
+{
 -IList<PackageInstance>PackageInstances=newList<PackageInstance>();
 -HttpContenthttpContent=newStringContent(String.Format(GetResourceTextFile("WUIDRequest.xml"),awaitGetCookieAsync(),WuCategoryID),Encoding.UTF8,"application/soap+xml");//Load in the Xml for this FE3 request and format it a cookie and the provided WuCategoryID.
 +HttpContenthttpContent=newStringContent(String.Format(GetResourceTextFile("WUIDRequest.xml"),awaitGetCookieAsync(),WuCategoryID,MSAToken??_msaToken),Encoding.UTF8,"application/soap+xml");//Load in the Xml for this FE3 request and format it a cookie and the provided WuCategoryID.
 HttpRequestMessagehttpRequest=newHttpRequestMessage();
 httpRequest.RequestUri=Endpoints.FE3Delivery;
 httpRequest.Content=httpContent;
 httpRequest.Method=HttpMethod.Post;
 HttpResponseMessagehttpResponse=await_httpClient.SendAsync(httpRequest,newSystem.Threading.CancellationToken());
 stringcontent=awaithttpResponse.Content.ReadAsStringAsync();
 content=HttpUtility.HtmlDecode(content);
 +returnawaitGetPackageInstancesAsync(content);
 +}
++
 +publicstaticasyncTask<IList<PackageInstance>>GetPackageInstancesAsync(stringcontent)
 +{
 +IList<PackageInstance>PackageInstances=newList<PackageInstance>();
 XmlDocumentdoc=newXmlDocument();
 doc.LoadXml(content);
 XmlNodeListnodes=doc.GetElementsByTagName("AppxMetadata");
 foreach(XmlNodenodeinnodes)
+{
 if(node.Attributes.Count>=3)
+{
 -PackageInstancepackage=newPackageInstance(node.Attributes.GetNamedItem("PackageMoniker").Value,newUri("http://test.com"),Utilities.TypeHelpers.StringToPackageType(node.Attributes.GetNamedItem("PackageType").Value));
 +PackageInstancepackage=newPackageInstance(node.Attributes.GetNamedItem("PackageMoniker").Value,newUri("http://test.com"),Utilities.TypeHelpers.StringToPackageType(node.Attributes.GetNamedItem("PackageType").Value),JsonConvert.DeserializeObject<ApplicabilityBlob>(node.FirstChild.InnerText),"");
 PackageInstances.Add(package);
+}
+-
+-
+}
 returnPackageInstances;
 /// <param name="UpdateIDs"></param>
 /// <param name="RevisionIDs"></param>
 /// <returns>IList of App Package Download Uris</returns>
 -publicstaticasyncTask<IList<Uri>>GetFileUrlsAsync(IList<string>UpdateIDs,IList<string>RevisionIDs)
 +publicstaticasyncTask<IList<Uri>>GetFileUrlsAsync(IList<string>UpdateIDs,IList<string>RevisionIDs,stringMSAToken=null)
+{
 XmlDocumentdoc=newXmlDocument();
 IList<Uri>uris=newList<Uri>();
 foreach(stringIDinUpdateIDs)
+{
 -HttpContenthttpContent=newStringContent(String.Format(GetResourceTextFile("FE3FileUrl.xml"),ID,RevisionIDs[UpdateIDs.IndexOf(ID)]),Encoding.UTF8,"application/soap+xml");//Loading the request xml from a file to keep things nice and tidy.
 +HttpContenthttpContent=newStringContent(String.Format(GetResourceTextFile("FE3FileUrl.xml"),ID,RevisionIDs[UpdateIDs.IndexOf(ID)],MSAToken??_msaToken),Encoding.UTF8,"application/soap+xml");//Loading the request xml from a file to keep things nice and tidy.
 HttpRequestMessagehttpRequest=newHttpRequestMessage();
 httpRequest.RequestUri=Endpoints.FE3DeliverySecured;
 httpRequest.Content=httpContent;