parra/ntfy
parra/ntfy
1
0
Fork 0
mirror of https://github.com/binwiederhier/ntfy.git synced 2025-06-01 11:09:30 +02:00
Code Releases Activity

allow empty password in client.yml

Browse source 
fixes
This commit is contained in:
Hunter Kehoe 2022-10-09 07:50:37 -06:00
parent cbc912d1e3
commit ce392de0a8
3 changed files with 86 additions and 15 deletions

11
cmd/subscribe.go
View file

@ -175,19 +175,20 @@ func doSubscribe(c *cli.Context, cl *client.Client, conf *client.Config, topic,
for filter, value := range s.If {
topicOptions = append(topicOptions, client.WithFilter(filter, value))
}
var user, password string
var user string
var password *string
if s.User != "" {
user = s.User
} else if conf.DefaultUser != "" {
user = conf.DefaultUser
}
if s.Password != "" {
if s.Password != nil {
password = s.Password
} else if conf.DefaultPassword != "" {
} else if conf.DefaultPassword != nil {
password = conf.DefaultPassword
}
if user != "" && password != "" {
topicOptions = append(topicOptions, client.WithBasicAuth(user, password))
if user != "" && password != nil {
topicOptions = append(topicOptions, client.WithBasicAuth(user, *password))
}
subscriptionID := cl.Subscribe(s.Topic, topicOptions...)
if s.Command != "" {