fix tests

ory · Dec 12, 2024 · be22f90 · be22f90
1 parent 60c8aa8
commit be22f90
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/selfservice/strategy/oidc/strategy.go b/selfservice/strategy/oidc/strategy.go
@@ -118,11 +118,12 @@ func isForced(req interface{}) bool {
 // Strategy implements selfservice.LoginStrategy, selfservice.RegistrationStrategy and selfservice.SettingsStrategy.
 // It supports login, registration and settings via OpenID Providers.
 type Strategy struct {
-	d                          Dependencies
-	validator                  *schema.Validator
-	dec                        *decoderx.HTTP
-	credType                   identity.CredentialsType
-	handleUnknownProviderError func(err error) error
+	d                           Dependencies
+	validator                   *schema.Validator
+	dec                         *decoderx.HTTP
+	credType                    identity.CredentialsType
+	handleUnknownProviderError  func(err error) error
+	handleMethodNotAllowedError func(err error) error
 }
 
 type AuthCodeContainer struct {
@@ -217,12 +218,19 @@ func WithUnknownProviderHandler(handler func(error) error) NewStrategyOpt {
 	return func(s *Strategy) { s.handleUnknownProviderError = handler }
 }
 
+// WithHandleMethodNotAllowedError overrides the error returned when method is
+// not allowed.
+func WithHandleMethodNotAllowedError(handler func(error) error) NewStrategyOpt {
+	return func(s *Strategy) { s.handleMethodNotAllowedError = handler }
+}
+
 func NewStrategy(d any, opts ...NewStrategyOpt) *Strategy {
 	s := &Strategy{
-		d:                          d.(Dependencies),
-		validator:                  schema.NewValidator(),
-		credType:                   identity.CredentialsTypeOIDC,
-		handleUnknownProviderError: func(err error) error { return err },
+		d:                           d.(Dependencies),
+		validator:                   schema.NewValidator(),
+		credType:                    identity.CredentialsTypeOIDC,
+		handleUnknownProviderError:  func(err error) error { return err },
+		handleMethodNotAllowedError: func(err error) error { return err },
 	}
 	for _, opt := range opts {
 		opt(s)

diff --git a/selfservice/strategy/oidc/strategy_login.go b/selfservice/strategy/oidc/strategy_login.go
@@ -217,12 +217,12 @@ func (s *Strategy) Login(w http.ResponseWriter, r *http.Request, f *login.Flow,
 		return nil, errors.WithStack(flow.ErrStrategyNotResponsible)
 	}
 
-	provider, err := s.provider(ctx, pid)
-	if err != nil {
-		return nil, s.handleError(ctx, w, r, f, pid, nil, err)
+	if err := flow.MethodEnabledAndAllowed(ctx, f.GetFlowName(), s.SettingsStrategyID(), s.SettingsStrategyID(), s.d); err != nil {
+		return nil, s.handleError(ctx, w, r, f, pid, nil, s.handleMethodNotAllowedError(err))
 	}
 
-	if err := flow.MethodEnabledAndAllowed(ctx, f.GetFlowName(), s.SettingsStrategyID(), s.SettingsStrategyID(), s.d); err != nil {
+	provider, err := s.provider(ctx, pid)
+	if err != nil {
 		return nil, s.handleError(ctx, w, r, f, pid, nil, err)
 	}
 

diff --git a/selfservice/strategy/oidc/strategy_registration.go b/selfservice/strategy/oidc/strategy_registration.go
@@ -187,12 +187,12 @@ func (s *Strategy) Register(w http.ResponseWriter, r *http.Request, f *registrat
 		return errors.WithStack(flow.ErrStrategyNotResponsible)
 	}
 
-	provider, err := s.provider(ctx, pid)
-	if err != nil {
-		return s.handleError(ctx, w, r, f, pid, nil, err)
+	if err := flow.MethodEnabledAndAllowed(ctx, f.GetFlowName(), s.SettingsStrategyID(), s.SettingsStrategyID(), s.d); err != nil {
+		return s.handleError(ctx, w, r, f, pid, nil, s.handleMethodNotAllowedError(err))
 	}
 
-	if err := flow.MethodEnabledAndAllowed(ctx, f.GetFlowName(), s.SettingsStrategyID(), s.SettingsStrategyID(), s.d); err != nil {
+	provider, err := s.provider(ctx, pid)
+	if err != nil {
 		return s.handleError(ctx, w, r, f, pid, nil, err)
 	}