Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update OVMS Requests to https requests #1575

Merged
merged 1 commit into from
Sep 17, 2021
Merged

Update OVMS Requests to https requests #1575

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions vehicle/ovms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand Down