FCM and APN base url change for testing

Author: andrei-m-code

CorePush/Apple/ApnSender.cs

@@ -25,7 +25,7 @@ public class ApnSender : IApnSender
             {ApnServerType.Production, "https://api.push.apple.com:443" }
         };
 
-        private const string apnidHeader = "apns-id";
+        private const string apnIdHeader = "apns-id";
         private const int tokenExpiresMinutes = 50;
 
         private readonly ApnSettings settings;
@@ -40,14 +40,16 @@ public ApnSender(ApnSettings settings, HttpClient http)
         {
             this.settings = settings ?? throw new ArgumentNullException(nameof(settings));
             this.http = http ?? throw new ArgumentNullException(nameof(http));
+
+            http.BaseAddress = http.BaseAddress ?? new Uri(servers[settings.ServerType]);
         }
 
         /// <summary>
         /// Serialize and send notification to APN. Please see how your message should be formatted here:
         /// https://developer.apple.com/library/archive/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CreatingtheNotificationPayload.html#//apple_ref/doc/uid/TP40008194-CH10-SW1
         /// Payload will be serialized using Newtonsoft.Json package.
         /// !IMPORTANT: If you send many messages at once, make sure to retry those calls. Apple typically doesn't like 
-        /// to receive too many requests and may ocasionally respond with HTTP 429. Just try/catch this call and retry as needed.
+        /// 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(
@@ -62,36 +64,36 @@ public async Task<ApnsResponse> SendAsync(
             var path = $"/3/device/{deviceToken}";
             var json = JsonHelper.Serialize(notification);
 
-            var request = new HttpRequestMessage(HttpMethod.Post, new Uri(servers[settings.ServerType] + path))
-            {
-                Version = new Version(2, 0),
-                Content = new StringContent(json)
-            };
-
-            request.Headers.Authorization = new AuthenticationHeaderValue("bearer", GetJwtToken());
-            request.Headers.TryAddWithoutValidation(":method", "POST");
-            request.Headers.TryAddWithoutValidation(":path", path);
-            request.Headers.Add("apns-topic", settings.AppBundleIdentifier);
-            request.Headers.Add("apns-expiration", apnsExpiration.ToString());
-            request.Headers.Add("apns-priority", apnsPriority.ToString());
-            request.Headers.Add("apns-push-type", isBackground ? "background" : "alert"); // required for iOS 13+
-
-            if (!string.IsNullOrWhiteSpace(apnsId))
-            {
-                request.Headers.Add(apnidHeader, apnsId);
-            }
-
-            using (var response = await http.SendAsync(request, cancellationToken))
+            using (var message = new HttpRequestMessage(HttpMethod.Post, path))
             {
-                var succeed = response.IsSuccessStatusCode;
-                var content = await response.Content.ReadAsStringAsync();
-                var error = JsonHelper.Deserialize<ApnsError>(content);
+                message.Version = new Version(2, 0);
+                message.Content = new StringContent(json);
+                
+                message.Headers.Authorization = new AuthenticationHeaderValue("bearer", GetJwtToken());
+                message.Headers.TryAddWithoutValidation(":method", "POST");
+                message.Headers.TryAddWithoutValidation(":path", path);
+                message.Headers.Add("apns-topic", settings.AppBundleIdentifier);
+                message.Headers.Add("apns-expiration", apnsExpiration.ToString());
+                message.Headers.Add("apns-priority", apnsPriority.ToString());
+                message.Headers.Add("apns-push-type", isBackground ? "background" : "alert"); // required for iOS 13+
+
+                if (!string.IsNullOrWhiteSpace(apnsId))
+                {
+                    message.Headers.Add(apnIdHeader, apnsId);
+                }
 
-                return new ApnsResponse
+                using (var response = await http.SendAsync(message, cancellationToken))
                 {
-                    IsSuccess = succeed,
-                    Error = error
-                };
+                    var succeed = response.IsSuccessStatusCode;
+                    var content = await response.Content.ReadAsStringAsync();
+                    var error = JsonHelper.Deserialize<ApnsError>(content);
+
+                    return new ApnsResponse
+                    {
+                        IsSuccess = succeed,
+                        Error = error
+                    };
+                }
             }
         }
 

CorePush/CorePush.csproj

@@ -10,9 +10,9 @@
     <Summary>Server Side library for sending ✅Web, ✅Android and ✅iOS Push Notifications</Summary>
     <Authors>andrei-m-code</Authors>
 
-    <AssemblyVersion>3.0.13</AssemblyVersion>
-    <FileVersion>3.0.13</FileVersion>
-    <Version>3.0.13</Version>
+    <AssemblyVersion>3.1.0</AssemblyVersion>
+    <FileVersion>3.1.0</FileVersion>
+    <Version>3.1.0</Version>
 
     <PackageProjectUrl>https://github.com/andrei-m-code/CorePush</PackageProjectUrl>
     <RepositoryUrl>https://github.com/andrei-m-code/CorePush</RepositoryUrl>
@@ -25,6 +25,10 @@
     <PackageTags>push-notifications android-push-notifications ios-push-notifications web-push web-push-notifications apn fcm firebase</PackageTags>
 
     <PackageReleaseNotes>
+v3.1.0 
+- Memory optimizations
+- Ability to change FCM and APN base URL for testing purposes
+      
 v3.0.11 - v3.0.12
 - Package information update
 

CorePush/Google/FcmSender.cs

@@ -21,8 +21,8 @@ public class FcmSender : IFcmSender
 
         public FcmSender(FcmSettings settings, HttpClient http)
         {
-            this.settings = settings;
-            this.http = http;
+            this.settings = settings ?? throw new ArgumentNullException(nameof(settings));
+            this.http = http ?? throw new ArgumentNullException(nameof(http));
 
             http.BaseAddress = http.BaseAddress ?? new Uri(fcmUrl);
         }