Merge pull request #90 from StanDotNet/master

feat(CodePush): added same response to Apn and Firebase senders

Author: andrei-m-code

CorePush/Apple/ApnSender.cs

@@ -11,6 +11,7 @@
 using Org.BouncyCastle.Security;
 
 using CorePush.Interfaces;
+using CorePush.Models;
 using CorePush.Utils;
 using CorePush.Serialization;
 
@@ -65,7 +66,7 @@ public ApnSender(ApnSettings settings, HttpClient http, IJsonSerializer serializ
     /// to receive too many requests and may occasionally respond with HTTP 429. Just try/catch this call and retry as needed.
     /// </summary>
     /// <exception cref="HttpRequestException">Throws exception when not successful</exception>
-    public async Task<ApnsResponse> SendAsync(
+    public async Task<PushResult> SendAsync(
         object notification,
         string deviceToken,
         string apnsId = null,
@@ -96,15 +97,13 @@ public async Task<ApnsResponse> SendAsync(
         }
 
         using var response = await http.SendAsync(message, cancellationToken);
-            
-        var success = response.IsSuccessStatusCode;
+        
         var content = await response.Content.ReadAsStringAsync(cancellationToken);
+        var error = response.IsSuccessStatusCode 
+            ? null 
+            : serializer.Deserialize<ApnsError>(content).Reason;
 
-        return new ApnsResponse
-        {
-            IsSuccess = success,
-            Error = success ? null : serializer.Deserialize<ApnsError>(content)
-        };
+        return new PushResult((int)response.StatusCode, response.IsSuccessStatusCode, content, error);
     }
 
     private string GetJwtToken()

CorePush/Firebase/FirebaseError.cs

@@ -0,0 +1,8 @@
+namespace CorePush.Firebase;
+
+public class FirebaseError
+{
+    public string Message { get; set; }
+    public string Status { get; set; }
+    public int Code { get; set; }
+}

CorePush/Firebase/FirebaseResponse.cs

@@ -3,4 +3,5 @@
 public class FirebaseResponse
 {
     public string Name { get; set; }
+    public FirebaseError Error { get; set; }
 }

CorePush/Firebase/FirebaseSender.cs

@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 
 using CorePush.Interfaces;
+using CorePush.Models;
 using CorePush.Serialization;
 using CorePush.Utils;
 
@@ -86,7 +87,7 @@ public FirebaseSender(FirebaseSettings settings, HttpClient http, IJsonSerialize
     /// <param name="payload">Notification payload that will be serialized using Newtonsoft.Json package</param>
     /// <param name="cancellationToken">Cancellation token</param>
     /// <exception cref="HttpRequestException">Throws exception when not successful</exception>
-    public async Task<FirebaseResponse> SendAsync(object payload, CancellationToken cancellationToken = default)
+    public async Task<PushResult> SendAsync(object payload, CancellationToken cancellationToken = default)
     {
         var json = serializer.Serialize(payload);
 
@@ -102,12 +103,12 @@ public async Task<FirebaseResponse> SendAsync(object payload, CancellationToken
         using var response = await http.SendAsync(message, cancellationToken);
         var responseString = await response.Content.ReadAsStringAsync(cancellationToken);
 
-        if (!response.IsSuccessStatusCode)
-        {
-            throw new HttpRequestException("Firebase notification error: " + responseString);
-        }
-
-        return serializer.Deserialize<FirebaseResponse>(responseString);
+        var firebaseResponse = serializer.Deserialize<FirebaseResponse>(responseString);
+        
+        return new PushResult((int) response.StatusCode,
+            response.IsSuccessStatusCode,
+            firebaseResponse.Name ?? firebaseResponse.Error?.Message,
+            responseString);
     }
 
     private async Task<string> GetJwtTokenAsync()

CorePush/Interfaces/IApnSender.cs

@@ -2,12 +2,13 @@
 using System.Threading.Tasks;
 
 using CorePush.Apple;
+using CorePush.Models;
 
 namespace CorePush.Interfaces;
 
 public interface IApnSender
 {
-    Task<ApnsResponse> SendAsync(
+    Task<PushResult> SendAsync(
         object notification,
         string deviceToken,
         string apnsId = null,

CorePush/Interfaces/IFirebaseSender.cs

@@ -2,10 +2,11 @@
 using System.Threading.Tasks;
 
 using CorePush.Firebase;
+using CorePush.Models;
 
 namespace CorePush.Interfaces;
 
 public interface IFirebaseSender
 {
-    Task<FirebaseResponse> SendAsync(object payload, CancellationToken cancellationToken = default);
+    Task<PushResult> SendAsync(object payload, CancellationToken cancellationToken = default);
 }

CorePush/Models/PushResult.cs

@@ -0,0 +1,7 @@
+namespace CorePush.Models;
+
+public record PushResult(
+    int StatusCode,
+    bool IsSuccessStatusCode,
+    string Message,
+    string Error);