Merge pull request #1505 from khiller-cf/master

AUTH-5858 add name id transform jsonata field to access saas applications
cloudflare · Feb 13, 2024 · e9c5e78 · e9c5e78
2 parents aaba16d + b6c436f
commit e9c5e78
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/.changelog/1505.txt b/.changelog/1505.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+access_application: add support for `name_id_transform_jsonata` in saas apps
+```
diff --git a/access_application.go b/access_application.go
@@ -114,13 +114,14 @@ type SaasApplication struct {
 	AuthType  string     `json:"auth_type,omitempty"`
 
 	// SAML saas app
-	ConsumerServiceUrl string                `json:"consumer_service_url,omitempty"`
-	SPEntityID         string                `json:"sp_entity_id,omitempty"`
-	IDPEntityID        string                `json:"idp_entity_id,omitempty"`
-	NameIDFormat       string                `json:"name_id_format,omitempty"`
-	SSOEndpoint        string                `json:"sso_endpoint,omitempty"`
-	DefaultRelayState  string                `json:"default_relay_state,omitempty"`
-	CustomAttributes   []SAMLAttributeConfig `json:"custom_attributes,omitempty"`
+	ConsumerServiceUrl     string                `json:"consumer_service_url,omitempty"`
+	SPEntityID             string                `json:"sp_entity_id,omitempty"`
+	IDPEntityID            string                `json:"idp_entity_id,omitempty"`
+	NameIDFormat           string                `json:"name_id_format,omitempty"`
+	SSOEndpoint            string                `json:"sso_endpoint,omitempty"`
+	DefaultRelayState      string                `json:"default_relay_state,omitempty"`
+	CustomAttributes       []SAMLAttributeConfig `json:"custom_attributes,omitempty"`
+	NameIDTransformJsonata string                `json:"name_id_transform_jsonata,omitempty"`
 
 	// OIDC saas app
 	ClientID         string   `json:"client_id,omitempty"`

diff --git a/access_application_test.go b/access_application_test.go
@@ -678,7 +678,8 @@ func TestCreateSAMLSaasAccessApplications(t *testing.T) {
 								"name": "test3"
 							}
 						}
-					]
+					],
+					"name_id_transform_jsonata": "$substringBefore(email, '@') & '+sandbox@' & $substringAfter(email, '@')"
 				}
 			}
 		}
@@ -731,6 +732,7 @@ func TestCreateSAMLSaasAccessApplications(t *testing.T) {
 					},
 				},
 			},
+			NameIDTransformJsonata: "$substringBefore(email, '@') & '+sandbox@' & $substringAfter(email, '@')",
 		},
 		CreatedAt:                &createdAt,
 		UpdatedAt:                &updatedAt,