Skip to content

Commit

Permalink
refactor: rename LoginRequestErrorHandler to LoginFlowErrorHandler
Browse files Browse the repository at this point in the history
  • Loading branch information
aeneasr committed Aug 25, 2020
1 parent bbcdecf commit 66ae029
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion driver/registry_default_login.go
Expand Up @@ -38,7 +38,7 @@ func (m *RegistryDefault) LoginHandler() *login.Handler {
return m.selfserviceLoginHandler
}

func (m *RegistryDefault) LoginRequestErrorHandler() *login.ErrorHandler {
func (m *RegistryDefault) LoginFlowErrorHandler() *login.ErrorHandler {
if m.selfserviceLoginRequestErrorHandler == nil {
m.selfserviceLoginRequestErrorHandler = login.NewFlowErrorHandler(m, m.c)
}
Expand Down
2 changes: 1 addition & 1 deletion selfservice/flow/login/error.go
Expand Up @@ -34,7 +34,7 @@ type (
HandlerProvider
}

ErrorHandlerProvider interface{ LoginRequestErrorHandler() *ErrorHandler }
ErrorHandlerProvider interface{ LoginFlowErrorHandler() *ErrorHandler }

ErrorHandler struct {
d errorHandlerDependencies
Expand Down
2 changes: 1 addition & 1 deletion selfservice/flow/login/error_test.go
Expand Up @@ -41,7 +41,7 @@ func TestHandleError(t *testing.T) {
testhelpers.NewLoginUIRequestEchoServer(t, reg)
testhelpers.NewErrorTestServer(t, reg)

h := reg.LoginRequestErrorHandler()
h := reg.LoginFlowErrorHandler()
sdk := testhelpers.NewSDKClient(admin)

var loginFlow *login.Flow
Expand Down
2 changes: 1 addition & 1 deletion selfservice/strategy/oidc/strategy.go
Expand Up @@ -414,7 +414,7 @@ func (s *Strategy) handleError(w http.ResponseWriter, r *http.Request, rid uuid.
}

if lr, rerr := s.d.LoginFlowPersister().GetLoginFlow(r.Context(), rid); rerr == nil {
s.d.LoginRequestErrorHandler().WriteFlowError(w, r, s.ID(), lr, err)
s.d.LoginFlowErrorHandler().WriteFlowError(w, r, s.ID(), lr, err)
return
} else if sr, rerr := s.d.SettingsRequestPersister().GetSettingsRequest(r.Context(), rid); rerr == nil {
s.d.SettingsRequestErrorHandler().HandleSettingsError(w, r, sr, err, s.SettingsStrategyID())
Expand Down
2 changes: 1 addition & 1 deletion selfservice/strategy/password/login.go
Expand Up @@ -39,7 +39,7 @@ func (s *Strategy) handleLoginError(w http.ResponseWriter, r *http.Request, rr *
}
}

s.d.LoginRequestErrorHandler().WriteFlowError(w, r, identity.CredentialsTypePassword, rr, err)
s.d.LoginFlowErrorHandler().WriteFlowError(w, r, identity.CredentialsTypePassword, rr, err)
}

// nolint:deadcode,unused
Expand Down

0 comments on commit 66ae029

Please sign in to comment.