fix(ODataClientFactory)

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-03</Version>
+	  <Version>8.0.0-beta-04</Version>
 	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	  <IsPackable>true</IsPackable>
 	  <DebugType>Full</DebugType>
@@ -31,8 +31,8 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Liquid.Core" Version="8.0.0-beta-06" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+    <PackageReference Include="Liquid.Core" Version="8.0.0-beta-07" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
     <PackageReference Include="Simple.OData.Client" Version="6.0.1" />
   </ItemGroup>
 

src/Liquid.Repository.OData/ODataClientFactory.cs

@@ -24,15 +24,16 @@
         ///<inheritdoc/>
         public IODataClient CreateODataClientAsync(string entityName)
         {
-            var token = _context.Get("OdataToken").ToString();
+            var hasToken = _context.current.ContainsKey("OdataToken");
+            var token = _context.Get("OdataToken")?.ToString();
 
-            if (string.IsNullOrEmpty(token))
+            if (!hasToken || string.IsNullOrEmpty(token))
             {
-                throw new InvalidOperationException("Token is required to perform this operation. The 'OdataToken' variable" +
-                    " must be declared in the LiquidContext service.");
+                throw new KeyNotFoundException("Token is required to perform this operation. The 'OdataToken' " +
+                    "key was not found in the context.");
             }
 
             var settings = _options?.Value?.Settings.FirstOrDefault(x => x.EntityName == entityName);
 
             if (settings == null)
                 throw new ArgumentOutOfRangeException(nameof(entityName));
@@ -50,7 +51,7 @@
         /// <returns></returns>
         private static ODataClientSettings GetODataSettings(ODataSettings? settings, string token)
         {
             var odataSettings = new ODataClientSettings(new Uri(settings.BaseUrl));
 
             odataSettings.BeforeRequest = (message) =>
             {
@@ -59,11 +60,11 @@
 
             if (!settings.ValidateCert)
             {
                 var handler = new HttpClientHandler();
 
                 odataSettings.OnApplyClientHandler = (handler) =>
                 {
                     handler.ServerCertificateCustomValidationCallback +=
                                 (sender, certificate, chain, errors) =>
                                 {
                                     return true;

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

@@ -30,6 +30,7 @@ public ODataClientFactoryTests()
 
             _context = Substitute.For<ILiquidContext>();
             _context.Get("OdataToken").Returns("token");
+            _context.current.ContainsKey("OdataToken").Returns(true);
 
             _sut = new ODataClientFactory(_options, _context);
         }
@@ -80,18 +81,27 @@ public void OdataClientFactory_WhenValidateCertIsTrue_ReturnClient()
         [Fact]
         public void OdataClientFactory_WhenTokenIsNotSet_ThrowException()
         {
-            _context.Get("OdataToken").Returns("");
+            var context = Substitute.For<ILiquidContext>();
 
-            Assert.Throws<InvalidOperationException>(() => _sut.CreateODataClientAsync("TestEntities"));
+            context.Get("OdataToken").Returns("");
+            context.current.ContainsKey("OdataToken").Returns(true);
+
+            var sut = new ODataClientFactory(_options, context);
+
+            Assert.Throws<KeyNotFoundException>(() => sut.CreateODataClientAsync("TestEntities"));
         }
+
         [Fact]
-        public void OdataClientFactory_WhenTokenIsNull_ThrowException()
+        public void OdataClientFactory_WhenTokenIsNotSetInContext_ThrowException()
         {
-            var context = Substitute.For<ILiquidContext>(); 
+            var context = Substitute.For<ILiquidContext>();
+
+            context.Get("OdataToken").Returns(null);
+            context.current.ContainsKey("OdataToken").Returns(false);
 
             var sut = new ODataClientFactory(_options, context);
 
-            Assert.Throws<NullReferenceException>(() => sut.CreateODataClientAsync("TestEntities"));
+            Assert.Throws<KeyNotFoundException>(() => sut.CreateODataClientAsync("TestEntities"));
         }
 
         [Fact]