Fix: don't require account token in config
This commit is contained in:
parent
651ca95eb3
commit
09912641bb
@ -53,16 +53,25 @@ func flagConfigVals(conf *Config) error {
|
||||
case "--trace":
|
||||
conf.logLevel = zerolog.TraceLevel
|
||||
default:
|
||||
// continue to next switch
|
||||
}
|
||||
|
||||
switch {
|
||||
case conf.Account != "":
|
||||
return badArg(arg)
|
||||
|
||||
case conf.Account == "" && !strings.HasPrefix(arg, "-"):
|
||||
conf.Account = arg
|
||||
|
||||
conf.Account = arg // set account key
|
||||
|
||||
case conf.Account != "":
|
||||
|
||||
return badArg(arg) // extra argument
|
||||
|
||||
case conf.Account == "" && strings.HasPrefix(arg, "-"):
|
||||
return badArg(arg)
|
||||
|
||||
return badArg(arg) // unknown flag
|
||||
|
||||
default:
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -70,10 +79,6 @@ func flagConfigVals(conf *Config) error {
|
||||
}
|
||||
|
||||
func getConfig() (*Config, error) {
|
||||
if len(os.Args) < 2 && os.Getenv("MULLVAD_ACCOUNT") == "" {
|
||||
return nil, fmt.Errorf("missing mullvad account key")
|
||||
}
|
||||
|
||||
conf := &Config{
|
||||
logLevel: zerolog.InfoLevel,
|
||||
timeout: 5 * time.Second,
|
||||
@ -85,9 +90,5 @@ func getConfig() (*Config, error) {
|
||||
conf.Account = os.Getenv("MULLVAD_ACCOUNT")
|
||||
}
|
||||
|
||||
if conf.Account == "" {
|
||||
errs = append(errs, fmt.Errorf("missing mullvad account key"))
|
||||
}
|
||||
|
||||
return conf, errors.Join(errs...)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user