apply review changes

pcaillaudm · ory-bot · commit e7d5dd272b36 · 2026-02-19T15:03:41.000Z
GitOrigin-RevId: 9d4a25d813cb86f4a42fe879d7d1c346674e5dc6
diff --git a/driver/registry_default_verification.go b/driver/registry_default_verification.go
@@ -54,7 +54,7 @@ func (m *RegistryDefault) LinkSender() *link.Sender {
 // GetActiveVerificationStrategies returns the currently active verification strategies.
 // It returns a list of all strategies and the specific primary strategy.
 // If no primary verification strategy has been set, an error is returned.
-func (m *RegistryDefault) GetActiveVerificationStrategies(ctx context.Context) (active verification.Strategies, primary verification.Strategy, err error) {
+func (m *RegistryDefault) GetActiveVerificationStrategies(ctx context.Context) (active verification.Strategies, primary verification.PrimaryStrategy, err error) {
 	as := m.Config().SelfServiceFlowVerificationUse(ctx)
 	s, ps, err := m.VerificationStrategies(ctx).ActiveStrategies(as)
 	if err != nil {
diff --git a/selfservice/flow/verification/flow.go b/selfservice/flow/verification/flow.go
@@ -144,8 +144,8 @@ func NewFlow(conf *config.Config, exp time.Duration, csrf string, r *http.Reques
 	}
 
 	for _, strategy := range strategies {
-		if strategy.IsPrimary() {
-			f.Active = sqlxx.NullString(strategy.NodeGroup())
+		if ps, isPrimary := strategy.(PrimaryStrategy); isPrimary {
+			f.Active = sqlxx.NullString(ps.NodeGroup())
 		}
 		if err := strategy.PopulateVerificationMethod(r, f); err != nil {
 			return nil, err
diff --git a/selfservice/flow/verification/handler.go b/selfservice/flow/verification/handler.go
@@ -440,8 +440,8 @@ func (h *Handler) updateVerificationFlow(w http.ResponseWriter, r *http.Request)
 	var g node.UiNodeGroup
 	var found bool
 	for _, ss := range h.d.AllVerificationStrategies() {
-		// If an active strategy is set, but it does not match the current strategy, that strategy is not responsible anyways.
-		if ss.IsPrimary() && f.Active.String() != "" && f.Active.String() != ss.VerificationStrategyID() {
+		// If a primary strategy is set, but it does not match the current strategy, that strategy is not responsible anyways.
+		if ps, isPrimary := ss.(PrimaryStrategy); isPrimary && f.Active.String() != "" && f.Active.String() != ps.VerificationStrategyID() {
 			continue
 		}
 
diff --git a/selfservice/flow/verification/strategy.go b/selfservice/flow/verification/strategy.go
@@ -25,29 +25,31 @@ const (
 type (
 	Strategy interface {
 		VerificationStrategyID() string
-		IsPrimary() bool
 		NodeGroup() node.UiNodeGroup
 		PopulateVerificationMethod(*http.Request, *Flow) error
 		Verify(w http.ResponseWriter, r *http.Request, f *Flow) (err error)
+	}
+	PrimaryStrategy interface {
+		Strategy
 		SendVerificationCode(context.Context, *Flow, *identity.Identity, *identity.VerifiableAddress) error
 	}
 	Strategies       []Strategy
 	StrategyProvider interface {
 		VerificationStrategies(ctx context.Context) Strategies
 		AllVerificationStrategies() Strategies
-		GetActiveVerificationStrategies(context.Context) (active Strategies, primary Strategy, err error)
+		GetActiveVerificationStrategies(context.Context) (active Strategies, primary PrimaryStrategy, err error)
 	}
 )
 
-func (s Strategies) ActiveStrategies(id string) (active Strategies, primary Strategy, err error) {
+func (s Strategies) ActiveStrategies(id string) (active Strategies, primary PrimaryStrategy, err error) {
 	ids := make([]string, len(s))
 	activeStrategies := Strategies{}
 	for k, ss := range s {
 		ids[k] = ss.VerificationStrategyID()
-		if ss.VerificationStrategyID() == id || !ss.IsPrimary() {
+		if ps, isPrimary := ss.(PrimaryStrategy); ss.VerificationStrategyID() == id || !isPrimary {
 			activeStrategies = append(activeStrategies, ss)
-			if ss.IsPrimary() {
-				primary = ss
+			if isPrimary {
+				primary = ps
 			}
 		}
 	}
diff --git a/selfservice/hook/require_verified_address.go b/selfservice/hook/require_verified_address.go
@@ -106,8 +106,8 @@ func (e *AddressVerifier) ExecuteLoginPostHook(w http.ResponseWriter, r *http.Re
 
 		verificationFlow.State = flow.StateEmailSent
 		for _, strategy := range strategies {
-			if strategy.IsPrimary() {
-				verificationFlow.Active = sqlxx.NullString(strategy.NodeGroup())
+			if ps, isPrimary := strategy.(verification.PrimaryStrategy); isPrimary {
+				verificationFlow.Active = sqlxx.NullString(ps.NodeGroup())
 			}
 			if err := strategy.PopulateVerificationMethod(r, verificationFlow); err != nil {
 				return err

Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,8 @@ func NewFlow(conf config.Config, exp time.Duration, csrf string, r http.Reques`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`for _, strategy := range strategies {`
`147`		`- if strategy.IsPrimary() {`
`148`		`- f.Active = sqlxx.NullString(strategy.NodeGroup())`
	`147`	`+ if ps, isPrimary := strategy.(PrimaryStrategy); isPrimary {`
	`148`	`+ f.Active = sqlxx.NullString(ps.NodeGroup())`
`149`	`149`	`}`
`150`	`150`	`if err := strategy.PopulateVerificationMethod(r, f); err != nil {`
`151`	`151`	`return nil, err`