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

Added flatten/expand for token_exchange #1145

Merged
merged 8 commits into from
Feb 4, 2025
Merged

Added flatten/expand for token_exchange #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8b8cb90
Added flatten/expand for token_exchange
duedares-rvj Feb 4, 2025
04a1b14
Updated tests, added clause for custom-token-exchange
duedares-rvj Feb 4, 2025
8b88e7e
Minor update
duedares-rvj Feb 4, 2025
a0f892d
Fix typo
duedares-rvj Feb 4, 2025
8f63ec9
fix linting and tests
duedares-rvj Feb 4, 2025
d3279a2
updated tests
duedares-rvj Feb 4, 2025
f4c9756
minor updates to clauses
duedares-rvj Feb 4, 2025
9a279ab
Update code comments
ramya18101 Feb 4, 2025
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
15 changes: 14 additions & 1 deletion internal/auth0/action/expand.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,26 @@ func expandAction(data *schema.ResourceData) *management.Action {
action.Secrets = expandActionSecrets(config.GetAttr("secrets"))
}

if action.GetRuntime() == "node18" {
// If custom-token-exchange is part of SupportedTriggers for an action,
// we'd not manipulate it's runtime value.
// This is done, to support node18 as runtime.
// TODO: Remove this soon as node18 reaches EOL.
if action.GetRuntime() == "node18" && !isTokenExchangeInSupportedTriggers(action.SupportedTriggers) {
action.Runtime = auth0.String("node18-actions")
}

return action
}

func isTokenExchangeInSupportedTriggers(actionTriggers []management.ActionTrigger) bool {
for _, actionTrigger := range actionTriggers {
if actionTrigger.GetID() == "custom-token-exchange" {
return true
}
}
return false
}

func expandActionTriggers(triggers cty.Value) []management.ActionTrigger {
if triggers.IsNull() {
return nil
Expand Down
21 changes: 21 additions & 0 deletions internal/auth0/client/expand.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ func expandClient(data *schema.ResourceData) (*management.Client, error) {
NativeSocialLogin: expandClientNativeSocialLogin(data),
Mobile: expandClientMobile(data),
DefaultOrganization: expandDefaultOrganization(data),
TokenExchange: expandTokenExchange(data),
RequireProofOfPossession: value.Bool(config.GetAttr("require_proof_of_possession")),
ComplianceLevel: value.String(config.GetAttr("compliance_level")),
}
Expand Down Expand Up @@ -111,6 +112,26 @@ func expandDefaultOrganization(data *schema.ResourceData) *management.ClientDefa
return &defaultOrg
}

func expandTokenExchange(data *schema.ResourceData) *management.ClientTokenExchange {
if !data.IsNewResource() && !data.HasChange("token_exchange") {
return nil
}
var tokenExchange management.ClientTokenExchange

config := data.GetRawConfig().GetAttr("token_exchange")
if config.IsNull() || config.ForEachElement(func(_ cty.Value, cfg cty.Value) (stop bool) {
tokenExchange.AllowAnyProfileOfType = value.Strings(cfg.GetAttr("allow_any_profile_of_type"))
return stop
}) {
return nil
}
if tokenExchange == (management.ClientTokenExchange{}) {
return nil
}

return &tokenExchange
}

func isDefaultOrgNull(data *schema.ResourceData) bool {
if !data.IsNewResource() && !data.HasChange("default_organization") {
return false
Expand Down
11 changes: 11 additions & 0 deletions internal/auth0/client/flatten.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,16 @@ func flattenDefaultOrganization(defaultOrganization *management.ClientDefaultOrg
return []interface{}{do}
}

func flattenTokenExchange(tokenExchange *management.ClientTokenExchange) []interface{} {
if tokenExchange == nil {
return nil
}
t := map[string]interface{}{
"allow_any_profile_of_type": tokenExchange.AllowAnyProfileOfType,
}
return []interface{}{t}
}

func flattenClient(data *schema.ResourceData, client *management.Client) error {
result := multierror.Append(
data.Set("client_id", client.GetClientID()),
Expand Down Expand Up @@ -597,6 +607,7 @@ func flattenClient(data *schema.ResourceData, client *management.Client) error {
data.Set("oidc_logout", flattenOIDCLogout(client.GetOIDCLogout())),
data.Set("require_pushed_authorization_requests", client.GetRequirePushedAuthorizationRequests()),
data.Set("default_organization", flattenDefaultOrganization(client.GetDefaultOrganization())),
data.Set("token_exchange", flattenTokenExchange(client.GetTokenExchange())),
data.Set("require_proof_of_possession", client.GetRequireProofOfPossession()),
data.Set("compliance_level", client.GetComplianceLevel()),
)
Expand Down
21 changes: 20 additions & 1 deletion internal/auth0/client/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const testAccCreateMobileClient = `
resource "auth0_client" "my_client" {
name = "Acceptance Test - Mobile - {{.testName}}"
app_type = "native"

oidc_conformant = true
token_exchange {
allow_any_profile_of_type = ["custom_authentication"]
}
Expand Down Expand Up @@ -92,6 +92,11 @@ resource "auth0_client" "my_client" {
name = "Acceptance Test - Mobile - {{.testName}}"
app_type = "native"

oidc_conformant = true
token_exchange {
allow_any_profile_of_type = ["custom_authentication"]
}

mobile {
android {
app_package_name = "com.example"
Expand Down Expand Up @@ -121,6 +126,10 @@ resource "auth0_client" "my_client" {
name = "Acceptance Test - Mobile - {{.testName}}"
app_type = "native"

oidc_conformant = true
token_exchange {
allow_any_profile_of_type = ["custom_authentication"]
}
mobile {
android {
app_package_name = "com.example"
Expand All @@ -141,6 +150,10 @@ resource "auth0_client" "my_client" {
name = "Acceptance Test - Mobile - {{.testName}}"
app_type = "non_interactive"

oidc_conformant = true
token_exchange {
allow_any_profile_of_type = ["custom_authentication"]
}
native_social_login {
apple {
enabled = false
Expand All @@ -161,6 +174,7 @@ func TestAccClientMobile(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("auth0_client.my_client", "name", fmt.Sprintf("Acceptance Test - Mobile - %s", t.Name())),
resource.TestCheckResourceAttr("auth0_client.my_client", "app_type", "native"),
resource.TestCheckResourceAttr("auth0_client.my_client", "oidc_conformant", "true"),
resource.TestCheckResourceAttr("auth0_client.my_client", "token_exchange.0.allow_any_profile_of_type.0", "custom_authentication"),
resource.TestCheckResourceAttr("auth0_client.my_client", "mobile.#", "1"),
resource.TestCheckResourceAttr("auth0_client.my_client", "mobile.0.android.#", "1"),
Expand All @@ -181,6 +195,8 @@ func TestAccClientMobile(t *testing.T) {
Config: acctest.ParseTestName(testAccUpdateMobileClient, t.Name()),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("auth0_client.my_client", "name", fmt.Sprintf("Acceptance Test - Mobile - %s", t.Name())),
resource.TestCheckResourceAttr("auth0_client.my_client", "oidc_conformant", "true"),
resource.TestCheckResourceAttr("auth0_client.my_client", "token_exchange.0.allow_any_profile_of_type.0", "custom_authentication"),
resource.TestCheckResourceAttr("auth0_client.my_client", "app_type", "native"),
resource.TestCheckResourceAttr("auth0_client.my_client", "mobile.#", "1"),
resource.TestCheckResourceAttr("auth0_client.my_client", "mobile.0.android.#", "1"),
Expand All @@ -202,6 +218,8 @@ func TestAccClientMobile(t *testing.T) {
Config: acctest.ParseTestName(testAccUpdateMobileClientAgainByRemovingSomeFields, t.Name()),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("auth0_client.my_client", "name", fmt.Sprintf("Acceptance Test - Mobile - %s", t.Name())),
resource.TestCheckResourceAttr("auth0_client.my_client", "oidc_conformant", "true"),
resource.TestCheckResourceAttr("auth0_client.my_client", "token_exchange.0.allow_any_profile_of_type.0", "custom_authentication"),
resource.TestCheckResourceAttr("auth0_client.my_client", "app_type", "native"),
resource.TestCheckResourceAttr("auth0_client.my_client", "mobile.#", "1"),
resource.TestCheckResourceAttr("auth0_client.my_client", "mobile.0.android.#", "1"),
Expand All @@ -228,6 +246,7 @@ func TestAccClientMobile(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("auth0_client.my_client", "name", fmt.Sprintf("Acceptance Test - Mobile - %s", t.Name())),
resource.TestCheckResourceAttr("auth0_client.my_client", "app_type", "non_interactive"),
resource.TestCheckResourceAttr("auth0_client.my_client", "token_exchange.0.allow_any_profile_of_type.0", "custom_authentication"),
resource.TestCheckResourceAttr("auth0_client.my_client", "mobile.#", "1"),
resource.TestCheckResourceAttr("auth0_client.my_client", "mobile.0.android.#", "1"),
resource.TestCheckResourceAttr("auth0_client.my_client", "mobile.0.android.0.app_package_name", "com.example"),
Expand Down
Loading
Loading