fix: disappearing title label on verification and recovery flow (#2613)

Closes #2591
ory · Jul 25, 2022 · 29aa3b6 · 29aa3b6
1 parent 4e5aac2
commit 29aa3b6
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/...stRecovery-description=should_set_all_the_correct_recovery_payloads_after_submission.json b/...stRecovery-description=should_set_all_the_correct_recovery_payloads_after_submission.json
@@ -24,7 +24,13 @@
       "node_type": "input"
     },
     "messages": [],
-    "meta": {}
+    "meta": {
+      "label": {
+        "id": 1070007,
+        "text": "Email",
+        "type": "info"
+      }
+    }
   },
   {
     "type": "input",

diff --git a/...cation-description=should_set_all_the_correct_verification_payloads_after_submission.json b/...cation-description=should_set_all_the_correct_verification_payloads_after_submission.json
@@ -24,7 +24,13 @@
       "node_type": "input"
     },
     "messages": [],
-    "meta": {}
+    "meta": {
+      "label": {
+        "id": 1070007,
+        "text": "Email",
+        "type": "info"
+      }
+    }
   },
   {
     "type": "input",

diff --git a/selfservice/strategy/link/strategy_recovery.go b/selfservice/strategy/link/strategy_recovery.go
@@ -437,7 +437,7 @@ func (s *Strategy) recoveryHandleFormSubmission(w http.ResponseWriter, r *http.R
 	f.UI.SetCSRF(s.d.GenerateCSRFToken(r))
 	f.UI.GetNodes().Upsert(
 		// v0.5: form.Field{Name: "email", Type: "email", Required: true, Value: body.Body.Email}
-		node.NewInputField("email", body.Email, node.LinkGroup, node.InputAttributeTypeEmail, node.WithRequiredInputAttribute),
+		node.NewInputField("email", body.Email, node.LinkGroup, node.InputAttributeTypeEmail, node.WithRequiredInputAttribute).WithMetaLabel(text.NewInfoNodeInputEmail()),
 	)
 
 	f.Active = sqlxx.NullString(s.RecoveryNodeGroup())
@@ -483,7 +483,7 @@ func (s *Strategy) HandleRecoveryError(w http.ResponseWriter, r *http.Request, r
 		req.UI.SetCSRF(s.d.GenerateCSRFToken(r))
 		req.UI.GetNodes().Upsert(
 			// v0.5: form.Field{Name: "email", Type: "email", Required: true, Value: body.Body.Email}
-			node.NewInputField("email", email, node.LinkGroup, node.InputAttributeTypeEmail, node.WithRequiredInputAttribute),
+			node.NewInputField("email", email, node.LinkGroup, node.InputAttributeTypeEmail, node.WithRequiredInputAttribute).WithMetaLabel(text.NewInfoNodeInputEmail()),
 		)
 	}
 

diff --git a/selfservice/strategy/link/strategy_verification.go b/selfservice/strategy/link/strategy_verification.go
@@ -75,7 +75,7 @@ func (s *Strategy) handleVerificationError(w http.ResponseWriter, r *http.Reques
 		f.UI.SetCSRF(s.d.GenerateCSRFToken(r))
 		f.UI.GetNodes().Upsert(
 			// v0.5: form.Field{Name: "email", Type: "email", Required: true, Value: body.Body.Email}
-			node.NewInputField("email", body.Email, node.LinkGroup, node.InputAttributeTypeEmail, node.WithRequiredInputAttribute),
+			node.NewInputField("email", body.Email, node.LinkGroup, node.InputAttributeTypeEmail, node.WithRequiredInputAttribute).WithMetaLabel(text.NewInfoNodeInputEmail()),
 		)
 	}
 
@@ -166,7 +166,7 @@ func (s *Strategy) verificationHandleFormSubmission(w http.ResponseWriter, r *ht
 	f.UI.SetCSRF(s.d.GenerateCSRFToken(r))
 	f.UI.GetNodes().Upsert(
 		// v0.5: form.Field{Name: "email", Type: "email", Required: true, Value: body.Body.Email}
-		node.NewInputField("email", body.Email, node.LinkGroup, node.InputAttributeTypeEmail, node.WithRequiredInputAttribute),
+		node.NewInputField("email", body.Email, node.LinkGroup, node.InputAttributeTypeEmail, node.WithRequiredInputAttribute).WithMetaLabel(text.NewInfoNodeInputEmail()),
 	)
 
 	f.Active = sqlxx.NullString(s.VerificationNodeGroup())

diff --git a/test/e2e/cypress/support/commands.ts b/test/e2e/cypress/support/commands.ts
@@ -396,6 +396,11 @@ Cypress.Commands.add('recoverApi', ({ email, returnTo }) => {
   cy.request({ url })
     .then(({ body }) => {
       const form = body.ui
+      // label should still exist after request, for more detail: #2591
+      expect(form.nodes[1].meta).to.not.be.null
+      expect(form.nodes[1].meta.label).to.not.be.null
+      expect(form.nodes[1].meta.label.text).to.equal('Email')
+
       return cy.request({
         method: form.method,
         body: mergeFields(form, { email, method: 'link' }),
@@ -415,6 +420,11 @@ Cypress.Commands.add('verificationApi', ({ email, returnTo }) => {
   cy.request({ url })
     .then(({ body }) => {
       const form = body.ui
+      // label should still exist after request, for more detail: #2591
+      expect(form.nodes[1].meta).to.not.be.null
+      expect(form.nodes[1].meta.label).to.not.be.null
+      expect(form.nodes[1].meta.label.text).to.equal('Email')
+
       return cy.request({
         method: form.method,
         body: mergeFields(form, { email, method: 'link' }),