Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Okta.Xamarin/Okta.Xamarin/OktaConfigValidator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ public void Validate(IOktaConfig config)

if (config.OktaDomain.IndexOf("-admin.oktapreview.com", StringComparison.OrdinalIgnoreCase) >= 0 ||
config.OktaDomain.IndexOf("-admin.okta.com", StringComparison.OrdinalIgnoreCase) >= 0 ||
config.OktaDomain.IndexOf("-admin.okta-emea.com", StringComparison.OrdinalIgnoreCase) >= 0)
config.OktaDomain.IndexOf("-admin.okta-emea.com", StringComparison.OrdinalIgnoreCase) >= 0 ||
config.OktaDomain.IndexOf("-admin.trex-govcloud.com", StringComparison.OrdinalIgnoreCase) >= 0 ||
config.OktaDomain.IndexOf("-admin.okta-gov.com", StringComparison.OrdinalIgnoreCase) >= 0 ||
config.OktaDomain.IndexOf("-admin.okta.mil", StringComparison.OrdinalIgnoreCase) >= 0 ||
config.OktaDomain.IndexOf("-admin.okta-miltest.com", StringComparison.OrdinalIgnoreCase) >= 0)
{
throw new ArgumentException(
$"Your Okta domain should not contain -admin. Current value: {config.OktaDomain}. You can copy your domain from the Okta Developer Console. Follow these instructions to find it: https://bit.ly/finding-okta-domain", nameof(config.OktaDomain));
Expand Down
26 changes: 26 additions & 0 deletions Okta.Xamarin/Tests/Okta.Xamarin.Test/OktaConfigShould.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,19 @@ public void ConfigValidatorPassesWhenValid()
new OktaConfig("testoktaid", "https://okta.okta.com", "appid:/redirect", "appid:/logout")
{ ClockSkew = TimeSpan.FromSeconds(100), Scope = "test1 test2" });

// Test new TLD support
validator.Validate(
new OktaConfig("testoktaid", "https://dev-00000.trex-govcloud.com", "com.test:/redirect", "com.test:/logout"));

validator.Validate(
new OktaConfig("testoktaid", "https://dev-00000.okta-gov.com", "com.test:/redirect", "com.test:/logout"));

validator.Validate(
new OktaConfig("testoktaid", "https://dev-00000.okta.mil", "com.test:/redirect", "com.test:/logout"));

validator.Validate(
new OktaConfig("testoktaid", "https://dev-00000.okta-miltest.com", "com.test:/redirect", "com.test:/logout"));

// The validator throws an exception when the config is invalid, so if we got here without an exception then the configs are valid.
}

Expand Down Expand Up @@ -67,6 +80,19 @@ public void ConfigValidatorCatchesInvalidDomain()
Assert.Throws<ArgumentException>(() =>
validator.Validate(new OktaConfig("testoktaid", "https://dev-00000-admin.oktapreview.com", "com.test:/redirect", "com.test:/logout")));

// Test that admin domains are caught for new TLDs
Assert.Throws<ArgumentException>(() =>
validator.Validate(new OktaConfig("testoktaid", "https://dev-00000-admin.trex-govcloud.com", "com.test:/redirect", "com.test:/logout")));

Assert.Throws<ArgumentException>(() =>
validator.Validate(new OktaConfig("testoktaid", "https://dev-00000-admin.okta-gov.com", "com.test:/redirect", "com.test:/logout")));

Assert.Throws<ArgumentException>(() =>
validator.Validate(new OktaConfig("testoktaid", "https://dev-00000-admin.okta.mil", "com.test:/redirect", "com.test:/logout")));

Assert.Throws<ArgumentException>(() =>
validator.Validate(new OktaConfig("testoktaid", "https://dev-00000-admin.okta-miltest.com", "com.test:/redirect", "com.test:/logout")));

Assert.Throws<ArgumentException>(() =>
validator.Validate(new OktaConfig("testoktaid", "https://{yourOktaDomain}", "com.test:/redirect", "com.test:/logout")));

Expand Down
Loading