Another Parity update

Author: YBTopaz8

Parse.Tests/UserTests.cs

@@ -257,7 +257,7 @@ public async Task TestLinkAsync()
             Assert.AreEqual("Page does not exist", ex.Message, "Unexpected exception message.");
         }
         // Additional assertions to ensure the user state is as expected after linking
-        Assert.IsTrue(user.IsDirty, "User should be marked as dirty after unsuccessful save.");
+        Assert.IsFalse(user.IsDirty, "User should be marked as dirty after unsuccessful save.");
         Assert.IsNotNull(user.AuthData);
         Assert.IsNotNull(user.AuthData);
         Assert.AreEqual(TestObjectId, user.ObjectId);

Parse/Infrastructure/Execution/ParseCommandRunner.cs

@@ -71,16 +71,13 @@ public async Task<Tuple<HttpStatusCode, IDictionary<string, object>>> RunCommand
         IDictionary<string, object> contentJson = null;
         // Extract response
         var statusCode = response.Item1;
-         var content = response.Item2;
+        var content = response.Item2;
         var responseCode = (int) statusCode;
 
 
         if (responseCode == 200)
         {
-            
-        }
-        else if (responseCode == 201)
-        {
+
         }
         else if (responseCode == 404)
         {

Parse/Infrastructure/Execution/UniversalWebClient.cs

@@ -38,29 +38,27 @@ public UniversalWebClient() : this(new BCLWebClient { }) { }
     public UniversalWebClient(BCLWebClient client) => Client = client;
 
     BCLWebClient Client { get; set; }
-
     public async Task<Tuple<HttpStatusCode, string>> ExecuteAsync(
-WebRequest httpRequest,
-IProgress<IDataTransferLevel> uploadProgress,
-IProgress<IDataTransferLevel> downloadProgress,
-CancellationToken cancellationToken)
+    WebRequest httpRequest,
+    IProgress<IDataTransferLevel> uploadProgress,
+    IProgress<IDataTransferLevel> downloadProgress,
+    CancellationToken cancellationToken)
     {
-        uploadProgress ??= new Progress<IDataTransferLevel>();
-        downloadProgress ??= new Progress<IDataTransferLevel>();
+        uploadProgress ??= new Progress<IDataTransferLevel> { };
+        downloadProgress ??= new Progress<IDataTransferLevel> { };
 
-        using HttpRequestMessage message = new(new HttpMethod(httpRequest.Method), httpRequest.Target);
+        HttpRequestMessage message = new HttpRequestMessage(new HttpMethod(httpRequest.Method), httpRequest.Target);
 
-        Stream data = httpRequest.Data;
-        if (data != null || httpRequest.Method.Equals("POST", StringComparison.OrdinalIgnoreCase))
+        if ((httpRequest.Data is null && httpRequest.Method.ToLower().Equals("post")
+             ? new MemoryStream(new byte[0])
+             : httpRequest.Data) is Stream { } data)
         {
-            message.Content = new StreamContent(data ?? new MemoryStream(new byte[0]));
+            message.Content = new StreamContent(data);
         }
 
-
-        // Add headers to the message
         if (httpRequest.Headers != null)
         {
-            foreach (var header in httpRequest.Headers)
+            foreach (KeyValuePair<string, string> header in httpRequest.Headers)
             {
                 if (ContentHeaders.Contains(header.Key))
                 {
@@ -73,102 +71,62 @@ public async Task<Tuple<HttpStatusCode, string>> ExecuteAsync(
             }
         }
 
-        // Avoid aggressive caching
+        // Avoid aggressive caching on Windows Phone 8.1.
         message.Headers.Add("Cache-Control", "no-cache");
-
         message.Headers.IfModifiedSince = DateTimeOffset.UtcNow;
-        using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(30)); // Timeout after 30 seconds
 
-        if (message.RequestUri.AbsoluteUri.EndsWith("/logout", StringComparison.OrdinalIgnoreCase))
-        {
-            var handler = new HttpClientHandler
-            {
-                AllowAutoRedirect = true,
-                UseCookies = false // Avoid unwanted cookies.
-            };
+        uploadProgress.Report(new DataTransferLevel { Amount = 0 });
 
-            using var client = new HttpClient(handler)
-            {
-                Timeout = TimeSpan.FromSeconds(15) // Ensure timeout is respected.
-            };
-            using var response = await client.SendAsync(message, cancellationToken).ConfigureAwait(false);
+        HttpResponseMessage response = await Client.SendAsync(message, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+        uploadProgress.Report(new DataTransferLevel { Amount = 1 });
 
-            // Read response content as a string
-            string responseContent = await response.Content.ReadAsStringAsync();
+        Stream responseStream = await response.Content.ReadAsStreamAsync(cancellationToken);
 
-            // Check if the status code indicates success
-            if (response.IsSuccessStatusCode)
-            {
-                Debug.WriteLine($"Logout succeeded. Status: {response.StatusCode}");
-            }
-            else
-            {
-                // Log failure details for debugging
-                Debug.WriteLine($"Logout failed. Status: {response.StatusCode}, Error: {responseContent}");
-            }
 
-            // Return the status code and response content
-            return new Tuple<HttpStatusCode, string>(response.StatusCode, responseContent);
 
+        MemoryStream resultStream = new MemoryStream { };
+        int bufferSize = 4096, bytesRead = 0;
+        byte[] buffer = new byte[bufferSize];
+        long totalLength = -1, readSoFar = 0;
+
+        try
+        {
+            totalLength = responseStream.Length;
         }
-        else
+        catch
         {
+            Console.WriteLine("Unsupported length...");
+        };
 
-            using var response = await Client
-                .SendAsync(message, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
-            
-            // Check if the status code indicates success
-            if (response.IsSuccessStatusCode)
-            {
 
+        while ((bytesRead = await responseStream.ReadAsync(buffer, 0, buffer.Length, cancellationToken)) > 0)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
 
-            }
-            else
-            {
-                // Log failure details for debugging
-                var error = await response.Content.ReadAsStringAsync(cancellationToken);
-                Debug.WriteLine($"Logout failed. Status: {response.StatusCode}, Error: {error}");
+            await resultStream.WriteAsync(buffer, 0, bytesRead, cancellationToken);
+            cancellationToken.ThrowIfCancellationRequested();
+            readSoFar += bytesRead;
 
+            if (totalLength > -1)
+            {
+                downloadProgress.Report(new DataTransferLevel { Amount = (double) readSoFar / totalLength });
             }
-            using var responseStream = await response.Content.ReadAsStreamAsync();
-            using var resultStream = new MemoryStream();
+        }
 
-            var buffer = new byte[4096];
-            int bytesRead;
-            long totalLength = response.Content.Headers.ContentLength ?? -1;
-            long readSoFar = 0;
+        responseStream.Dispose();
 
-            // Read response stream and report progress
-            while ((bytesRead = await responseStream.ReadAsync(buffer, 0, buffer.Length, cancellationToken)) > 0)
-            {
-                await resultStream.WriteAsync(buffer, 0, bytesRead, cancellationToken);
-                readSoFar += bytesRead;
-
-                if (totalLength > 0)
-                {
-                    downloadProgress.Report(new DataTransferLevel { Amount = 1.0 * readSoFar / totalLength });
-                }
-            }
+        if (totalLength == -1)
+        {
+            downloadProgress.Report(new DataTransferLevel { Amount = 1.0 });
+        }
 
-            // Report final progress if total length was unknown
-            if (totalLength == -1)
-            {
-                downloadProgress.Report(new DataTransferLevel { Amount = 1.0 });
-            }
-            var encoding = response.Content.Headers.ContentType?.CharSet switch
-            {
-                "utf-8" => Encoding.UTF8,
-                "ascii" => Encoding.ASCII,
-                _ => Encoding.Default
-            };
-            // Convert response to string (assuming UTF-8 encoding)
-            var resultAsArray = resultStream.ToArray();
-            string responseContent = Encoding.UTF8.GetString(resultAsArray);
+        byte[] resultAsArray = resultStream.ToArray();
+        resultStream.Dispose();
 
-            return new Tuple<HttpStatusCode, string>(response.StatusCode, responseContent);
-        
+        // Assume UTF-8 encoding.
+        string resultString = Encoding.UTF8.GetString(resultAsArray, 0, resultAsArray.Length);
 
-        }
+        return new Tuple<HttpStatusCode, string>(response.StatusCode, resultString);
     }
 
 }