Code maintenance: GetPassword signature changed

This commit is contained in:
Quentin McGaw
2020-12-29 20:06:24 +00:00
parent 96f2b2b617
commit 258e150ebf
3 changed files with 9 additions and 10 deletions

View File

@@ -28,12 +28,13 @@ func GetOpenVPNSettings(paramsReader params.Reader, vpnProvider models.VPNProvid
}
// Remove spaces in user ID to simplify user's life, thanks @JeordyR
settings.User = strings.ReplaceAll(settings.User, " ", "")
isMullvad := vpnProvider == constants.Mullvad
settings.Password, err = paramsReader.GetPassword(!isMullvad)
if err != nil {
return settings, err
} else if isMullvad {
if vpnProvider == constants.Mullvad {
settings.Password = "m"
} else {
settings.Password, err = paramsReader.GetPassword()
if err != nil {
return settings, err
}
}
settings.Verbosity, err = paramsReader.GetOpenVPNVerbosity()
if err != nil {