Selaa lähdekoodia

newClient must prepend scheme to default host

this updates newClient to prepend the scheme https to the default host
found in the global config, and only use said host when both the user
and host are configured
pull/36/head
Rob Loranger 4 vuotta sitten
vanhempi
commit
836eea7dab
No known key found for this signature in database GPG Key ID: D6F1633A4F0903B8
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. +2
    -2
      api/api.go

+ 2
- 2
api/api.go Näytä tiedosto

@@ -34,8 +34,8 @@ func newClient(c *cli.Context) (*writeas.Client, error) {
}
if host := HostURL(c); host != "" {
clientConfig.URL = host + "/api"
} else if cfg.Default.Host != "" {
clientConfig.URL = cfg.Default.Host + "/api"
} else if cfg.Default.Host != "" && cfg.Default.User != "" {
clientConfig.URL = "https://" + cfg.Default.Host + "/api"
} else if config.IsDev() {
clientConfig.URL = config.DevBaseURL + "/api"
} else if c.App.Name == "writeas" {


Ladataan…
Peruuta
Tallenna