fix: return a specific error message for email & phone validation errors

hperl · ory-bot · commit d6b0f492c4aa · 2026-01-29T23:01:33.000Z
GitOrigin-RevId: 48ed3f3642f831b1bc58f3238105911ad8a55de0
diff --git a/cmd/clidoc/main.go b/cmd/clidoc/main.go
@@ -188,6 +188,8 @@ func init() {
 		"NewInfoSelfServiceLoginAAL2CodeAddress":                  text.NewInfoSelfServiceLoginAAL2CodeAddress("{channel}", "{address}"),
 		"NewErrorCaptchaFailed":                                   text.NewErrorCaptchaFailed(),
 		"NewCaptchaContainerMessage":                              text.NewCaptchaContainerMessage(),
+		"NewErrorValidationEmail":                                 text.NewErrorValidationEmail("{value}"),
+		"NewErrorValidationPhone":                                 text.NewErrorValidationPhone("{value}"),
 	}
 }
 
diff --git a/selfservice/strategy/code/strategy_recovery_test.go b/selfservice/strategy/code/strategy_recovery_test.go
@@ -510,9 +510,8 @@ func TestRecovery(t *testing.T) {
 					})
 					activeMethod := gjson.Get(responseJSON, "active").String()
 					assert.EqualValues(t, node.CodeGroup, activeMethod, "expected method to be %s got %s", node.CodeGroup, activeMethod)
-					expectedMessage := fmt.Sprintf("%q is not valid \"email\"", email)
 					actualMessage := gjson.Get(responseJSON, "ui.nodes.#(attributes.name==email).messages.0.text").String()
-					assert.EqualValues(t, expectedMessage, actualMessage, "%s", responseJSON)
+					assert.EqualValues(t, "Enter a valid email address", actualMessage, "%s", responseJSON)
 				})
 			}
 		}
@@ -1354,9 +1353,8 @@ func TestRecovery_WithContinueWith(t *testing.T) {
 					})
 					activeMethod := gjson.Get(responseJSON, "active").String()
 					assert.EqualValues(t, node.CodeGroup, activeMethod, "expected method to be %s got %s", node.CodeGroup, activeMethod)
-					expectedMessage := fmt.Sprintf("%q is not valid \"email\"", email)
 					actualMessage := gjson.Get(responseJSON, "ui.nodes.#(attributes.name==email).messages.0.text").String()
-					assert.EqualValues(t, expectedMessage, actualMessage, "%s", responseJSON)
+					assert.EqualValues(t, "Enter a valid email address", actualMessage, "%s", responseJSON)
 				}
 			})
 		}
diff --git a/selfservice/strategy/code/strategy_registration_test.go b/selfservice/strategy/code/strategy_registration_test.go
@@ -730,8 +730,8 @@ func TestRegistrationCodeStrategy(t *testing.T) {
 						} else {
 							require.EqualValues(t, http.StatusBadRequest, resp.StatusCode)
 						}
-						require.Equal(t, int64(4000001), gjson.Get(body, "ui.nodes.#(attributes.name==traits.email).messages.0.id").Int(), "%s", body)
-						require.Equal(t, "\"invalidemail\" is not valid \"email\"", gjson.Get(body, "ui.nodes.#(attributes.name==traits.email).messages.0.text").String(), "%s", body)
+						require.Equal(t, int64(4000040), gjson.Get(body, "ui.nodes.#(attributes.name==traits.email).messages.0.id").Int(), "%s", body)
+						require.Equal(t, "Enter a valid email address", gjson.Get(body, "ui.nodes.#(attributes.name==traits.email).messages.0.text").String(), "%s", body)
 					})
 				})
 			})
diff --git a/selfservice/strategy/code/strategy_verification_test.go b/selfservice/strategy/code/strategy_verification_test.go
@@ -167,7 +167,7 @@ func TestVerification(t *testing.T) {
 	t.Run("description=should require a valid email to be sent", func(t *testing.T) {
 		check := func(t *testing.T, actual string, value string) {
 			assert.EqualValues(t, string(node.CodeGroup), gjson.Get(actual, "active").String(), "%s", actual)
-			assert.EqualValues(t, fmt.Sprintf("%q is not valid \"email\"", value),
+			assert.EqualValues(t, "Enter a valid email address",
 				gjson.Get(actual, "ui.nodes.#(attributes.name==email).messages.0.text").String(),
 				"%s", actual)
 		}
diff --git a/selfservice/strategy/link/strategy_recovery_test.go b/selfservice/strategy/link/strategy_recovery_test.go
@@ -329,7 +329,7 @@ func TestRecovery(t *testing.T) {
 	t.Run("description=should require a valid email to be sent", func(t *testing.T) {
 		check := func(t *testing.T, actual string, value string) {
 			assert.EqualValues(t, node.LinkGroup, gjson.Get(actual, "active").String(), "%s", actual)
-			assert.EqualValues(t, fmt.Sprintf("%q is not valid \"email\"", value),
+			assert.EqualValues(t, "Enter a valid email address",
 				gjson.Get(actual, "ui.nodes.#(attributes.name==email).messages.0.text").String(),
 				"%s", actual)
 		}
diff --git a/selfservice/strategy/link/strategy_verification_test.go b/selfservice/strategy/link/strategy_verification_test.go
@@ -145,7 +145,7 @@ func TestVerification(t *testing.T) {
 	t.Run("description=should require a valid email to be sent", func(t *testing.T) {
 		check := func(t *testing.T, actual string, value string) {
 			assert.EqualValues(t, string(node.LinkGroup), gjson.Get(actual, "active").String(), "%s", actual)
-			assert.EqualValues(t, fmt.Sprintf("%q is not valid \"email\"", value),
+			assert.EqualValues(t, "Enter a valid email address",
 				gjson.Get(actual, "ui.nodes.#(attributes.name==email).messages.0.text").String(),
 				"%s", actual)
 		}
diff --git a/selfservice/strategy/oidc/strategy_test.go b/selfservice/strategy/oidc/strategy_test.go
@@ -421,7 +421,7 @@ func TestStrategy(t *testing.T) {
 		res, body := makeRequest(t, "valid", action, url.Values{})
 
 		require.Contains(t, res.Request.URL.String(), uiTS.URL, "%s", body)
-		assert.Contains(t, gjson.GetBytes(body, "ui.nodes.#(attributes.name==traits.subject).messages.0.text").String(), "is not valid", "%s\n%s", gjson.GetBytes(body, "ui.nodes.#(attributes.name==traits.subject)").Raw, body)
+		assert.Contains(t, gjson.GetBytes(body, "ui.nodes.#(attributes.name==traits.subject).messages.0.text").String(), "Enter a valid email address", "%s\n%s", gjson.GetBytes(body, "ui.nodes.#(attributes.name==traits.subject)").Raw, body)
 	})
 
 	t.Run("case=cannot register multiple accounts with the same OIDC account", func(t *testing.T) {
diff --git a/selfservice/strategy/password/registration_test.go b/selfservice/strategy/password/registration_test.go
@@ -800,8 +800,8 @@ func TestRegistration(t *testing.T) {
 						require.EqualValues(t, http.StatusBadRequest, resp.StatusCode)
 					}
 
-					assert.EqualValuesf(t, 4000001, gjson.Get(actual, "ui.nodes.#(attributes.name==traits.email).messages.0.id").Int(), "%s", actual)
-					assert.Equalf(t, `"invalidemail" is not valid "email"`, gjson.Get(actual, "ui.nodes.#(attributes.name==traits.email).messages.0.text").String(), "%s", actual)
+					assert.EqualValuesf(t, 4000040, gjson.Get(actual, "ui.nodes.#(attributes.name==traits.email).messages.0.id").Int(), "%s", actual)
+					assert.Equalf(t, "Enter a valid email address", gjson.Get(actual, "ui.nodes.#(attributes.name==traits.email).messages.0.text").String(), "%s", actual)
 				})
 			}
 
diff --git a/selfservice/strategy/profile/registration_test.go b/selfservice/strategy/profile/registration_test.go
@@ -117,8 +117,8 @@ func TestTwoStepRegistration(t *testing.T) {
 
 				fmt.Println(body)
 
-				require.Equal(t, int64(4000001), gjson.Get(body, "ui.nodes.#(attributes.name==traits.email).messages.0.id").Int(), "%s", body)
-				require.Equal(t, "\"invalidemail\" is not valid \"email\"", gjson.Get(body, "ui.nodes.#(attributes.name==traits.email).messages.0.text").String(), "%s", body)
+				require.Equal(t, int64(4000040), gjson.Get(body, "ui.nodes.#(attributes.name==traits.email).messages.0.id").Int(), "%s", body)
+				require.Equal(t, "Enter a valid email address", gjson.Get(body, "ui.nodes.#(attributes.name==traits.email).messages.0.text").String(), "%s", body)
 			})
 
 			t.Run("select_credentials", func(t *testing.T) {
@@ -240,8 +240,8 @@ func TestOneStepRegistration(t *testing.T) {
 
 				fmt.Println(body)
 
-				require.Equal(t, int64(4000001), gjson.Get(body, "ui.nodes.#(attributes.name==traits.email).messages.0.id").Int(), "%s", body)
-				require.Equal(t, "\"invalidemail\" is not valid \"email\"", gjson.Get(body, "ui.nodes.#(attributes.name==traits.email).messages.0.text").String(), "%s", body)
+				require.Equal(t, int64(4000040), gjson.Get(body, "ui.nodes.#(attributes.name==traits.email).messages.0.id").Int(), "%s", body)
+				require.Equal(t, "Enter a valid email address", gjson.Get(body, "ui.nodes.#(attributes.name==traits.email).messages.0.text").String(), "%s", body)
 			})
 		})
 	})
diff --git a/test/e2e/cypress/integration/profiles/email/registration/errors.spec.ts b/test/e2e/cypress/integration/profiles/email/registration/errors.spec.ts
@@ -138,7 +138,7 @@ describe("Registration failures with email profile", () => {
 
           cy.submitPasswordForm()
           cy.get(
-            '*[data-testid="ui/message/4000001"], *[data-testid="ui/message/4000002"]',
+            '*[data-testid="ui/message/4000040"], *[data-testid="ui/message/4000002"]',
           ).should("exist")
         })
 
diff --git a/test/e2e/cypress/integration/profiles/mobile/registration/errors.spec.ts b/test/e2e/cypress/integration/profiles/mobile/registration/errors.spec.ts
@@ -71,7 +71,7 @@ context("Mobile Profile", () => {
         cy.get('div[data-testid="submit-form"]').click()
         cy.get('*[data-testid="field/traits.email"]').should(
           "contain.text",
-          'valid "email"',
+          "Enter a valid email address",
         )
       })
 
diff --git a/text/id.go b/text/id.go
@@ -160,6 +160,8 @@ const (
 	ErrorValidationAccountNotFound
 	ErrorValidationCaptchaError
 	ErrorValidationPasswordNewSameAsOld
+	ErrorValidationEmail
+	ErrorValidationPhone
 )
 
 const (
diff --git a/text/id_test.go b/text/id_test.go
@@ -74,4 +74,7 @@ func TestIDs(t *testing.T) {
 
 	assert.Equal(t, 1070015, int(InfoNodeLabelCaptcha))
 	assert.Equal(t, 4000038, int(ErrorValidationCaptchaError))
+
+	assert.Equal(t, 4000040, int(ErrorValidationEmail))
+	assert.Equal(t, 4000041, int(ErrorValidationPhone))
 }
diff --git a/text/message_validation.go b/text/message_validation.go
@@ -197,6 +197,28 @@ func NewErrorValidationConstGeneric() *Message {
 	}
 }
 
+func NewErrorValidationEmail(value string) *Message {
+	return &Message{
+		ID:   ErrorValidationEmail,
+		Text: "Enter a valid email address",
+		Type: Error,
+		Context: context(map[string]any{
+			"value": value,
+		}),
+	}
+}
+
+func NewErrorValidationPhone(value string) *Message {
+	return &Message{
+		ID:   ErrorValidationPhone,
+		Text: "Enter a valid phone number",
+		Type: Error,
+		Context: context(map[string]any{
+			"value": value,
+		}),
+	}
+}
+
 func NewErrorValidationPasswordPolicyViolationGeneric(reason string) *Message {
 	return &Message{
 		ID:   ErrorValidationPasswordPolicyViolationGeneric,
diff --git a/ui/container/container.go b/ui/container/container.go
@@ -10,6 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"regexp"
 	"slices"
 	"strings"
 
@@ -215,6 +216,8 @@ func (c *Container) ParseError(group node.UiNodeGroup, err error) error {
 	return err
 }
 
+var formatErrorMatcher = regexp.MustCompile(`"([^"]+)"\s+is not valid\s+"([^"]+)"`)
+
 func translateValidationError(err *jsonschema.ValidationError) *text.Message {
 	segments := strings.Split(err.SchemaPtr, "/")
 	switch segments[len(segments)-1] {
@@ -271,6 +274,23 @@ func translateValidationError(err *jsonschema.ValidationError) *text.Message {
 			return text.NewErrorValidationConst(expectedValue)
 		}
 		return text.NewErrorValidationConstGeneric()
+	case "format":
+		m := formatErrorMatcher.FindStringSubmatch(err.Message)
+		if len(m) != 3 {
+			return text.NewValidationErrorGeneric(err.Message)
+		}
+
+		value := m[1]
+		format := m[2]
+
+		switch format {
+		case "email":
+			return text.NewErrorValidationEmail(value)
+		case "tel":
+			return text.NewErrorValidationPhone(value)
+		default:
+			return text.NewValidationErrorGeneric(err.Message)
+		}
 	default:
 		return text.NewValidationErrorGeneric(err.Message)
 	}
diff --git a/ui/container/container_test.go b/ui/container/container_test.go
@@ -44,7 +44,7 @@ func newFormRequest(t *testing.T, values url.Values) *http.Request {
 }
 
 func TestContainer(t *testing.T) {
-	var ctx = context.Background()
+	ctx := context.Background()
 	t.Run("method=NewFromJSON", func(t *testing.T) {
 		for k, tc := range []struct {
 			r      string
@@ -224,6 +224,11 @@ func TestContainer(t *testing.T) {
 				&node.Node{Group: node.DefaultGroup, Type: node.Input, Attributes: &node.InputAttributes{Name: "foo.bar.baz", Type: node.InputAttributeTypeText}, Messages: text.Messages{*text.NewValidationErrorGeneric("test")}, Meta: new(node.Meta)},
 			}}},
 			{err: &jsonschema.ValidationError{Message: "test", InstancePtr: ""}, expect: Container{Nodes: node.Nodes{}, Messages: text.Messages{*text.NewValidationErrorGeneric("test")}}},
+			{err: &jsonschema.ValidationError{Message: `"asd" is not valid "email"`, InstancePtr: "", SchemaPtr: "#/email/format"}, expect: Container{Nodes: node.Nodes{}, Messages: text.Messages{*text.NewErrorValidationEmail("asd")}}},
+			{err: &jsonschema.ValidationError{Message: `"asd" is not valid "tel"`, InstancePtr: "", SchemaPtr: "#/phone/format"}, expect: Container{Nodes: node.Nodes{}, Messages: text.Messages{*text.NewErrorValidationPhone("asd")}}},
+			{err: &jsonschema.ValidationError{Message: `"asd" is not valid "unknown-format"`, InstancePtr: "", SchemaPtr: "#/unknown/format"}, expect: Container{Nodes: node.Nodes{}, Messages: text.Messages{*text.NewValidationErrorGeneric(`"asd" is not valid "unknown-format"`)}}},
+			// Malformed format error message
+			{err: &jsonschema.ValidationError{Message: `"asd" is not valid "unknown-format`, InstancePtr: "", SchemaPtr: "#/unknown/format"}, expect: Container{Nodes: node.Nodes{}, Messages: text.Messages{*text.NewValidationErrorGeneric(`"asd" is not valid "unknown-format`)}}},
 		} {
 			t.Run(fmt.Sprintf("case=%d", k), func(t *testing.T) {
 				for _, in := range []error{tc.err, errors.WithStack(tc.err)} {

Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,8 @@ func init() {`
`188`	`188`	`"NewInfoSelfServiceLoginAAL2CodeAddress": text.NewInfoSelfServiceLoginAAL2CodeAddress("{channel}", "{address}"),`
`189`	`189`	`"NewErrorCaptchaFailed": text.NewErrorCaptchaFailed(),`
`190`	`190`	`"NewCaptchaContainerMessage": text.NewCaptchaContainerMessage(),`
	`191`	`+ "NewErrorValidationEmail": text.NewErrorValidationEmail("{value}"),`
	`192`	`+ "NewErrorValidationPhone": text.NewErrorValidationPhone("{value}"),`
`191`	`193`	`}`
`192`	`194`	`}`
`193`	`195`
Original file line number	Diff line number	Diff line change
`@@ -510,9 +510,8 @@ func TestRecovery(t *testing.T) {`
`510`	`510`	`})`
`511`	`511`	`activeMethod := gjson.Get(responseJSON, "active").String()`
`512`	`512`	`assert.EqualValues(t, node.CodeGroup, activeMethod, "expected method to be %s got %s", node.CodeGroup, activeMethod)`
`513`		`- expectedMessage := fmt.Sprintf("%q is not valid \"email\"", email)`
`514`	`513`	`actualMessage := gjson.Get(responseJSON, "ui.nodes.#(attributes.name==email).messages.0.text").String()`
`515`		`- assert.EqualValues(t, expectedMessage, actualMessage, "%s", responseJSON)`
	`514`	`+ assert.EqualValues(t, "Enter a valid email address", actualMessage, "%s", responseJSON)`
`516`	`515`	`})`
`517`	`516`	`}`
`518`	`517`	`}`
`@@ -1354,9 +1353,8 @@ func TestRecovery_WithContinueWith(t *testing.T) {`
`1354`	`1353`	`})`
`1355`	`1354`	`activeMethod := gjson.Get(responseJSON, "active").String()`
`1356`	`1355`	`assert.EqualValues(t, node.CodeGroup, activeMethod, "expected method to be %s got %s", node.CodeGroup, activeMethod)`
`1357`		`- expectedMessage := fmt.Sprintf("%q is not valid \"email\"", email)`
`1358`	`1356`	`actualMessage := gjson.Get(responseJSON, "ui.nodes.#(attributes.name==email).messages.0.text").String()`
`1359`		`- assert.EqualValues(t, expectedMessage, actualMessage, "%s", responseJSON)`
	`1357`	`+ assert.EqualValues(t, "Enter a valid email address", actualMessage, "%s", responseJSON)`
`1360`	`1358`	`}`
`1361`	`1359`	`})`
`1362`	`1360`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ func TestVerification(t *testing.T) {`
`167`	`167`	`t.Run("description=should require a valid email to be sent", func(t *testing.T) {`
`168`	`168`	`check := func(t *testing.T, actual string, value string) {`
`169`	`169`	`assert.EqualValues(t, string(node.CodeGroup), gjson.Get(actual, "active").String(), "%s", actual)`
`170`		`- assert.EqualValues(t, fmt.Sprintf("%q is not valid \"email\"", value),`
	`170`	`+ assert.EqualValues(t, "Enter a valid email address",`
`171`	`171`	`gjson.Get(actual, "ui.nodes.#(attributes.name==email).messages.0.text").String(),`
`172`	`172`	`"%s", actual)`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ func TestRecovery(t *testing.T) {`
`329`	`329`	`t.Run("description=should require a valid email to be sent", func(t *testing.T) {`
`330`	`330`	`check := func(t *testing.T, actual string, value string) {`
`331`	`331`	`assert.EqualValues(t, node.LinkGroup, gjson.Get(actual, "active").String(), "%s", actual)`
`332`		`- assert.EqualValues(t, fmt.Sprintf("%q is not valid \"email\"", value),`
	`332`	`+ assert.EqualValues(t, "Enter a valid email address",`
`333`	`333`	`gjson.Get(actual, "ui.nodes.#(attributes.name==email).messages.0.text").String(),`
`334`	`334`	`"%s", actual)`
`335`	`335`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func TestVerification(t *testing.T) {`
`145`	`145`	`t.Run("description=should require a valid email to be sent", func(t *testing.T) {`
`146`	`146`	`check := func(t *testing.T, actual string, value string) {`
`147`	`147`	`assert.EqualValues(t, string(node.LinkGroup), gjson.Get(actual, "active").String(), "%s", actual)`
`148`		`- assert.EqualValues(t, fmt.Sprintf("%q is not valid \"email\"", value),`
	`148`	`+ assert.EqualValues(t, "Enter a valid email address",`
`149`	`149`	`gjson.Get(actual, "ui.nodes.#(attributes.name==email).messages.0.text").String(),`
`150`	`150`	`"%s", actual)`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -800,8 +800,8 @@ func TestRegistration(t *testing.T) {`
`800`	`800`	`require.EqualValues(t, http.StatusBadRequest, resp.StatusCode)`
`801`	`801`	`}`
`802`	`802`
`803`		`- assert.EqualValuesf(t, 4000001, gjson.Get(actual, "ui.nodes.#(attributes.name==traits.email).messages.0.id").Int(), "%s", actual)`
`804`		- assert.Equalf(t, `"invalidemail" is not valid "email"`, gjson.Get(actual, "ui.nodes.#(attributes.name==traits.email).messages.0.text").String(), "%s", actual)
	`803`	`+ assert.EqualValuesf(t, 4000040, gjson.Get(actual, "ui.nodes.#(attributes.name==traits.email).messages.0.id").Int(), "%s", actual)`
	`804`	`+ assert.Equalf(t, "Enter a valid email address", gjson.Get(actual, "ui.nodes.#(attributes.name==traits.email).messages.0.text").String(), "%s", actual)`
`805`	`805`	`})`
`806`	`806`	`}`
`807`	`807`