Merge branch 'Release/1.6.0'

getyoti · Mar 23, 2021 · 04d5b1d · 04d5b1d
2 parents 171ad52 + 4b9d54a
commit 04d5b1d
Show file tree

Hide file tree

Showing 14 changed files with 96 additions and 20 deletions.
diff --git a/Examples/Yoti.Auth.Sandbox.Examples/ProfileSandboxExample.cs b/Examples/Yoti.Auth.Sandbox.Examples/ProfileSandboxExample.cs
@@ -92,4 +92,4 @@ public void TestProfile()
             Assert.AreEqual("some@email", activityDetails.Profile.EmailAddress.GetValue());
         }
     }
-}
+}
diff --git a/Examples/Yoti.Auth.Sandbox.Examples/Yoti.Auth.Sandbox.Examples.csproj b/Examples/Yoti.Auth.Sandbox.Examples/Yoti.Auth.Sandbox.Examples.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Yoti.Auth.Sandbox.Tests/DocScan/Request/Check/SandboxThirdPartyIdentityCheckBuilderTests.cs b/Yoti.Auth.Sandbox.Tests/DocScan/Request/Check/SandboxThirdPartyIdentityCheckBuilderTests.cs
@@ -0,0 +1,25 @@
+using System;
+using Xunit;
+using Yoti.Auth.Sandbox.DocScan.Request.Check;
+using Yoti.Auth.Sandbox.DocScan.Request.Check.Report;
+
+namespace Yoti.Auth.Sandbox.Tests.DocScan.Request.Check
+{
+    public class SandboxThirdPartyIdentityCheckBuilderTests
+    {
+        private readonly SandboxBreakdown _someBreakDown = new SandboxBreakdown("someSubCheck", "someResult", details: null);
+
+        [Fact]
+        public void ShouldNotBuildWithoutRecommendation()
+        {
+            var exception = Assert.Throws<ArgumentNullException>(() =>
+            {
+                new SandboxDocumentFaceMatchCheckBuilder()
+                .WithBreakdown(_someBreakDown)
+                .Build();
+            });
+
+            Assert.Contains("Recommendation", exception.Message, StringComparison.Ordinal);
+        }
+    }
+}
diff --git a/Yoti.Auth.Sandbox.Tests/DocScan/Request/Task/SandboxDocumentTextDataExtractionReasonTests.cs b/Yoti.Auth.Sandbox.Tests/DocScan/Request/Task/SandboxDocumentTextDataExtractionReasonTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using Xunit;
 using Yoti.Auth.Sandbox.DocScan.Request.Task;
 

diff --git a/Yoti.Auth.Sandbox.Tests/DocScan/Request/Task/SandboxTaskResultsBuilderTests.cs b/Yoti.Auth.Sandbox.Tests/DocScan/Request/Task/SandboxTaskResultsBuilderTests.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using Xunit;
 using Yoti.Auth.Sandbox.DocScan.Request.Task;
 

diff --git a/Yoti.Auth.Sandbox.Tests/DocScan/SandboxCheckReportsBuilderTests.cs b/Yoti.Auth.Sandbox.Tests/DocScan/SandboxCheckReportsBuilderTests.cs
@@ -64,6 +64,13 @@ public static void BuilderShouldBuildWithAllArguments()
                         .WithValue("APPROVE")
                         .Build())
                     .Build())
+                  .WithThirdPartyIdentityCheck(
+                    new SandboxThirdPartyIdentityCheckBuilder()
+                    .WithRecommendation(
+                        new SandboxRecommendationBuilder()
+                        .WithValue("APPROVE")
+                        .Build())
+                    .Build())
                 .Build();
 
             Assert.Equal(10, sandboxCheckReport.AsyncReportDelay);

diff --git a/Yoti.Auth.Sandbox.Tests/DocScan/SandboxCheckReportsTests.cs b/Yoti.Auth.Sandbox.Tests/DocScan/SandboxCheckReportsTests.cs
@@ -2,6 +2,7 @@
 using Xunit;
 using Yoti.Auth.Sandbox.DocScan.Request;
 using Yoti.Auth.Sandbox.DocScan.Request.Check;
+using Yoti.Auth.Sandbox.DocScan.Request.Check.Report;
 
 namespace Yoti.Auth.Sandbox.Tests.DocScan
 {
@@ -10,14 +11,20 @@ public static class SandboxCheckReportTests
         [Fact]
         public static void ShouldCreateWithAllArgs()
         {
+            var recommendation = new SandboxRecommendation("someValue", "someReason", "someRecoverySuggestion");
+            var sandboxThirdPartyIdentityCheck = new SandboxThirdPartyIdentityCheckBuilder()
+                .WithRecommendation(recommendation)
+                .Build();
+
             var sandboxCheckReport = new SandboxCheckReports(
                 new List<SandboxDocumentTextDataCheck>(),
                 new List<SandboxDocumentAuthenticityCheck>(),
                 new List<SandboxLivenessCheck>(),
                 new List<SandboxDocumentFaceMatchCheck>(),
                 10,
                 new List<SandboxIdDocumentComparisonCheck>(),
-                new List<SandboxSupplementaryDocTextDataCheck>());
+                new List<SandboxSupplementaryDocTextDataCheck>(),
+                sandboxThirdPartyIdentityCheck);
 
             Assert.NotNull(sandboxCheckReport.TextDataCheck);
             Assert.NotNull(sandboxCheckReport.DocumentAuthenticityCheck);
@@ -26,6 +33,7 @@ public static void ShouldCreateWithAllArgs()
             Assert.Equal(10, sandboxCheckReport.AsyncReportDelay);
             Assert.NotNull(sandboxCheckReport.IdDocumentComparisonChecks);
             Assert.NotNull(sandboxCheckReport.SupplementaryDocTextDataChecks);
+            Assert.NotNull(sandboxCheckReport.ThirdPartyIdentityCheck);
         }
 
         [Fact]
@@ -45,6 +53,7 @@ public static void ShouldCreateWithoutOptionals()
             Assert.Equal(10, sandboxCheckReport.AsyncReportDelay);
             Assert.Empty(sandboxCheckReport.IdDocumentComparisonChecks);
             Assert.Empty(sandboxCheckReport.SupplementaryDocTextDataChecks);
+            Assert.Null(sandboxCheckReport.ThirdPartyIdentityCheck);
         }
     }
 }
diff --git a/Yoti.Auth.Sandbox.Tests/Yoti.Auth.Sandbox.Tests.csproj b/Yoti.Auth.Sandbox.Tests/Yoti.Auth.Sandbox.Tests.csproj
@@ -16,16 +16,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+    <PackageReference Include="coverlet.msbuild" Version="3.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="Moq" Version="4.14.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Moq" Version="4.15.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

diff --git a/Yoti.Auth.Sandbox/DocScan/Request/Check/SandboxThirdPartyIdentityCheck.cs b/Yoti.Auth.Sandbox/DocScan/Request/Check/SandboxThirdPartyIdentityCheck.cs
@@ -0,0 +1,10 @@
+namespace Yoti.Auth.Sandbox.DocScan.Request.Check
+{
+    public class SandboxThirdPartyIdentityCheck : SandboxCheck
+    {
+        public SandboxThirdPartyIdentityCheck(SandboxCheckResult result)
+            : base(result)
+        {
+        }
+    }
+}
diff --git a/Yoti.Auth.Sandbox/DocScan/Request/Check/SandboxThirdPartyIdentityCheckBuilder.cs b/Yoti.Auth.Sandbox/DocScan/Request/Check/SandboxThirdPartyIdentityCheckBuilder.cs
@@ -0,0 +1,16 @@
+namespace Yoti.Auth.Sandbox.DocScan.Request.Check
+{
+    public class SandboxThirdPartyIdentityCheckBuilder
+        : SandboxCheckBuilder<SandboxThirdPartyIdentityCheckBuilder, SandboxThirdPartyIdentityCheck>
+    {
+        public override SandboxThirdPartyIdentityCheck Build()
+        {
+            Validation.NotNull(Recommendation, nameof(Recommendation));
+
+            SandboxCheckReport report = new SandboxCheckReport(Recommendation, Breakdown);
+            SandboxCheckResult result = new SandboxCheckResult(report);
+
+            return new SandboxThirdPartyIdentityCheck(result);
+        }
+    }
+}
diff --git a/Yoti.Auth.Sandbox/DocScan/Request/SandboxCheckReports.cs b/Yoti.Auth.Sandbox/DocScan/Request/SandboxCheckReports.cs
@@ -13,7 +13,8 @@ public SandboxCheckReports(
             List<SandboxDocumentFaceMatchCheck> documentFaceMatchChecks,
             int? asyncReportDelay,
             List<SandboxIdDocumentComparisonCheck> idDocumentComparisonChecks = null,
-            List<SandboxSupplementaryDocTextDataCheck> supplementaryDocTextDataChecks = null)
+            List<SandboxSupplementaryDocTextDataCheck> supplementaryDocTextDataChecks = null,
+            SandboxThirdPartyIdentityCheck thirdPartyIdentityCheck = null)
         {
             if (idDocumentComparisonChecks == null)
             {
@@ -31,6 +32,7 @@ public SandboxCheckReports(
             DocumentFaceMatchCheck = documentFaceMatchChecks;
             IdDocumentComparisonChecks = idDocumentComparisonChecks;
             SupplementaryDocTextDataChecks = supplementaryDocTextDataChecks;
+            ThirdPartyIdentityCheck = thirdPartyIdentityCheck;
             AsyncReportDelay = asyncReportDelay;
         }
 
@@ -52,6 +54,9 @@ public SandboxCheckReports(
         [JsonProperty(PropertyName = "SUPPLEMENTARY_DOCUMENT_TEXT_DATA_CHECK")]
         public List<SandboxSupplementaryDocTextDataCheck> SupplementaryDocTextDataChecks { get; }
 
+        [JsonProperty(PropertyName = "THIRD_PARTY_IDENTITY")]
+        public SandboxThirdPartyIdentityCheck ThirdPartyIdentityCheck { get; }
+
         [JsonProperty(PropertyName = "async_report_delay")]
         public int? AsyncReportDelay { get; }
     }

diff --git a/Yoti.Auth.Sandbox/DocScan/Request/SandboxCheckReportsBuilder.cs b/Yoti.Auth.Sandbox/DocScan/Request/SandboxCheckReportsBuilder.cs
@@ -11,6 +11,7 @@ public class SandboxCheckReportsBuilder
         private readonly List<SandboxDocumentFaceMatchCheck> _documentFaceMatchChecks;
         private readonly List<SandboxIdDocumentComparisonCheck> _idDocumentComparisonChecks;
         private readonly List<SandboxSupplementaryDocTextDataCheck> _supplementaryDocTextDataChecks;
+        private SandboxThirdPartyIdentityCheck _thirdPartyIdentityCheck;
         private int? _asyncReportDelay;
 
         public SandboxCheckReportsBuilder()
@@ -60,6 +61,12 @@ public SandboxCheckReportsBuilder WithSupplementaryDocTextDataCheck(SandboxSuppl
             return this;
         }
 
+        public SandboxCheckReportsBuilder WithThirdPartyIdentityCheck(SandboxThirdPartyIdentityCheck sandboxThirdPartyIdentityCheck)
+        {
+            _thirdPartyIdentityCheck = sandboxThirdPartyIdentityCheck;
+            return this;
+        }
+
         public SandboxCheckReportsBuilder WithAsyncReportDelay(int asyncReportDelay)
         {
             _asyncReportDelay = asyncReportDelay;
@@ -75,7 +82,8 @@ public SandboxCheckReports Build()
                 _documentFaceMatchChecks,
                 _asyncReportDelay,
                 _idDocumentComparisonChecks,
-                _supplementaryDocTextDataChecks);
+                _supplementaryDocTextDataChecks,
+                _thirdPartyIdentityCheck);
         }
     }
 }
diff --git a/Yoti.Auth.Sandbox/Yoti.Auth.Sandbox.csproj b/Yoti.Auth.Sandbox/Yoti.Auth.Sandbox.csproj
@@ -12,7 +12,7 @@
     <PackageId>Yoti.Sandbox</PackageId>
     <PackageProjectUrl>https://developers.yoti.com/yoti-app/web-integration</PackageProjectUrl>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>1.5.0</Version>
+    <Version>1.6.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,16 +29,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.14.0.22654">
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.18.0.27296">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Yoti" Version="3.7.0" />
+    <PackageReference Include="Yoti" Version="3.8.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -27,7 +27,7 @@ steps:
     scannerMode: 'MSBuild'
     projectKey: 'getyoti:dotnet-sandbox'
     projectName: '.NET SDK Sandbox'
-    projectVersion: '1.5.0'
+    projectVersion: '1.6.0'
     extraProperties: |
       sonar.cs.opencover.reportsPaths="**/coverage.opencover.xml"
       sonar.links.scm = https://github.com/getyoti/yoti-dotnet-sdk-sandbox
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,4 +92,4 @@ public void TestProfile() @@
                 Assert.AreEqual("some@email", activityDetails.Profile.EmailAddress.GetValue());
             }
         }
-    }
+    }