netbird/dex
0
0
Fork 0
mirror of https://github.com/netbirdio/dex.git synced 2026-05-22 18:43:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix merge error in config.go

Browse Source 
Signed-off-by: justin-slowik <justin.slowik@thermofisher.com>
This commit is contained in:
justin-slowik
2020-07-08 16:31:44 -04:00
parent 1404477326
commit 1ea2892b79
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/dex/config.go
+1 -5
View File
@@ -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.