fix: use correct redirection for registration

ory · Aug 26, 2020 · 8d47113 · 8d47113
1 parent c5f361f
commit 8d47113
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/selfservice/strategy/password/registration.go b/selfservice/strategy/password/registration.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/ory/kratos/driver/configuration"
 	"github.com/ory/kratos/selfservice/flow"
-	"github.com/ory/kratos/selfservice/flow/settings"
+	"github.com/ory/kratos/session"
 
 	"github.com/ory/herodot"
 	"github.com/ory/x/urlx"
@@ -40,7 +40,14 @@ type RegistrationFormPayload struct {
 
 func (s *Strategy) RegisterRegistrationRoutes(public *x.RouterPublic) {
 	s.d.CSRFHandler().ExemptPath(RouteRegistration)
-	public.POST(RouteRegistration, s.d.SessionHandler().IsNotAuthenticated(s.handleRegistration, settings.OnUnauthenticated(s.c, s.d)))
+	public.POST(RouteRegistration, s.d.SessionHandler().IsNotAuthenticated(s.handleRegistration, func(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+		handler := session.RedirectOnAuthenticated(s.c)
+		if x.IsJSONRequest(r) {
+			handler = session.RespondWithJSONErrorOnAuthenticated(s.d.Writer(), registration.ErrAlreadyLoggedIn)
+		}
+
+		handler(w, r, ps)
+	}))
 }
 
 func (s *Strategy) handleRegistrationError(w http.ResponseWriter, r *http.Request, rr *registration.Flow, p *RegistrationFormPayload, err error) {