diff --git a/vehicle/ovms.go b/vehicle/ovms.go index 4c08b0ae9e..c58b7c216d 100644 --- a/vehicle/ovms.go +++ b/vehicle/ovms.go @@ -81,7 +81,7 @@ func NewOvmsFromConfig(other map[string]interface{}) (api.Vehicle, error) { } func (v *Ovms) loginToServer() (err error) { - uri := fmt.Sprintf("http://%s:6868/api/cookie?username=%s&password=%s", v.server, v.user, v.password) + uri := fmt.Sprintf("https://%s:6869/api/cookie?username=%s&password=%s", v.server, v.user, v.password) var resp *http.Response if resp, err = v.Get(uri); err == nil { @@ -91,39 +91,39 @@ func (v *Ovms) loginToServer() (err error) { return err } -func (v *Ovms) authFlow() error { - var resp ovmsConnectResponse - err := v.loginToServer() - if err == nil { - resp, err = v.connectRequest() - if err == nil && resp.NetConnected != 1 { - return api.ErrMustRetry - } - } - return err -} - func (v *Ovms) connectRequest() (ovmsConnectResponse, error) { - uri := fmt.Sprintf("http://%s:6868/api/vehicle/%s", v.server, v.vehicleId) + uri := fmt.Sprintf("https://%s:6869/api/vehicle/%s", v.server, v.vehicleId) var res ovmsConnectResponse err := v.GetJSON(uri, &res) return res, err } func (v *Ovms) chargeRequest() (ovmsChargeResponse, error) { - uri := fmt.Sprintf("http://%s:6868/api/charge/%s", v.server, v.vehicleId) + uri := fmt.Sprintf("https://%s:6869/api/charge/%s", v.server, v.vehicleId) var res ovmsChargeResponse err := v.GetJSON(uri, &res) return res, err } func (v *Ovms) statusRequest() (ovmsStatusResponse, error) { - uri := fmt.Sprintf("http://%s:6868/api/status/%s", v.server, v.vehicleId) + uri := fmt.Sprintf("https://%s:6869/api/status/%s", v.server, v.vehicleId) var res ovmsStatusResponse err := v.GetJSON(uri, &res) return res, err } +func (v *Ovms) authFlow() error { + var resp ovmsConnectResponse + err := v.loginToServer() + if err == nil { + resp, err = v.connectRequest() + if err == nil && resp.NetConnected != 1 { + return api.ErrMustRetry + } + } + return err +} + // batteryAPI provides battery-status api response func (v *Ovms) batteryAPI() (interface{}, error) { var resp ovmsChargeResponse