From c8d55b339647cdca3c9beace760dc3a9beac31c1 Mon Sep 17 00:00:00 2001
From: aeneasr <3372410+aeneasr@users.noreply.github.com>
Date: Fri, 21 Jan 2022 18:31:56 +0100
Subject: [PATCH] fix: pass context to registration flow

---
 selfservice/flow/registration/error.go   | 2 +-
 selfservice/flow/registration/handler.go | 2 +-
 selfservice/flow/registration/sort.go    | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/selfservice/flow/registration/error.go b/selfservice/flow/registration/error.go
index f8919994e83..cd0a07ec60f 100644
--- a/selfservice/flow/registration/error.go
+++ b/selfservice/flow/registration/error.go
@@ -104,7 +104,7 @@ func (s *ErrorHandler) WriteFlowError(
 		return
 	}
 
-	if err := SortNodes(f.UI.Nodes, ds.String()); err != nil {
+	if err := SortNodes(r.Context(), f.UI.Nodes, ds.String()); err != nil {
 		s.forward(w, r, f, err)
 		return
 	}
diff --git a/selfservice/flow/registration/handler.go b/selfservice/flow/registration/handler.go
index 62630eb4576..42b595af0ab 100644
--- a/selfservice/flow/registration/handler.go
+++ b/selfservice/flow/registration/handler.go
@@ -113,7 +113,7 @@ func (h *Handler) NewRegistrationFlow(w http.ResponseWriter, r *http.Request, ft
 		return nil, err
 	}
 
-	if err := SortNodes(f.UI.Nodes, ds.String()); err != nil {
+	if err := SortNodes(r.Context(), f.UI.Nodes, ds.String()); err != nil {
 		return nil, err
 	}
 
diff --git a/selfservice/flow/registration/sort.go b/selfservice/flow/registration/sort.go
index edaf8b2e168..26c24707373 100644
--- a/selfservice/flow/registration/sort.go
+++ b/selfservice/flow/registration/sort.go
@@ -6,9 +6,7 @@ import (
 	"github.com/ory/kratos/ui/node"
 )
 
-var ctx = context.Background()
-
-func SortNodes(n node.Nodes, schemaRef string) error {
+func SortNodes(ctx context.Context, n node.Nodes, schemaRef string) error {
 	return n.SortBySchema(ctx,
 		node.SortBySchema(schemaRef),
 		node.SortByGroups([]node.Group{