Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add login intent Id TTL to tenant configuration #286

Merged
merged 7 commits into from
Oct 17, 2024
+17 −3
Merged

Add login intent Id TTL to tenant configuration #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5b21359
add tenant.externalIdentifierConfiguration.completionTokenTimeToLiveI…
spwitt Jun 21, 2024
6d93a81
go syntax
spwitt Jun 21, 2024
2631f4f
commas everywhere
spwitt Jun 21, 2024
fe19054
rename completion token to login intent
spwitt Jun 27, 2024
a2e1472
formatting
spwitt Oct 17, 2024
1872b95
new client version
spwitt Oct 17, 2024
e4f2def
tidy
spwitt Oct 17, 2024
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
1 change: 1 addition & 0 deletions docs/guides/handling_default_resources.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ resource "fusionauth_tenant" "Default" {
type = "randomAlphaNumeric"
}
external_authentication_id_time_to_live_in_seconds = 300
login_intent_time_to_live_in_seconds = 1800
one_time_password_time_to_live_in_seconds = 60
passwordless_login_generator {
length = 32
Expand Down
1 change: 1 addition & 0 deletions docs/resources/tenant.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ resource "fusionauth_tenant" "example" {
type = "randomAlphaNumeric"
}
external_authentication_id_time_to_live_in_seconds = 300
login_intent_time_to_live_in_seconds = 1800
one_time_password_time_to_live_in_seconds = 60
passwordless_login_generator {
length = 32
Expand Down
6 changes: 6 additions & 0 deletions fusionauth/resource_fusionauth_tenant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,12 @@ func newExternalIdentifierConfiguration() *schema.Resource {
Description: "The time in seconds until an external authentication Id is no longer valid and cannot be used by the Token API. Value must be greater than 0.",
ValidateFunc: validation.IntAtLeast(1),
},
"login_intent_time_to_live_in_seconds": {
Type: schema.TypeInt,
Required: true,
Description: "The number of seconds before the Login Timeout identifier is no longer valid to complete post-authentication steps in the OAuth workflow. Must be greater than 0.",
ValidateFunc: validation.IntAtLeast(1),
},
"one_time_password_time_to_live_in_seconds": {
Type: schema.TypeInt,
Required: true,
Expand Down
4 changes: 4 additions & 0 deletions fusionauth/resource_fusionauth_tenant_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ func buildTenant(data *schema.ResourceData) (fusionauth.Tenant, diag.Diagnostics
ExternalAuthenticationIdTimeToLiveInSeconds: data.Get(
"external_identifier_configuration.0.external_authentication_id_time_to_live_in_seconds",
).(int),
LoginIntentTimeToLiveInSeconds: data.Get(
"external_identifier_configuration.0.login_intent_time_to_live_in_seconds",
).(int),
OneTimePasswordTimeToLiveInSeconds: data.Get(
"external_identifier_configuration.0.one_time_password_time_to_live_in_seconds",
).(int),
Expand Down Expand Up @@ -489,6 +492,7 @@ func buildResourceDataFromTenant(t fusionauth.Tenant, data *schema.ResourceData)
}},
"email_verification_id_time_to_live_in_seconds": t.ExternalIdentifierConfiguration.EmailVerificationIdTimeToLiveInSeconds,
"external_authentication_id_time_to_live_in_seconds": t.ExternalIdentifierConfiguration.ExternalAuthenticationIdTimeToLiveInSeconds,
"login_intent_time_to_live_in_seconds": t.ExternalIdentifierConfiguration.LoginIntentTimeToLiveInSeconds,
"one_time_password_time_to_live_in_seconds": t.ExternalIdentifierConfiguration.OneTimePasswordTimeToLiveInSeconds,
"passwordless_login_generator": []map[string]interface{}{{
"length": t.ExternalIdentifierConfiguration.PasswordlessLoginGenerator.Length,
Expand Down
2 changes: 2 additions & 0 deletions fusionauth/resource_fusionauth_tenant_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ func testTenantAccTestCheckFuncs(
resource.TestCheckResourceAttr(tfResourcePath, "external_identifier_configuration.0.email_verification_one_time_code_generator.0.type", "randomAlphaNumeric"),
resource.TestCheckResourceAttr(tfResourcePath, "external_identifier_configuration.0.email_verification_id_time_to_live_in_seconds", "86400"),
resource.TestCheckResourceAttr(tfResourcePath, "external_identifier_configuration.0.external_authentication_id_time_to_live_in_seconds", "300"),
resource.TestCheckResourceAttr(tfResourcePath, "external_identifier_configuration.0.login_intent_time_to_live_in_seconds", "3600"),
resource.TestCheckResourceAttr(tfResourcePath, "external_identifier_configuration.0.one_time_password_time_to_live_in_seconds", "60"),
resource.TestCheckResourceAttr(tfResourcePath, "external_identifier_configuration.0.passwordless_login_generator.0.length", "32"),
resource.TestCheckResourceAttr(tfResourcePath, "external_identifier_configuration.0.passwordless_login_generator.0.type", "randomBytes"),
Expand Down Expand Up @@ -534,6 +535,7 @@ resource "fusionauth_tenant" "test_%[1]s" {
}
email_verification_id_time_to_live_in_seconds = 86400
external_authentication_id_time_to_live_in_seconds = 300
login_intent_time_to_live_in_seconds = 3600
one_time_password_time_to_live_in_seconds = 60
passwordless_login_generator {
length = 32
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gpsinsight/terraform-provider-fusionauth
go 1.20

require (
github.com/FusionAuth/go-client v0.0.0-20240425220342-2317e10dfcf5
github.com/FusionAuth/go-client v0.0.0-20240912225700-ce40548e5bef
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
github.com/hashicorp/go-uuid v1.0.3
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
github.com/FusionAuth/go-client v0.0.0-20240425220342-2317e10dfcf5 h1:GGDFaOr/r7FTXZj4wrgtW4LlXeTFuBVoWgzuW4cbQ+s=
github.com/FusionAuth/go-client v0.0.0-20240425220342-2317e10dfcf5/go.mod h1:SyRrXMJAzMVQLiJjKfQUR59dRI3jPyZv+BXIZ//HwE4=
github.com/FusionAuth/go-client v0.0.0-20240912225700-ce40548e5bef h1:BRn4829CZpFBMp9afGlru7+9p/4U1m7ELhghd6vcRWg=
github.com/FusionAuth/go-client v0.0.0-20240912225700-ce40548e5bef/go.mod h1:SyRrXMJAzMVQLiJjKfQUR59dRI3jPyZv+BXIZ//HwE4=
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97LyUpzH9P6Hrlg=
github.com/ProtonMail/go-crypto v1.1.0-alpha.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
Expand Down