Add direct push provider, fixes #534

docs/resources/guardian.md

@@ -139,7 +139,9 @@ Optional:
 
 - `amazon_sns` (Block List, Max: 1) Configuration for Amazon SNS. (see [below for nested schema](#nestedblock--push--amazon_sns))
 - `custom_app` (Block List, Max: 1) Configuration for the Guardian Custom App. (see [below for nested schema](#nestedblock--push--custom_app))
-- `provider` (String) Provider to use, one of `guardian`, `sns`.
+- `direct_apns` (Block List, Max: 1) Configuration for the Apple Push Notification service (APNs) settings. (see [below for nested schema](#nestedblock--push--direct_apns))
+- `direct_fcm` (Block List, Max: 1) Configuration for Firebase Cloud Messaging (FCM) settings. (see [below for nested schema](#nestedblock--push--direct_fcm))
+- `provider` (String) Provider to use, one of `direct`, `guardian`, `sns`.
 
 <a id="nestedblock--push--amazon_sns"></a>
 ### Nested Schema for `push.amazon_sns`
@@ -163,6 +165,28 @@ Optional:
 - `google_app_link` (String) Google Store URL. Must be HTTPS or an empty string.
 
 
+<a id="nestedblock--push--direct_apns"></a>
+### Nested Schema for `push.direct_apns`
+
+Required:
+
+- `bundle_id` (String) The Apple Push Notification service Bundle ID.
+- `p12` (String, Sensitive) The base64 encoded certificate in P12 format.
+- `sandbox` (Boolean) Set to true to use the sandbox iOS app environment, otherwise set to false to use the production iOS app environment.
+
+Optional:
+
+- `enabled` (Boolean) Indicates whether the Apple Push Notification service is enabled.
+
+
+<a id="nestedblock--push--direct_fcm"></a>
+### Nested Schema for `push.direct_fcm`
+
+Required:
+
+- `server_key` (String, Sensitive) The Firebase Cloud Messaging Server Key. For security purposes, we don’t retrieve your existing FCM server key to check for drift.
+
+
 
 <a id="nestedblock--webauthn_platform"></a>
 ### Nested Schema for `webauthn_platform`

internal/auth0/guardian/expand.go

@@ -275,6 +275,18 @@ func updatePush(d *schema.ResourceData, api *management.Management) error {
 			}
 		}
 
+		if d.HasChange("push.0.direct_apns") {
+			if err = updateDirectAPNS(push.GetAttr("direct_apns"), api); err != nil {
+				return true
+			}
+		}
+
+		if d.HasChange("push.0.direct_fcm") {
+			if err = updateDirectFCM(push.GetAttr("direct_fcm"), api); err != nil {
+				return true
+			}
+		}
+
 		if d.HasChange("push.0.amazon_sns") {
 			if err = updateAmazonSNS(push.GetAttr("amazon_sns"), api); err != nil {
 				return true
@@ -323,3 +335,37 @@ func updateCustomApp(options cty.Value, api *management.Management) error {
 
 	return err
 }
+
+func updateDirectAPNS(options cty.Value, api *management.Management) error {
+	var err error
+
+	options.ForEachElement(func(_ cty.Value, config cty.Value) (stop bool) {
+		err = api.Guardian.MultiFactor.Push.UpdateDirectAPNS(
+			&management.MultiFactorPushDirectAPNS{
+				Sandbox:  value.Bool(config.GetAttr("sandbox")),
+				BundleID: value.String(config.GetAttr("bundle_id")),
+				P12:      value.String(config.GetAttr("p12")),
+			},
+		)
+
+		return stop
+	})
+
+	return err
+}
+
+func updateDirectFCM(options cty.Value, api *management.Management) error {
+	var err error
+
+	options.ForEachElement(func(_ cty.Value, config cty.Value) (stop bool) {
+		err = api.Guardian.MultiFactor.Push.UpdateDirectFCM(
+			&management.MultiFactorPushDirectFCM{
+				ServerKey: value.String(config.GetAttr("server_key")),
+			},
+		)
+
+		return stop
+	})
+
+	return err
+}

internal/auth0/guardian/flatten.go

@@ -181,6 +181,26 @@ func flattenPush(d *schema.ResourceData, enabled bool, api *management.Managemen
 		},
 	}
 
+	directAPNS, err := api.Guardian.MultiFactor.Push.DirectAPNS()
+	if err != nil {
+		return nil, err
+	}
+
+	pushData["direct_apns"] = []interface{}{
+		map[string]interface{}{
+			"sandbox":   directAPNS.GetSandbox(),
+			"p12":       d.Get("push.0.direct_apns.0.p12"), // Does not get read back.
+			"bundle_id": directAPNS.GetBundleID(),
+			"enabled":   directAPNS.GetEnabled(),
+		},
+	}
+
+	pushData["direct_fcm"] = []interface{}{
+		map[string]interface{}{
+			"server_key": d.Get("push.0.direct_fcm.0.server_key"), // Does not get read back.
+		},
+	}
+
 	if pushProvider.GetProvider() == "sns" {
 		amazonSNS, err := api.Guardian.MultiFactor.Push.AmazonSNS()
 		if err != nil {

internal/auth0/guardian/resource.go

@@ -278,8 +278,8 @@ func NewResource() *schema.Resource {
 						"provider": {
 							Type:         schema.TypeString,
 							Optional:     true,
-							ValidateFunc: validation.StringInSlice([]string{"guardian", "sns"}, false),
-							Description:  "Provider to use, one of `guardian`, `sns`.",
+							ValidateFunc: validation.StringInSlice([]string{"direct", "guardian", "sns"}, false),
+							Description:  "Provider to use, one of `direct`, `guardian`, `sns`.",
 						},
 						"amazon_sns": {
 							Type:         schema.TypeList,
@@ -348,6 +348,61 @@ func NewResource() *schema.Resource {
 								},
 							},
 						},
+						"direct_apns": {
+							Type:         schema.TypeList,
+							Optional:     true,
+							Computed:     true,
+							MaxItems:     1,
+							RequiredWith: []string{"push.0.provider"},
+							Description:  "Configuration for the Apple Push Notification service (APNs) settings.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"sandbox": {
+										Type:     schema.TypeBool,
+										Required: true,
+										Description: "Set to true to use the sandbox iOS app environment, " +
+											"otherwise set to false to use the production iOS app environment.",
+									},
+									"bundle_id": {
+										Type:        schema.TypeString,
+										Required:    true,
+										Description: "The Apple Push Notification service Bundle ID.",
+									},
+									"p12": {
+										Type:        schema.TypeString,
+										Required:    true,
+										Sensitive:   true,
+										Description: "The base64 encoded certificate in P12 format.",
+									},
+									"enabled": {
+										Type:        schema.TypeBool,
+										Optional:    true,
+										Computed:    true,
+										Description: "Indicates whether the Apple Push Notification service is enabled.",
+									},
+								},
+							},
+						},
+						"direct_fcm": {
+							Type:         schema.TypeList,
+							Optional:     true,
+							Computed:     true,
+							MaxItems:     1,
+							RequiredWith: []string{"push.0.provider"},
+							Description:  "Configuration for Firebase Cloud Messaging (FCM) settings.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"server_key": {
+										Type:      schema.TypeString,
+										Required:  true,
+										Sensitive: true,
+										Description: "The Firebase Cloud Messaging Server Key. " +
+											"For security purposes, we don’t retrieve your existing FCM server key " +
+											"to check for drift.",
+									},
+								},
+							},
+						},
 					},
 				},
 			},

internal/auth0/guardian/resource_test.go

@@ -1,9 +1,12 @@
 package guardian_test
 
 import (
+	"fmt"
+	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/stretchr/testify/require"
 
 	"github.com/auth0/terraform-provider-auth0/internal/acctest"
 )
@@ -443,6 +446,36 @@ resource "auth0_guardian" "foo" {
 }
 `
 
+const testAccConfigurePushUpdateDirectAPNS = `
+resource "auth0_guardian" "foo" {
+	policy = "all-applications"
+	push {
+		enabled  = true
+		provider = "direct"
+
+		direct_apns {
+			sandbox = false
+			bundle_id = "com.my.app"
+			p12 = %q
+		}
+	}
+}
+`
+
+const testAccConfigurePushUpdateDirectFCM = `
+resource "auth0_guardian" "foo" {
+	policy = "all-applications"
+	push {
+		enabled  = true
+		provider = "direct"
+
+		direct_fcm {
+			server_key = "abc123"
+		}
+	}
+}
+`
+
 const testAccConfigurePushDelete = `
 resource "auth0_guardian" "foo" {
 	policy = "all-applications"
@@ -453,6 +486,9 @@ resource "auth0_guardian" "foo" {
 `
 
 func TestAccGuardianPush(t *testing.T) {
+	apnsCertificate, err := os.ReadFile("./../../../test/data/apns.p12")
+	require.NoError(t, err)
+
 	acctest.Test(t, resource.TestCase{
 		Steps: []resource.TestStep{
 			{
@@ -498,6 +534,30 @@ func TestAccGuardianPush(t *testing.T) {
 					resource.TestCheckResourceAttr("auth0_guardian.foo", "push.0.custom_app.0.google_app_link", "https://play.google.com/store/apps/details?id=com.my.app"),
 				),
 			},
+			{
+				Config: fmt.Sprintf(testAccConfigurePushUpdateDirectAPNS, apnsCertificate),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("auth0_guardian.foo", "policy", "all-applications"),
+					resource.TestCheckResourceAttr("auth0_guardian.foo", "push.#", "1"),
+					resource.TestCheckResourceAttr("auth0_guardian.foo", "push.0.enabled", "true"),
+					resource.TestCheckResourceAttr("auth0_guardian.foo", "push.0.provider", "direct"),
+					resource.TestCheckResourceAttr("auth0_guardian.foo", "push.0.direct_apns.#", "1"),
+					resource.TestCheckResourceAttr("auth0_guardian.foo", "push.0.direct_apns.0.sandbox", "false"),
+					resource.TestCheckResourceAttr("auth0_guardian.foo", "push.0.direct_apns.0.bundle_id", "com.my.app"),
+					resource.TestCheckResourceAttr("auth0_guardian.foo", "push.0.direct_apns.0.enabled", "true"),
+					resource.TestCheckResourceAttrSet("auth0_guardian.foo", "push.0.direct_apns.0.p12"),
+				),
+			},
+			{
+				Config: testAccConfigurePushUpdateDirectFCM,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("auth0_guardian.foo", "policy", "all-applications"),
+					resource.TestCheckResourceAttr("auth0_guardian.foo", "push.#", "1"),
+					resource.TestCheckResourceAttr("auth0_guardian.foo", "push.0.enabled", "true"),
+					resource.TestCheckResourceAttr("auth0_guardian.foo", "push.0.provider", "direct"),
+					resource.TestCheckResourceAttr("auth0_guardian.foo", "push.0.direct_fcm.#", "1"),
+				),
+			},
 			{
 				Config: testAccConfigurePushDelete,
 				Check: resource.ComposeTestCheckFunc(

test/data/apns.p12

@@ -0,0 +1 @@
+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