New client initialisation.

SebastianStehle · SebastianStehle · commit 7bb28b831493 · 2023-01-04T10:07:51.000+01:00
diff --git a/sample/Sample.Android/Resources/Resource.designer.cs b/sample/Sample.Android/Resources/Resource.designer.cs
diff --git a/sample/Sample.iOS.Shared/Sample.iOS.Shared.csproj b/sample/Sample.iOS.Shared/Sample.iOS.Shared.csproj
@@ -50,7 +50,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Notifo.SDK" Version="1.5.1" />
+    <PackageReference Include="Notifo.SDK" Version="1.6.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
diff --git a/sample/Sample/App.xaml.cs b/sample/Sample/App.xaml.cs
@@ -5,7 +5,6 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-using Notifo.SDK;
 using Prism;
 using Prism.DryIoc;
 using Prism.Ioc;
diff --git a/sample/Sample/NotifoStartup.cs b/sample/Sample/NotifoStartup.cs
@@ -5,8 +5,6 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-using Notifo.SDK;
-using Notifo.SDK.FirebasePlugin;
 using Xamarin.Forms;
 
 namespace Sample
diff --git a/sample/Sample/ViewModels/LoginPageViewModel.cs b/sample/Sample/ViewModels/LoginPageViewModel.cs
@@ -5,7 +5,6 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-using Notifo.SDK;
 using Prism.Commands;
 using Prism.Mvvm;
 
diff --git a/sample/SampleNotificationServiceExtension/SampleNotificationServiceExtension.csproj b/sample/SampleNotificationServiceExtension/SampleNotificationServiceExtension.csproj
@@ -90,8 +90,8 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Notifo.SDK, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Notifo.SDK.1.5.1\lib\netstandard2.1\Notifo.SDK.dll</HintPath>
+    <Reference Include="Notifo.SDK, Version=1.6.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Notifo.SDK.1.6.1\lib\netstandard2.1\Notifo.SDK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
diff --git a/sample/SampleNotificationServiceExtension/packages.config b/sample/SampleNotificationServiceExtension/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="xamarinios10" />
-  <package id="Notifo.SDK" version="1.5.1" targetFramework="xamarinios10" />
+  <package id="Notifo.SDK" version="1.6.1" targetFramework="xamarinios10" />
   <package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="xamarinios10" />
 </packages>
diff --git a/sdk/Notifo.SDK.FirebasePlugin/Notifo.SDK.FirebasePlugin.csproj b/sdk/Notifo.SDK.FirebasePlugin/Notifo.SDK.FirebasePlugin.csproj
@@ -53,7 +53,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="Notifo.SDK" Version="1.5.1" />
+	<PackageReference Include="Notifo.SDK" Version="1.6.1" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
   </ItemGroup>
 
diff --git a/sdk/Notifo.SDK/Helpers/NotifoHttpClientProvider.cs b/sdk/Notifo.SDK/Helpers/NotifoHttpClientProvider.cs
@@ -0,0 +1,30 @@
+﻿// ==========================================================================
+//  Notifo.io
+// ==========================================================================
+//  Copyright (c) Sebastian Stehle
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using System.Net.Http;
+using Notifo.SDK.Configuration;
+
+namespace Notifo.SDK.Helpers
+{
+    internal sealed class NotifoHttpClientProvider : DefaultHttpClientProvider
+    {
+        public NotifoHttpClientProvider(INotifoOptions options)
+            : base(options)
+        {
+        }
+
+        public override HttpClient BuildHttpClient(HttpMessageHandler handler)
+        {
+            if (handler is DelegatingHandler delegatingHandler)
+            {
+                delegatingHandler.InnerHandler = new NotifoHttpMessageHandler();
+            }
+
+            return base.BuildHttpClient(handler);
+        }
+    }
+}
diff --git a/sdk/Notifo.SDK/Helpers/NotifoHttpMessageHandler.cs b/sdk/Notifo.SDK/Helpers/NotifoHttpMessageHandler.cs
@@ -14,11 +14,10 @@
 
 namespace Notifo.SDK.Helpers
 {
-    internal class NotifoHttpMessageHandler : PolicyHttpMessageHandler
+    internal sealed class NotifoHttpMessageHandler : PolicyHttpMessageHandler
     {
         private static readonly AsyncRetryPolicy<HttpResponseMessage> RetryPolicy =
-            HttpPolicyExtensions
-                .HandleTransientHttpError()
+            HttpPolicyExtensions.HandleTransientHttpError()
                 .WaitAndRetryAsync(retryCount: 3, sleepDurationProvider: attempt => TimeSpan.FromMilliseconds(300));
 
         public NotifoHttpMessageHandler()
diff --git a/sdk/Notifo.SDK/Helpers/NotifoOptions.cs b/sdk/Notifo.SDK/Helpers/NotifoOptions.cs
@@ -0,0 +1,68 @@
+﻿// ==========================================================================
+//  Notifo.io
+// ==========================================================================
+//  Copyright (c) Sebastian Stehle
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using System;
+using Notifo.SDK.NotifoMobilePush;
+
+namespace Notifo.SDK.Helpers
+{
+    internal sealed class NotifoOptions : INotifoOptions
+    {
+        private readonly ICredentialsStore store;
+        private string? apiUrl = "https://cloud.squidex.io";
+        private string? apiKey;
+
+        public bool IsConfigured
+        {
+            get => !string.IsNullOrEmpty(apiKey) && !string.IsNullOrEmpty(apiUrl);
+        }
+
+        public string? ApiUrl
+        {
+            get => apiUrl;
+            set
+            {
+                if (apiUrl != value)
+                {
+                    apiUrl = value;
+                    store.ApiUrl = value;
+                }
+            }
+        }
+
+        public string? ApiKey
+        {
+            get => apiKey;
+            set
+            {
+                if (apiKey != value)
+                {
+                    apiKey = value;
+                    store.ApiKey = value;
+                }
+            }
+        }
+
+        public string? ClientId => default;
+
+        public string? ClientSecret => default;
+
+        public TimeSpan Timeout => default;
+
+        public NotifoOptions(ICredentialsStore store)
+        {
+            this.store = store;
+
+            apiUrl = store.ApiUrl;
+            apiKey = store.ApiKey;
+        }
+
+        public void Validate()
+        {
+        }
+    }
+}
diff --git a/sdk/Notifo.SDK/INotifoMobilePush.cs b/sdk/Notifo.SDK/INotifoMobilePush.cs
@@ -6,15 +6,14 @@
 // ==========================================================================
 
 using System;
-using System.Net.Http;
 using Notifo.SDK.PushEventProvider;
 
 namespace Notifo.SDK
 {
     /// <summary>
     /// Notifo mobile push service interface.
     /// </summary>
-    public partial interface INotifoMobilePush : INotifoClient
+    public partial interface INotifoMobilePush
     {
         /// <summary>
         /// Event triggered when a notification is received.
@@ -31,6 +30,11 @@ public partial interface INotifoMobilePush : INotifoClient
         /// </summary>
         event EventHandler<NotificationErrorEventArgs> OnError;
 
+        /// <summary>
+        /// Gets the notifo client.
+        /// </summary>
+        INotifoClient Client { get; }
+
         /// <summary>
         /// The used API version.
         /// </summary>
@@ -84,12 +88,6 @@ public partial interface INotifoMobilePush : INotifoClient
         /// <param name="source">The source of the error.</param>
         void RaiseError(string error, Exception? exception, object? source);
 
-        /// <summary>
-        /// Creates a HTTP client.
-        /// </summary>
-        /// <returns>The HTTP client.</returns>
-        HttpClient CreateHttpClient();
-
         /// <summary>
         /// Register for notifications on demand.
         /// </summary>
diff --git a/sdk/Notifo.SDK/Notifo.SDK.Core.csproj b/sdk/Notifo.SDK/Notifo.SDK.Core.csproj
@@ -48,7 +48,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="5.0.1" />
-    <PackageReference Include="Notifo.SDK" Version="1.5.1" />
+    <PackageReference Include="Notifo.SDK" Version="1.6.1" />
     <PackageReference Include="Polly" Version="7.2.1" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/sdk/Notifo.SDK/NotifoIO.shared.cs b/sdk/Notifo.SDK/NotifoIO.shared.cs
@@ -43,7 +43,7 @@ private static INotifoMobilePush SetupNotifoMobilePush()
                 },
                 10, TimeSpan.FromSeconds(5));
 
-            return new NotifoMobilePushImplementation(HttpClientFactory, settings, commandQueue, settings, settings);
+            return new NotifoMobilePushImplementation(settings, commandQueue, settings, settings);
         }
 
         private static ILogger ConfigureLogger()
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/NotifoClientProvider.cs b/sdk/Notifo.SDK/NotifoMobilePush/NotifoClientProvider.cs
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/NotifoMobilePushImplementation.ios.cs b/sdk/Notifo.SDK/NotifoMobilePush/NotifoMobilePushImplementation.ios.cs
@@ -9,7 +9,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Foundation;
@@ -23,14 +22,8 @@ namespace Notifo.SDK.NotifoMobilePush
 {
     internal partial class NotifoMobilePushImplementation : NSObject
     {
-        private HttpClient httpClient;
         private INotificationHandler? notificationHandler;
 
-        partial void SetupPlatform()
-        {
-            httpClient = CreateHttpClient();
-        }
-
         public INotifoMobilePush SetNotificationHandler(INotificationHandler? notificationHandler)
         {
             this.notificationHandler = notificationHandler;
@@ -125,15 +118,15 @@ private async Task<IEnumerable<UserNotificationDto>> GetPendingNotificationsAsyn
         private async Task<List<UserNotificationDto>> GetPendingNotifications1_0Async(int take, DateTime after,
             CancellationToken ct)
         {
-            var result = await Notifications.GetMyNotificationsAsync(take: take, cancellationToken: ct);
+            var result = await Client.Notifications.GetMyNotificationsAsync(take: take, cancellationToken: ct);
 
             return result.Items.Where(x => x.Created >= after).ToList();
         }
 
         private async Task<List<UserNotificationDto>> GetPendingNotifications1_4Async(int take, DateTime after,
             CancellationToken ct)
         {
-            var result = await Notifications.GetMyDeviceNotificationsAsync(token, after, true, take * 2, ct);
+            var result = await Client.Notifications.GetMyDeviceNotificationsAsync(token, after, true, take * 2, ct);
 
             return result.Items;
         }
@@ -331,9 +324,17 @@ public void DidReceiveNotificationResponse(UNNotificationResponse response)
                 // Copy directly from the web stream to the image stream to reduce memory allocations.
                 using (var fileStream = new FileStream(imagePath, FileMode.Create))
                 {
-                    using (var imageStream = await httpClient.GetStreamAsync(imageUrl))
+                    var httpClient = Client.CreateHttpClient();
+                    try
+                    {
+                        using (var imageStream = await httpClient.GetStreamAsync(imageUrl))
+                        {
+                            await imageStream.CopyToAsync(fileStream);
+                        }
+                    }
+                    finally
                     {
-                        await imageStream.CopyToAsync(fileStream);
+                        Client.ReturnHttpClient(httpClient);
                     }
                 }
 
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/NotifoMobilePushImplementation.shared.cs b/sdk/Notifo.SDK/NotifoMobilePush/NotifoMobilePushImplementation.shared.cs
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/TokenRegisterCommand.cs b/sdk/Notifo.SDK/NotifoMobilePush/TokenRegisterCommand.cs
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/TokenUnregisterCommand.cs b/sdk/Notifo.SDK/NotifoMobilePush/TokenUnregisterCommand.cs
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/TrackSeenCommand.cs b/sdk/Notifo.SDK/NotifoMobilePush/TrackSeenCommand.cs
diff --git a/tests/Notifo.SDK.UnitTests/NotifoClientProviderTests.cs b/tests/Notifo.SDK.UnitTests/NotifoClientProviderTests.cs

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,10 @@`
`14`	`14`
`15`	`15`	`namespace Notifo.SDK.Helpers`
`16`	`16`	`{`
`17`		`- internal class NotifoHttpMessageHandler : PolicyHttpMessageHandler`
	`17`	`+ internal sealed class NotifoHttpMessageHandler : PolicyHttpMessageHandler`
`18`	`18`	`{`
`19`	`19`	`private static readonly AsyncRetryPolicy<HttpResponseMessage> RetryPolicy =`
`20`		`- HttpPolicyExtensions`
`21`		`- .HandleTransientHttpError()`
	`20`	`+ HttpPolicyExtensions.HandleTransientHttpError()`
`22`	`21`	`.WaitAndRetryAsync(retryCount: 3, sleepDurationProvider: attempt => TimeSpan.FromMilliseconds(300));`
`23`	`22`
`24`	`23`	`public NotifoHttpMessageHandler()`