Feature/post 0.3.0 followups

README.md

@@ -31,6 +31,7 @@ novu-dotnet targets .NET Standard 2.0 and is compatible with .NET Core 2.0+ and
 |-------------|------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | 0.2.2       | <= 0.17          | Singleton client with Refit's use of RestService                                                                                                                                                                                        |
 | 0.3.0       | >= 0.18          | 0.3.0 is not compatible with 0.2.2 and requires upgrade to code. Also 0.18 introduced a breaking change only found in 0.3.0. All 0.2.2 must be upgraded if used against the production system. HttpClient can now be used and injected. |
+| 0.3.1       | >= 0.18          | [BREAKING} Obsolete Notification Templates has been removed. Service registration separation of single client and each client. Novu.Extension and Novu.Sync released as packages.                                                       |
 
 ## Installation
 
@@ -135,3 +136,23 @@ The key folders to look into:
 - [Interfaces](https://github.com/novuhq/novu-dotnet/tree/main/src/Novu/Interfaces) directory holds all interfaces that are intended to outline how a class should be structured
 - [Models](https://github.com/novuhq/novu-dotnet/tree/main/src/Novu/Models) directory holds various models that are sub-resources inside the DTOs
 
+### Major changes
+
+Github issues closed
+
+#### 0.3.1
+- #57
+- #58
+- #59
+- #60
+- #55
+#### 0.3.0
+- #19
+- #20
+- #21
+- #34
+- #48
+- #49
+- #50
+- #47
+- #45

src/Novu.Extensions/ConfigurationExtensions.cs

@@ -50,6 +50,12 @@ public static NovuClientConfiguration GetNovuClientConfiguration(this IConfigura
             novuConfiguration.Url = novuConfigurationUrl;
         }
 
+        var novuConfigurationApiKey = Environment.GetEnvironmentVariable("NOVU_API_KEY");
+        if (novuConfigurationApiKey is not null)
+        {
+            novuConfiguration.ApiKey = novuConfigurationApiKey;
+        }
+
         return novuConfiguration;
     }
 }

src/Novu.Extensions/IocNovuRegistrationExtensions.cs

@@ -3,7 +3,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Novu.Interfaces;
-using Novu.NotificationTemplates;
 using Refit;
 
 namespace Novu.Extensions;
@@ -20,28 +19,24 @@ public static IServiceCollection RegisterNovuClients(
     {
         var novuConfiguration = configuration.GetNovuClientConfiguration();
 
-        Action<HttpClient> configureClient = c =>
+        Action<HttpClient> configureClient = client =>
         {
-            c.BaseAddress = new Uri(novuConfiguration.Url);
+            client.BaseAddress = new Uri(novuConfiguration.Url);
 
             // allow for multiple registrations—authorization cannot have multiple entries
-            if (c.DefaultRequestHeaders.Contains("Authorization"))
+            if (client.DefaultRequestHeaders.Contains("Authorization"))
             {
-                c.DefaultRequestHeaders.Remove("Authorization");
+                client.DefaultRequestHeaders.Remove("Authorization");
             }
 
-            c.DefaultRequestHeaders.Add("Authorization", $"ApiKey {novuConfiguration.ApiKey}");
-        };
-        var settings = refitSettings ?? new RefitSettings
-        {
-            ContentSerializer = new NewtonsoftJsonContentSerializer(NovuClient.DefaultSerializerSettings),
+            client.DefaultRequestHeaders.Add("Authorization", $"ApiKey {novuConfiguration.ApiKey}");
         };
+        var settings = RefitSettings(refitSettings);
 
         services.AddRefitClient<ISubscriberClient>(settings).ConfigureHttpClient(configureClient);
         services.AddRefitClient<IEventClient>(settings).ConfigureHttpClient(configureClient);
         services.AddRefitClient<ITopicClient>(settings).ConfigureHttpClient(configureClient);
         services.AddRefitClient<IWorkflowGroupClient>(settings).ConfigureHttpClient(configureClient);
-        services.AddRefitClient<INotificationTemplatesClient>(settings).ConfigureHttpClient(configureClient);
         services.AddRefitClient<IWorkflowClient>(settings).ConfigureHttpClient(configureClient);
         services.AddRefitClient<ILayoutClient>(settings).ConfigureHttpClient(configureClient);
         services.AddRefitClient<IIntegrationClient>(settings).ConfigureHttpClient(configureClient);
@@ -50,6 +45,26 @@ public static IServiceCollection RegisterNovuClients(
         services.AddRefitClient<IExecutionDetailsClient>(settings).ConfigureHttpClient(configureClient);
 
         return services
-            .AddTransient<INovuClient, NovuClient>();
+            .AddTransient<INovuClientConfiguration>(_ => novuConfiguration);
+    }
+
+
+    public static IServiceCollection RegisterNovuClient(
+        this IServiceCollection services,
+        IConfiguration configuration,
+        RefitSettings refitSettings = null)
+    {
+        return services
+            .AddTransient<INovuClient>(_ => new NovuClient(
+                configuration.GetNovuClientConfiguration(),
+                refitSettings: RefitSettings(refitSettings)));
+    }
+
+    private static RefitSettings RefitSettings(RefitSettings refitSettings)
+    {
+        return refitSettings ?? new RefitSettings
+        {
+            ContentSerializer = new NewtonsoftJsonContentSerializer(NovuClient.DefaultSerializerSettings),
+        };
     }
 }

src/Novu.Extensions/Novu.Extensions.csproj

@@ -9,7 +9,7 @@
     <!-- Nuget Settings -->
     <PropertyGroup>
         <PackageId>Novu.Extensions</PackageId>
-        <Version>0.3.0</Version>
+        <Version>0.3.1</Version>
         <ProductName>Novu</ProductName>
         <Description>Novu .NET SDK</Description>
         <RepositoryType>git</RepositoryType>

src/Novu.Sync/Novu.Sync.csproj

@@ -9,7 +9,7 @@
     <!-- Nuget Settings -->
     <PropertyGroup>
         <PackageId>Novu.Extensions</PackageId>
-        <Version>0.3.0</Version>
+        <Version>0.3.1</Version>
         <ProductName>Novu</ProductName>
         <Description>Novu .NET SDK</Description>
         <RepositoryType>git</RepositoryType>

src/Novu.Tests/IntegrationTests/BaseIntegrationTest.cs

@@ -20,7 +20,6 @@
 using Novu.Models.Subscribers;
 using Novu.Models.Workflows;
 using Novu.Models.Workflows.Step.Message;
-using Novu.NotificationTemplates;
 using Novu.Sync;
 using ParkSquare.Testing.Generators;
 using Refit;
@@ -62,7 +61,6 @@ protected BaseIntegrationTest(ITestOutputHelper output)
     protected IEventClient Event => Get<IEventClient>();
     protected ITopicClient Topic => Get<ITopicClient>();
     protected IWorkflowGroupClient WorkflowGroup => Get<IWorkflowGroupClient>();
-    protected INotificationTemplatesClient NotificationTemplates => Get<INotificationTemplatesClient>();
     protected IWorkflowClient Workflow => Get<IWorkflowClient>();
     protected ILayoutClient Layout => Get<ILayoutClient>();
     protected IIntegrationClient Integration => Get<IIntegrationClient>();

src/Novu.Tests/Novu.Tests.csproj

@@ -4,6 +4,7 @@
         <TargetFramework>net7.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <RootNamespace>Novu.Tests</RootNamespace>
+        <Version>0.3.1</Version>
     </PropertyGroup>
 
     <ItemGroup>

src/Novu/Interfaces/INovuClient.cs

@@ -1,16 +1,11 @@
-using Novu.NotificationTemplates;
-
-namespace Novu.Interfaces;
+namespace Novu.Interfaces;
 
 public interface INovuClient
 {
-    public ISubscriberClient Subscriber { get; }
-
-    public IEventClient Event { get; }
-
-    public ITopicClient Topic { get; }
-    public INotificationTemplatesClient NotificationTemplates { get; }
-    public IWorkflowGroupClient WorkflowGroup { get; }
+    ISubscriberClient Subscriber { get; }
+    IEventClient Event { get; }
+    ITopicClient Topic { get; }
+    IWorkflowGroupClient WorkflowGroup { get; }
     IWorkflowClient Workflow { get; }
     ILayoutClient Layout { get; }
     IIntegrationClient Integration { get; }