feat: Improve default text for verification code sent state to be inclusive of non-email methods

Author: aran

cmd/clidoc/main.go

@@ -76,7 +76,7 @@ func init() {
 		"NewErrorValidationVerificationFlowExpired":               text.NewErrorValidationVerificationFlowExpired(aSecondAgo),
 		"NewInfoSelfServiceVerificationSuccessful":                text.NewInfoSelfServiceVerificationSuccessful(),
 		"NewVerificationEmailSent":                                text.NewVerificationEmailSent(),
-		"NewVerificationEmailWithCodeSent":                        text.NewVerificationEmailWithCodeSent(),
+		"NewVerificationMessageWithCodeSent":                      text.NewVerificationMessageWithCodeSent(),
 		"NewErrorValidationVerificationTokenInvalidOrAlreadyUsed": text.NewErrorValidationVerificationTokenInvalidOrAlreadyUsed(),
 		"NewErrorValidationVerificationRetrySuccess":              text.NewErrorValidationVerificationRetrySuccess(),
 		"NewErrorValidationVerificationStateFailure":              text.NewErrorValidationVerificationStateFailure(),

selfservice/strategy/code/strategy.go

@@ -379,7 +379,7 @@ func (s *Strategy) populateSecretSentFlow(ctx context.Context, f flow.Flow) erro
 	case flow.VerificationFlow:
 		route = verification.RouteSubmitFlow
 		codeMetaLabel = text.NewInfoNodeLabelVerificationCode()
-		message = text.NewVerificationEmailWithCodeSent()
+		message = text.NewVerificationMessageWithCodeSent()
 
 	case flow.LoginFlow:
 		route = login.RouteSubmitFlow
@@ -533,4 +533,4 @@ func MaskAddress(input string) string {
 		return input
 	}
 	return input[:3] + strings.Repeat("*", 4) + input[len(input)-2:]
-}
+}

selfservice/strategy/code/strategy_verification_test.go

@@ -200,7 +200,7 @@ func TestVerification(t *testing.T) {
 		check := func(t *testing.T, actual string) {
 			assert.EqualValues(t, string(node.CodeGroup), gjson.Get(actual, "active").String(), "%s", actual)
 			assert.EqualValues(t, email, gjson.Get(actual, "ui.nodes.#(attributes.name==email).attributes.value").String(), "%s", actual)
-			assertx.EqualAsJSON(t, text.NewVerificationEmailWithCodeSent(), json.RawMessage(gjson.Get(actual, "ui.messages.0").Raw))
+			assertx.EqualAsJSON(t, text.NewVerificationMessageWithCodeSent(), json.RawMessage(gjson.Get(actual, "ui.messages.0").Raw))
 
 			message := testhelpers.CourierExpectMessage(ctx, t, reg, email, "Someone tried to verify this email address")
 			assert.Contains(t, message.Body, "If this was you, check if you signed up using a different address.")
@@ -308,7 +308,7 @@ func TestVerification(t *testing.T) {
 		check := func(t *testing.T, actual string) {
 			assert.EqualValues(t, string(node.CodeGroup), gjson.Get(actual, "active").String(), "%s", actual)
 			assert.EqualValues(t, verificationEmail, gjson.Get(actual, "ui.nodes.#(attributes.name==email).attributes.value").String(), "%s", actual)
-			assertx.EqualAsJSON(t, text.NewVerificationEmailWithCodeSent(), json.RawMessage(gjson.Get(actual, "ui.messages.0").Raw))
+			assertx.EqualAsJSON(t, text.NewVerificationMessageWithCodeSent(), json.RawMessage(gjson.Get(actual, "ui.messages.0").Raw))
 
 			message := testhelpers.CourierExpectMessage(ctx, t, reg, verificationEmail, "Use code")
 			assert.Contains(t, message.Body, "Verify your account with the following code")
@@ -664,7 +664,8 @@ func TestVerification(t *testing.T) {
 		flow, _, _ := newValidFlow(t, flow.TypeBrowser,
 			public.URL+verification.RouteInitBrowserFlow+"?"+url.Values{
 				"return_to":       {returnToURL},
-				"login_challenge": {"any_valid_challenge"}}.Encode())
+				"login_challenge": {"any_valid_challenge"},
+			}.Encode())
 
 		body := fmt.Sprintf(
 			`{"csrf_token":"%s","code":"%s"}`, flow.CSRFToken, "2475",

text/id.go

@@ -108,10 +108,11 @@ const (
 )
 
 const (
-	InfoSelfServiceVerification                  ID = 1080000 + iota // 1080000
-	InfoSelfServiceVerificationEmailSent                             // 1080001
-	InfoSelfServiceVerificationSuccessful                            // 1080002
-	InfoSelfServiceVerificationEmailWithCodeSent                     // 1080003
+	InfoSelfServiceVerification                    ID = 1080000 + iota // 1080000
+	InfoSelfServiceVerificationEmailSent                               // 1080001
+	InfoSelfServiceVerificationSuccessful                              // 1080002
+	InfoSelfServiceVerificationEmailWithCodeSent                       // 1080003
+	InfoSelfServiceVerificationMessageWithCodeSent                     // 1080004
 )
 
 const (

text/id_test.go

@@ -76,6 +76,7 @@ func TestIDs(t *testing.T) {
 	assert.Equal(t, 1080001, int(InfoSelfServiceVerificationEmailSent))
 	assert.Equal(t, 1080002, int(InfoSelfServiceVerificationSuccessful))
 	assert.Equal(t, 1080003, int(InfoSelfServiceVerificationEmailWithCodeSent))
+	assert.Equal(t, 1080004, int(InfoSelfServiceVerificationMessageWithCodeSent))
 
 	assert.Equal(t, 1070015, int(InfoNodeLabelCaptcha))
 	assert.Equal(t, 4000038, int(ErrorValidationCaptchaError))

text/message_verification.go

@@ -68,10 +68,10 @@ func NewErrorValidationVerificationCodeInvalidOrAlreadyUsed() *Message {
 	}
 }
 
-func NewVerificationEmailWithCodeSent() *Message {
+func NewVerificationMessageWithCodeSent() *Message {
 	return &Message{
-		ID:   InfoSelfServiceVerificationEmailWithCodeSent,
+		ID:   InfoSelfServiceVerificationMessageWithCodeSent,
 		Type: Info,
-		Text: "An email containing a verification code has been sent to the email address you provided. If you have not received an email, check the spelling of the address and make sure to use the address you registered with.",
+		Text: "A verification code has been sent to contact information you provided.",
 	}
 }