Merge pull request #24 from okta/nb-final-cleanup-1.0

Final cleanup for 1.0
okta · Jun 27, 2018 · 5a2f459 · 5a2f459
2 parents 8f3ccec + 92a839a
commit 5a2f459
Show file tree

Hide file tree

Showing 35 changed files with 768 additions and 207 deletions.
diff --git a/Okta.AspNet.Abstractions.Test/MockOktaOptionsValidator.cs b/Okta.AspNet.Abstractions.Test/MockOktaOptionsValidator.cs
diff --git a/Okta.AspNet.Abstractions.Test/Okta.AspNet.Abstractions.Test.csproj b/Okta.AspNet.Abstractions.Test/Okta.AspNet.Abstractions.Test.csproj
@@ -7,14 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
     <PackageReference Include="FluentAssertions" Version="5.3.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
-  </ItemGroup>
-
-  <ItemGroup>
     <ProjectReference Include="..\Okta.AspNet.Abstractions\Okta.AspNet.Abstractions.csproj" />
     <PackageReference Include="AsyncUsageAnalyzers" Version="1.0.0-alpha003" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta007" />

diff --git a/Okta.AspNet.Abstractions.Test/OktaOptionsValidatorHelper.cs b/Okta.AspNet.Abstractions.Test/OktaOptionsValidatorHelper.cs
diff --git a/...ctions.Test/OktaOptionsValidatorShould.cs → ...ons.Test/OktaWebOptionsValidatorShould.cs b/...ctions.Test/OktaOptionsValidatorShould.cs → ...ons.Test/OktaWebOptionsValidatorShould.cs
@@ -1,4 +1,4 @@
-// <copyright file="OktaOptionsValidatorShould.cs" company="Okta, Inc">
+// <copyright file="OktaWebOptionsValidatorShould.cs" company="Okta, Inc">
 // Copyright (c) 2018-present Okta, Inc. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 // </copyright>
@@ -9,36 +9,38 @@
 
 namespace Okta.AspNet.Abstractions.Test
 {
-    public class OktaOptionsValidatorShould
+    public class OktaWebOptionsValidatorShould
     {
+        public const string ValidOktaDomain = "https://myOktaDomain.oktapreview.com";
+
         [Theory]
         [InlineData(null)]
         [InlineData("")]
         public void FailWhenClientIdIsNullOrEmpty(string clientId)
         {
-            var options = new OktaOptions()
+            var options = new OktaWebOptions()
             {
-                OktaDomain = OktaOptionsValidatorHelper.ValidOktaDomain,
+                OktaDomain = ValidOktaDomain,
                 ClientId = clientId,
             };
 
-            Action action = () => new MockOktaOptionsValidator().Validate(options);
-            action.Should().Throw<ArgumentNullException>().Where(e => e.ParamName == nameof(OktaOptions.ClientId));
+            Action action = () => new OktaWebOptionsValidator<OktaWebOptions>().Validate(options);
+            action.Should().Throw<ArgumentNullException>().Where(e => e.ParamName == nameof(OktaWebOptions.ClientId));
         }
 
         [Theory]
         [InlineData(null)]
         [InlineData("")]
         public void FailIfOktaDomainIsNullOrEmpty(string oktaDomain)
         {
-            var options = new OktaOptions()
+            var options = new OktaWebOptions()
             {
                 OktaDomain = oktaDomain,
                 ClientId = "ClientId",
             };
 
-            Action action = () => new MockOktaOptionsValidator().Validate(options);
-            action.Should().Throw<ArgumentNullException>().Where(e => e.ParamName == nameof(OktaOptions.OktaDomain));
+            Action action = () => new OktaWebOptionsValidator<OktaWebOptions>().Validate(options);
+            action.Should().Throw<ArgumentNullException>().Where(e => e.ParamName == nameof(OktaWebOptions.OktaDomain));
         }
 
         [Theory]
@@ -47,14 +49,14 @@ public void FailIfOktaDomainIsNullOrEmpty(string oktaDomain)
         [InlineData("invalidOktaDomain")]
         public void FailIfOktaDomainIsNotStartingWithHttps(string oktaDomain)
         {
-            var options = new OktaMvcOptions()
+            var options = new OktaWebOptions()
             {
                 OktaDomain = oktaDomain,
                 ClientId = "ClientId",
             };
 
-            Action action = () => new MockOktaOptionsValidator().Validate(options);
-            action.Should().Throw<ArgumentException>().Where(e => e.ParamName == nameof(OktaOptions.OktaDomain));
+            Action action = () => new OktaWebOptionsValidator<OktaWebOptions>().Validate(options);
+            action.Should().Throw<ArgumentException>().Where(e => e.ParamName == nameof(OktaWebOptions.OktaDomain));
         }
 
         [Theory]
@@ -63,40 +65,40 @@ public void FailIfOktaDomainIsNotStartingWithHttps(string oktaDomain)
         [InlineData("https://{YourOktaDomain}")]
         public void FailIfOktaDomainIsNotDefined(string oktaDomain)
         {
-            var options = new OktaMvcOptions()
+            var options = new OktaWebOptions()
             {
                 OktaDomain = oktaDomain,
                 ClientId = "ClientId",
             };
 
-            Action action = () => new MockOktaOptionsValidator().Validate(options);
-            action.Should().Throw<ArgumentException>().Where(e => e.ParamName == nameof(OktaOptions.OktaDomain));
+            Action action = () => new OktaWebOptionsValidator<OktaWebOptions>().Validate(options);
+            action.Should().Throw<ArgumentException>().Where(e => e.ParamName == nameof(OktaWebOptions.OktaDomain));
         }
 
         [Fact]
         public void FailIfOktaDomainIsIncludingAdmin()
         {
-            var options = new OktaMvcOptions()
+            var options = new OktaWebOptions()
             {
                 OktaDomain = "https://myOktaOrg-admin.oktapreview.com",
                 ClientId = "ClientId",
             };
 
-            Action action = () => new MockOktaOptionsValidator().Validate(options);
-            action.Should().Throw<ArgumentException>().Where(e => e.ParamName == nameof(OktaOptions.OktaDomain));
+            Action action = () => new OktaWebOptionsValidator<OktaWebOptions>().Validate(options);
+            action.Should().Throw<ArgumentException>().Where(e => e.ParamName == nameof(OktaWebOptions.OktaDomain));
         }
 
         [Fact]
         public void FailIfOktaDomainHasTypo()
         {
-            var options = new OktaMvcOptions()
+            var options = new OktaWebOptions()
             {
                 OktaDomain = "https://myOktaDomain.oktapreview.com.com",
                 ClientId = "ClientId",
             };
 
-            Action action = () => new MockOktaOptionsValidator().Validate(options);
-            action.Should().Throw<ArgumentException>().Where(e => e.ParamName == nameof(OktaOptions.OktaDomain));
+            Action action = () => new OktaWebOptionsValidator<OktaWebOptions>().Validate(options);
+            action.Should().Throw<ArgumentException>().Where(e => e.ParamName == nameof(OktaWebOptions.OktaDomain));
         }
     }
 }