From 1ea2892b795eb387de3654b95ea2db25dc758f12 Mon Sep 17 00:00:00 2001 From: justin-slowik Date: Wed, 8 Jul 2020 16:30:08 -0400 Subject: [PATCH] fix merge error in config.go Signed-off-by: justin-slowik --- cmd/dex/config.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmd/dex/config.go b/cmd/dex/config.go index cc8a7273..255e1d95 100644 --- a/cmd/dex/config.go +++ b/cmd/dex/config.go @@ -103,11 +103,7 @@ func (p *password) UnmarshalJSON(b []byte) error { data.Hash = os.Getenv(data.HashFromEnv) } if len(data.Hash) == 0 { - if len(data.HashFromEnv) > 0 { - data.Hash = os.Getenv(data.HashFromEnv) - } else { - return fmt.Errorf("no password hash provided") - } + return fmt.Errorf("no password hash provided") } // If this value is a valid bcrypt, use it.