From be907dbbd841025fd854344b77d3368b2ff8089f Mon Sep 17 00:00:00 2001 From: Patrik Date: Mon, 11 Dec 2023 12:56:39 +0100 Subject: [PATCH] fix: use ID label on login with multiple identifiers (#3657) --- selfservice/flow/login/extension_identifier_label.go | 6 +----- selfservice/flow/login/extension_identifier_label_test.go | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/selfservice/flow/login/extension_identifier_label.go b/selfservice/flow/login/extension_identifier_label.go index 8eec2b68d877..02b725f00b7f 100644 --- a/selfservice/flow/login/extension_identifier_label.go +++ b/selfservice/flow/login/extension_identifier_label.go @@ -5,7 +5,6 @@ package login import ( "context" - "sort" "github.com/ory/kratos/text" @@ -59,12 +58,9 @@ func (i *identifierLabelExtension) Run(_ jsonschema.CompilerContext, config sche } func (i *identifierLabelExtension) getLabel() string { - if len(i.identifierLabelCandidates) == 0 { + if len(i.identifierLabelCandidates) != 1 { // sane default is set elsewhere return "" } - // sort the candidates to get a deterministic result - sort.Strings(i.identifierLabelCandidates) - // just take the first, no good way to decide which one is the best return i.identifierLabelCandidates[0] } diff --git a/selfservice/flow/login/extension_identifier_label_test.go b/selfservice/flow/login/extension_identifier_label_test.go index f504239408e0..3b3a21400fb1 100644 --- a/selfservice/flow/login/extension_identifier_label_test.go +++ b/selfservice/flow/login/extension_identifier_label_test.go @@ -127,7 +127,7 @@ func TestGetIdentifierLabelFromSchema(t *testing.T) { usernameConfig: func(c *schema.ExtensionConfig) { c.Credentials.Password.Identifier = true }, - expected: text.NewInfoNodeLabelGenerated("Email"), + expected: text.NewInfoNodeLabelID(), }, { name: "no identifiers",