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
4 changes: 4 additions & 0 deletions openapi3/management-noEnums.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ servers:
- okta.com
- oktapreview.com
- okta-emea.com
- okta-gov.com
- okta.mil
- okta-miltest.com
- trex-govcloud.com
default: okta.com
description: The okta domain of your organization.
- url: https://{customDomain}
Expand Down
2 changes: 1 addition & 1 deletion openapi3/management.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ servers:
variables:
yourOktaDomain:
default: subdomain.okta.com
description: The domain of your organization. This can be a provided subdomain of an official okta domain (okta.com, oktapreview.com, etc) or one of your configured custom domains.
description: The domain of your organization. This can be a provided subdomain of an official okta domain (okta.com, oktapreview.com, okta-gov.com, okta.mil, okta-miltest.com, trex-govcloud.com, etc) or one of your configured custom domains.
tags:
- name: AgentPools
x-displayName: Agent Pools
Expand Down
6 changes: 5 additions & 1 deletion openapi3/templates/Configuration.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,11 @@ namespace {{packageName}}.Client
if (configuration.OktaDomain.IndexOf("-admin.okta.com", StringComparison.OrdinalIgnoreCase) >= 0 ||
configuration.OktaDomain.IndexOf("-admin.oktapreview.com", StringComparison.OrdinalIgnoreCase) >=
0 ||
configuration.OktaDomain.IndexOf("-admin.okta-emea.com", StringComparison.OrdinalIgnoreCase) >= 0)
configuration.OktaDomain.IndexOf("-admin.okta-emea.com", StringComparison.OrdinalIgnoreCase) >= 0 ||
configuration.OktaDomain.IndexOf("-admin.okta-gov.com", StringComparison.OrdinalIgnoreCase) >= 0 ||
configuration.OktaDomain.IndexOf("-admin.okta.mil", StringComparison.OrdinalIgnoreCase) >= 0 ||
configuration.OktaDomain.IndexOf("-admin.okta-miltest.com", StringComparison.OrdinalIgnoreCase) >= 0 ||
configuration.OktaDomain.IndexOf("-admin.trex-govcloud.com", StringComparison.OrdinalIgnoreCase) >= 0)
{
throw new ArgumentNullException(nameof(configuration.OktaDomain),
$"Your Okta domain should not contain -admin. Current value: {configuration.OktaDomain}. You can copy your domain from the Okta Developer Console. Follow these instructions to find it: https://bit.ly/finding-okta-domain");
Expand Down
19 changes: 19 additions & 0 deletions src/Okta.Sdk.UnitTest/Client/OktaConfigurationShould.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ public void FailIfOktaDomainIsNotDefined(string oktaDomain)
[InlineData("https://foo-admin.okta.com")]
[InlineData("https://foo-admin.oktapreview.com")]
[InlineData("https://https://foo-admin.okta-emea.com")]
[InlineData("https://foo-admin.okta-gov.com")]
[InlineData("https://foo-admin.okta.mil")]
[InlineData("https://foo-admin.okta-miltest.com")]
[InlineData("https://foo-admin.trex-govcloud.com")]
public void FailIfOktaDomainContainsAdminKeyword(string oktaDomain)
{
var configuration = new Configuration();
Expand Down Expand Up @@ -126,6 +130,21 @@ public void NotFailIfOktaDomainIsNotStartingWithHttpsAndDisableHttpsCheckIsTrue(
action.Should().NotThrow<ArgumentException>();
}

[Theory]
[InlineData("https://myOktaDomain.okta-gov.com")]
[InlineData("https://myOktaDomain.okta.mil")]
[InlineData("https://myOktaDomain.okta-miltest.com")]
[InlineData("https://myOktaDomain.trex-govcloud.com")]
public void NotFailForValidNewOktaDomains(string oktaDomain)
{
var configuration = new Configuration();
configuration.OktaDomain = oktaDomain;
configuration.Token = "foo";

Action action = () => Configuration.Validate(configuration);
action.Should().NotThrow<ArgumentException>();
}

[Theory]
[InlineData(null)]
[InlineData("")]
Expand Down
8 changes: 6 additions & 2 deletions src/Okta.Sdk/Client/Configuration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,11 @@ public static void Validate(IReadableConfiguration configuration)
if (configuration.OktaDomain.IndexOf("-admin.okta.com", StringComparison.OrdinalIgnoreCase) >= 0 ||
configuration.OktaDomain.IndexOf("-admin.oktapreview.com", StringComparison.OrdinalIgnoreCase) >=
0 ||
configuration.OktaDomain.IndexOf("-admin.okta-emea.com", StringComparison.OrdinalIgnoreCase) >= 0)
configuration.OktaDomain.IndexOf("-admin.okta-emea.com", StringComparison.OrdinalIgnoreCase) >= 0 ||
configuration.OktaDomain.IndexOf("-admin.okta-gov.com", StringComparison.OrdinalIgnoreCase) >= 0 ||
configuration.OktaDomain.IndexOf("-admin.okta.mil", StringComparison.OrdinalIgnoreCase) >= 0 ||
configuration.OktaDomain.IndexOf("-admin.okta-miltest.com", StringComparison.OrdinalIgnoreCase) >= 0 ||
configuration.OktaDomain.IndexOf("-admin.trex-govcloud.com", StringComparison.OrdinalIgnoreCase) >= 0)
{
throw new ArgumentNullException(nameof(configuration.OktaDomain),
$"Your Okta domain should not contain -admin. Current value: {configuration.OktaDomain}. You can copy your domain from the Okta Developer Console. Follow these instructions to find it: https://bit.ly/finding-okta-domain");
Expand Down Expand Up @@ -403,7 +407,7 @@ public Configuration()
"variables", new Dictionary<string, object> {
{
"yourOktaDomain", new Dictionary<string, object> {
{"description", "The domain of your organization. This can be a provided subdomain of an official okta domain (okta.com, oktapreview.com, etc) or one of your configured custom domains."},
{"description", "The domain of your organization. This can be a provided subdomain of an official okta domain (okta.com, oktapreview.com, okta-gov.com, okta.mil, okta-miltest.com, trex-govcloud.com, etc) or one of your configured custom domains."},
{"default_value", "subdomain.okta.com"},
}
}
Expand Down