feat: changes OdataRepository implementation to obtain context servic…

…e authentication token.

src/Liquid.Core/Liquid.Core.csproj

@@ -10,7 +10,7 @@
     <Copyright>Avanade 2019</Copyright>
     <PackageProjectUrl>https://github.com/Avanade/Liquid-Application-Framework</PackageProjectUrl>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>8.0.0-beta-06</Version>
+    <Version>8.0.0-beta-07</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>{C33A89FC-4F4D-4274-8D0F-29456BA8F76B}</ProjectGuid>
     <IsPackable>true</IsPackable>
@@ -28,7 +28,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="System.Memory.Data" Version="8.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Text.Json" Version="8.0.3" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
 	  <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
 	  <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />

src/Liquid.Repository.OData/Extensions/IServiceCollectionExtension.cs

@@ -1,5 +1,6 @@
 using Liquid.Core.Entities;
 using Liquid.Core.Extensions.DependencyInjection;
+using Liquid.Core.Implementations;
 using Liquid.Core.Interfaces;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -30,6 +31,7 @@ public static IServiceCollection AddLiquidOdataRepository<TEntity, TIdentifier>(
             where TEntity : LiquidEntity<TIdentifier>, new()
         {
             services.TryAddSingleton<IODataClientFactory, ODataClientFactory>();
+            services.TryAddSingleton<ILiquidContext, LiquidContext>();
 
             services.AddOptions<ODataOptions>()
              .Configure<IConfiguration>((settings, configuration) =>

src/Liquid.Repository.OData/IODataClientFactory.cs

@@ -16,7 +16,6 @@ public interface IODataClientFactory
         /// Create an OData client.
         /// </summary>
         /// <param name="entityName">The entity name.</param>
-        /// <param name="token">Authorization token.</param>
-        IODataClient CreateODataClientAsync(string entityName, string token);
+        IODataClient CreateODataClientAsync(string entityName);
     }
 }

src/Liquid.Repository.OData/Liquid.Repository.OData.csproj

@@ -13,7 +13,7 @@
 	  <Copyright>Avanade 2019</Copyright>
 	  <PackageProjectUrl>https://github.com/Avanade/Liquid-Application-Framework</PackageProjectUrl>
 	  <PackageIcon>logo.png</PackageIcon>
-	  <Version>8.0.0-beta-02</Version>
+	  <Version>8.0.0-beta-03</Version>
 	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	  <IsPackable>true</IsPackable>
 	  <DebugType>Full</DebugType>

src/Liquid.Repository.OData/ODataClientFactory.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Options;
+using Liquid.Core.Interfaces;
+using Microsoft.Extensions.Options;
 using Simple.OData.Client;
 
 namespace Liquid.Repository.OData
@@ -7,19 +8,30 @@ namespace Liquid.Repository.OData
     public class ODataClientFactory : IODataClientFactory
     {
         private readonly IOptions<ODataOptions> _options;
+        private readonly ILiquidContext _context;
 
         /// <summary>
         /// Initialize a new instance of <see cref="ODataClientFactory"/>
         /// </summary>
         /// <param name="options"></param>
-        public ODataClientFactory(IOptions<ODataOptions> options)
+        /// <param name="context"></param>
+        public ODataClientFactory(IOptions<ODataOptions> options, ILiquidContext context)
         {
             _options = options ?? throw new ArgumentNullException(nameof(options));
+            _context = context ?? throw new ArgumentNullException(nameof(context));
         }
 
         ///<inheritdoc/>
-        public IODataClient CreateODataClientAsync(string entityName, string token)
+        public IODataClient CreateODataClientAsync(string entityName)
         {
+            var token = _context.Get("OdataToken").ToString();
+
+            if (string.IsNullOrEmpty(token))
+            {
+                throw new InvalidOperationException("Token is required to perform this operation. The 'OdataToken' variable" +
+                    " must be declared in the LiquidContext service.");
+            }
+
             var settings = _options?.Value?.Settings.FirstOrDefault(x => x.EntityName == entityName);
 
             if (settings == null)

src/Liquid.Repository.OData/ODataRepository.cs

@@ -1,6 +1,5 @@
 using Liquid.Core.Entities;
 using Liquid.Core.Interfaces;
-using Simple.OData.Client;
 using System.Linq.Expressions;
 
 namespace Liquid.Repository.OData
@@ -13,7 +12,6 @@ namespace Liquid.Repository.OData
 
         private readonly IODataClientFactory _clientFactory;
         private readonly string _entityName;
-        private string _token;
 
         /// <summary>
         /// Initialize a new instance of <see cref="ODataRepository{TEntity, TIdentifier}"/>
@@ -27,88 +25,51 @@ public ODataRepository(IODataClientFactory clientFactory, string entityName)
             _entityName = entityName ?? throw new ArgumentNullException(nameof(entityName));
         }
 
-        /// <summary>
-        /// Set the token to perform operations.
-        /// </summary>
-        /// <param name="token">Token to be set.</param>
-        public void SetToken(string token)
-        {
-            _token = token;
-        }
 
         ///<inheritdoc/>
         public async Task AddAsync(TEntity entity)
-        {
-            if (string.IsNullOrEmpty(_token))
-            {
-                throw new InvalidOperationException("Token is required to perform this operation.");
-            }
-
-            var client = _clientFactory.CreateODataClientAsync(_entityName, _token);
+        {   
+            var client = _clientFactory.CreateODataClientAsync(_entityName);
 
             await client.For<TEntity>().Set(entity).InsertEntryAsync();
         }
 
         ///<inheritdoc/>
         public async Task<IEnumerable<TEntity>> FindAllAsync()
         {
-            if (string.IsNullOrEmpty(_token))
-            {
-                throw new InvalidOperationException("Token is required to perform this operation.");
-            }
-
-            var client = _clientFactory.CreateODataClientAsync(_entityName, _token);
+            var client = _clientFactory.CreateODataClientAsync(_entityName);
 
             return await client.For<TEntity>().FindEntriesAsync();
         }
 
         ///<inheritdoc/>
         public async Task<TEntity> FindByIdAsync(TIdentifier id)
         {
-            if (string.IsNullOrEmpty(_token))
-            {
-                throw new InvalidOperationException("Token is required to perform this operation.");
-            }
-            var client = _clientFactory.CreateODataClientAsync(_entityName, _token);
+            var client = _clientFactory.CreateODataClientAsync(_entityName);
 
             return await client.For<TEntity>().Key(id).FindEntryAsync();
         }
 
         ///<inheritdoc/>
         public async Task RemoveByIdAsync(TIdentifier id)
         {
-            if (string.IsNullOrEmpty(_token))
-            {
-                throw new InvalidOperationException("Token is required to perform this operation.");
-            }
-
-            var client = _clientFactory.CreateODataClientAsync(_entityName, _token);
+            var client = _clientFactory.CreateODataClientAsync(_entityName);
 
             await client.For<TEntity>().Key(id).DeleteEntryAsync();
         }
 
         ///<inheritdoc/>
         public async Task UpdateAsync(TEntity entity)
         {
-            if (string.IsNullOrEmpty(_token))
-            {
-                throw new InvalidOperationException("Token is required to perform this operation.");
-            }
-
-            var client = _clientFactory.CreateODataClientAsync(_entityName, _token);
+            var client = _clientFactory.CreateODataClientAsync(_entityName);
 
             await client.For<TEntity>().Set(entity).UpdateEntryAsync();
         }
 
         ///<inheritdoc/>
         public async Task<IEnumerable<TEntity>> WhereAsync(Expression<Func<TEntity, bool>> whereClause)
         {
-            if (string.IsNullOrEmpty(_token))
-            {
-                throw new InvalidOperationException("Token is required to perform this operation.");
-            }
-
-            var client = _clientFactory.CreateODataClientAsync(_entityName, _token);
+            var client = _clientFactory.CreateODataClientAsync(_entityName);
 
             return await client.For<TEntity>().Filter(whereClause).FindEntriesAsync();
         }

test/Liquid.Repository.OData.Tests/IServiceCollectionExtensionTests.cs

@@ -1,4 +1,5 @@
-using Liquid.Core.Interfaces;
+using Liquid.Core.Implementations;
+using Liquid.Core.Interfaces;
 using Liquid.Repository.OData.Extensions;
 using Liquid.Repository.OData.Tests.Mock;
 using Microsoft.Extensions.Configuration;

test/Liquid.Repository.OData.Tests/ODataClientFactoryTests.cs

@@ -1,3 +1,4 @@
+using Liquid.Core.Interfaces;
 using Microsoft.Extensions.Options;
 using NSubstitute;
 
@@ -7,6 +8,7 @@ public class ODataClientFactoryTests
     {
         private IODataClientFactory _sut;
         private IOptions<ODataOptions> _options;
+        private ILiquidContext _context;
 
         public ODataClientFactoryTests()
         {
@@ -26,26 +28,29 @@ public ODataClientFactoryTests()
 
             _options.Value.Returns(settings);
 
-            _sut = new ODataClientFactory(_options);
+            _context = Substitute.For<ILiquidContext>();
+            _context.Get("OdataToken").Returns("token");
+
+            _sut = new ODataClientFactory(_options, _context);
         }
 
 
         [Fact]
         public void ODataClientFactory_WhenEntityNameIsNotFound_ThrowException()
         {
-            Assert.Throws<ArgumentOutOfRangeException>(() => _sut.CreateODataClientAsync("TestEntities2", "token"));
+            Assert.Throws<ArgumentOutOfRangeException>(() => _sut.CreateODataClientAsync("TestEntities2"));
         }
 
         [Fact]
         public void ODataClientFactory_WhenEntityNameIsNull_ThrowException()
         {
-            Assert.Throws<ArgumentOutOfRangeException>(() => _sut.CreateODataClientAsync(null, "token"));
+            Assert.Throws<ArgumentOutOfRangeException>(() => _sut.CreateODataClientAsync(null));
         }
 
         [Fact]
         public void OdataClientFactory_WhenValidateCertIsFalse_ReturnClient()
         {
-            var client = _sut.CreateODataClientAsync("TestEntities", "token");
+            var client = _sut.CreateODataClientAsync("TestEntities");
 
             Assert.NotNull(client);
         }
@@ -65,12 +70,44 @@ public void OdataClientFactory_WhenValidateCertIsTrue_ReturnClient()
                 Settings = new List<ODataSettings>() { settings }
             });
 
-            var sut = new ODataClientFactory(_options);
+            var sut = new ODataClientFactory(_options, _context);
 
-            var client = sut.CreateODataClientAsync("TestEntities", "token");
+            var client = sut.CreateODataClientAsync("TestEntities");
 
             Assert.NotNull(client);
         }
 
+        [Fact]
+        public void OdataClientFactory_WhenTokenIsNotSet_ThrowException()
+        {
+            _context.Get("OdataToken").Returns("");
+
+            Assert.Throws<InvalidOperationException>(() => _sut.CreateODataClientAsync("TestEntities"));
+        }
+        [Fact]
+        public void OdataClientFactory_WhenTokenIsNull_ThrowException()
+        {
+            var context = Substitute.For<ILiquidContext>(); 
+
+            var sut = new ODataClientFactory(_options, context);
+
+            Assert.Throws<NullReferenceException>(() => sut.CreateODataClientAsync("TestEntities"));
+        }
+
+        [Fact]
+        public void OdataClientFactory_WhenOptionsIsNull_ThrowException()
+        {
+            _options = null;
+
+            Assert.Throws<ArgumentNullException>(() => new ODataClientFactory(_options, _context));
+        }
+
+        [Fact]
+        public void OdataClientFactory_WhenContextIsNull_ThrowException()
+        {
+            _context = null;
+
+            Assert.Throws<ArgumentNullException>(() => new ODataClientFactory(_options, _context));
+        }
     }
 }