fix: add flow id when return_to is passed to the verification (#2482)

ory · May 23, 2022 · c2b1c23 · c2b1c23
1 parent 083e67f
commit c2b1c23
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/selfservice/flow/verification/flow.go b/selfservice/flow/verification/flow.go
@@ -175,7 +175,9 @@ func (f *Flow) Valid() error {
 }
 
 func (f *Flow) AppendTo(src *url.URL) *url.URL {
-	return urlx.CopyWithQuery(src, url.Values{"flow": {f.ID.String()}})
+	values := src.Query()
+	values.Set("flow", f.ID.String())
+	return urlx.CopyWithQuery(src, values)
 }
 
 func (f Flow) GetID() uuid.UUID {

diff --git a/selfservice/strategy/link/strategy_verification.go b/selfservice/strategy/link/strategy_verification.go
@@ -265,7 +265,7 @@ func (s *Strategy) verificationUseToken(w http.ResponseWriter, r *http.Request,
 		return errors.WithStack(flow.ErrCompletedByStrategy)
 	}
 
-	http.Redirect(w, r, returnTo.String(), http.StatusSeeOther)
+	http.Redirect(w, r, f.AppendTo(returnTo).String(), http.StatusSeeOther)
 	return errors.WithStack(flow.ErrCompletedByStrategy)
 }
 

diff --git a/selfservice/strategy/link/strategy_verification_test.go b/selfservice/strategy/link/strategy_verification_test.go
@@ -380,7 +380,6 @@ func TestVerification(t *testing.T) {
 		assert.Equal(t, http.StatusSeeOther, res.StatusCode)
 		redirectURL, err := res.Location()
 		require.NoError(t, err)
-		assert.Equal(t, returnToURL, redirectURL.String())
-
+		assert.Equal(t, returnToURL + "?flow=" + flow.ID.String(), redirectURL.String())
 	})
 }
diff --git a/test/e2e/cypress/support/commands.ts b/test/e2e/cypress/support/commands.ts
@@ -873,14 +873,16 @@ Cypress.Commands.add(
       expect(message.toAddresses[0].trim()).to.equal(email)
 
       const link = parseHtml(message.body).querySelector('a')
+      const flow = new URL(link.href).searchParams.get('flow')
+
       expect(link).to.not.be.null
       expect(link.href).to.contain(APP_URL)
 
       cy.request({ url: link.href, followRedirect: false }).should(
         (response) => {
           expect(response.status).to.eq(303)
           if (redirectTo) {
-            expect(response.redirectedToUrl).to.eq(redirectTo)
+            expect(response.redirectedToUrl).to.eq(`${redirectTo}?flow=${flow}`)
           } else {
             expect(response.redirectedToUrl).to.not.contain('verification')
           }