Refactor the code

This commit is contained in:
cnone
2019-05-20 04:55:36 +03:00
parent c3a4e33245
commit 030f6607f0
2 changed files with 21 additions and 21 deletions

View File

@@ -46,14 +46,20 @@ func addConfigFlags(flags *pflag.FlagSet) {
func getAuthentication(flags *pflag.FlagSet, defaults ...interface{}) (settings.AuthMethod, auth.Auther) {
method := settings.AuthMethod(mustGetString(flags, "auth.method"))
var defaultAuther map[string]interface{}
for _, arg := range defaults {
switch def := arg.(type) {
case *settings.Settings:
method = settings.AuthMethod(def.AuthMethod)
case auth.Auther:
ms, _ := json.Marshal(def)
json.Unmarshal(ms, &defaultAuther)
if len(defaults) > 0 {
if hasAuth := defaults[0]; hasAuth != true {
for _, arg := range defaults {
switch def := arg.(type) {
case *settings.Settings:
method = settings.AuthMethod(def.AuthMethod)
case auth.Auther:
ms, err := json.Marshal(def)
checkErr(err)
json.Unmarshal(ms, &defaultAuther)
}
}
}
}