fix: recovery code expires_in regression

pi1814 · ory-bot · commit 8f5481428695 · 2026-03-20T08:48:53.000Z
GitOrigin-RevId: 00c5dfe3b3c2ded1f6622410bb4b7c7f6cfbf129
diff --git a/selfservice/strategy/code/strategy_recovery_admin.go b/selfservice/strategy/code/strategy_recovery_admin.go
@@ -177,7 +177,7 @@ func (s *Strategy) createRecoveryCodeForIdentity(w http.ResponseWriter, r *http.
 		return
 	}
 
-	recoveryFlow, err := recovery.NewFlow(config, config.SelfServiceFlowRecoveryRequestLifespan(ctx), s.deps.GenerateCSRFToken(r), r, recovery.Strategies{s}, flowType)
+	recoveryFlow, err := recovery.NewFlow(config, expiresIn, s.deps.GenerateCSRFToken(r), r, recovery.Strategies{s}, flowType)
 	if err != nil {
 		s.deps.Writer().WriteError(w, r, err)
 		return
diff --git a/selfservice/strategy/code/strategy_recovery_admin_test.go b/selfservice/strategy/code/strategy_recovery_admin_test.go
@@ -160,7 +160,7 @@ func TestAdminStrategy(t *testing.T) {
 		require.True(t, code.ExpiresAt.Before(time.Now().Add(conf.SelfServiceFlowRecoveryRequestLifespan(t.Context()))))
 
 		body := submitRecoveryCode(t, nil, code.RecoveryLink, code.RecoveryCode)
-		assert.Equal(t, "The recovery code is invalid or has already been used. Please try again.", gjson.GetBytes(body, "ui.messages.0.text").Str, "%s", body)
+		assert.Contains(t, gjson.GetBytes(body, "ui.messages.0.text").Str, "The recovery flow expired", "%s", body)
 
 		// The recovery address should not be verified if the flow was initiated by the admins
 		assertEmailNotVerified(t, recoveryEmail)

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ func (s Strategy) createRecoveryCodeForIdentity(w http.ResponseWriter, r http.`
`177`	`177`	`return`
`178`	`178`	`}`
`179`	`179`
`180`		`- recoveryFlow, err := recovery.NewFlow(config, config.SelfServiceFlowRecoveryRequestLifespan(ctx), s.deps.GenerateCSRFToken(r), r, recovery.Strategies{s}, flowType)`
	`180`	`+ recoveryFlow, err := recovery.NewFlow(config, expiresIn, s.deps.GenerateCSRFToken(r), r, recovery.Strategies{s}, flowType)`
`181`	`181`	`if err != nil {`
`182`	`182`	`s.deps.Writer().WriteError(w, r, err)`
`183`	`183`	`return`