From fab8a939c97e61c028143e37e2a78d3edd569da0 Mon Sep 17 00:00:00 2001
From: hackerman <3372410+aeneasr@users.noreply.github.com>
Date: Fri, 11 Mar 2022 10:04:05 +0100
Subject: [PATCH] fix: properly pass context (#2300)

---
 selfservice/flow/login/error.go   | 2 +-
 selfservice/flow/login/handler.go | 4 ++--
 selfservice/flow/login/sort.go    | 4 +---
 ui/container/container_test.go    | 3 +--
 ui/node/attributes_input_test.go  | 4 ++--
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/selfservice/flow/login/error.go b/selfservice/flow/login/error.go
index a22a351f523..67f873bf49c 100644
--- a/selfservice/flow/login/error.go
+++ b/selfservice/flow/login/error.go
@@ -100,7 +100,7 @@ func (s *ErrorHandler) WriteFlowError(w http.ResponseWriter, r *http.Request, f
 		return
 	}
 
-	if err := sortNodes(f.UI.Nodes); err != nil {
+	if err := sortNodes(r.Context(), f.UI.Nodes); err != nil {
 		s.forward(w, r, f, err)
 		return
 	}
diff --git a/selfservice/flow/login/handler.go b/selfservice/flow/login/handler.go
index 46850e0f99e..bb8224b1943 100644
--- a/selfservice/flow/login/handler.go
+++ b/selfservice/flow/login/handler.go
@@ -159,7 +159,7 @@ preLoginHook:
 		}
 	}
 
-	if err := sortNodes(f.UI.Nodes); err != nil {
+	if err := sortNodes(r.Context(), f.UI.Nodes); err != nil {
 		return nil, err
 	}
 
@@ -588,7 +588,7 @@ continueLogin:
 			sess = session.NewInactiveSession()
 		}
 
-		method := ss.CompletedAuthenticationMethod(ctx)
+		method := ss.CompletedAuthenticationMethod(r.Context())
 		sess.CompletedLoginFor(method.Method, method.AAL)
 		i = interim
 		break
diff --git a/selfservice/flow/login/sort.go b/selfservice/flow/login/sort.go
index d306a1fdcf6..e1c22357841 100644
--- a/selfservice/flow/login/sort.go
+++ b/selfservice/flow/login/sort.go
@@ -6,9 +6,7 @@ import (
 	"github.com/ory/kratos/ui/node"
 )
 
-var ctx = context.Background()
-
-func sortNodes(n node.Nodes) error {
+func sortNodes(ctx context.Context, n node.Nodes) error {
 	return n.SortBySchema(ctx,
 		node.SortByGroups([]node.Group{
 			node.OpenIDConnectGroup,
diff --git a/ui/container/container_test.go b/ui/container/container_test.go
index 8ee47c8e133..0721503248d 100644
--- a/ui/container/container_test.go
+++ b/ui/container/container_test.go
@@ -40,9 +40,8 @@ func newFormRequest(t *testing.T, values url.Values) *http.Request {
 	return req
 }
 
-var ctx = context.Background()
-
 func TestContainer(t *testing.T) {
+	var ctx = context.Background()
 	t.Run("method=NewFromJSON", func(t *testing.T) {
 		for k, tc := range []struct {
 			r      string
diff --git a/ui/node/attributes_input_test.go b/ui/node/attributes_input_test.go
index d8276a837b5..cef15c1451b 100644
--- a/ui/node/attributes_input_test.go
+++ b/ui/node/attributes_input_test.go
@@ -15,9 +15,9 @@ import (
 	"github.com/ory/x/jsonschemax"
 )
 
-var ctx = context.Background()
-
 func TestFieldFromPath(t *testing.T) {
+
+	var ctx = context.Background()
 	t.Run("all properties are properly transferred", func(t *testing.T) {
 		schema, err := ioutil.ReadFile("./fixtures/all_formats.schema.json")
 		require.NoError(t, err)