From 3949597e01ae6332c3f1e9e8077a4114455b37bf Mon Sep 17 00:00:00 2001 From: Tordarus Date: Sun, 2 Feb 2025 20:03:47 +0100 Subject: [PATCH] use ezhttp v0.0.4 for better error handling --- ap_info.go | 2 +- api.go | 8 ++++---- client.go | 2 +- device.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- site.go | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ap_info.go b/ap_info.go index 7a2597d..4362d66 100644 --- a/ap_info.go +++ b/ap_info.go @@ -27,7 +27,7 @@ func (api *Api) GetApInfo(siteID model.SiteID, macAddress string) (*model.ApInfo } defer resp.Body.Close() - response, err := ezhttp.ParseJsonResponse[model.Response[model.ApInfo]](resp.Body) + response, err := ezhttp.ParseJsonResponse[model.Response[model.ApInfo]](resp) if err != nil { return nil, err } diff --git a/api.go b/api.go index 95932f3..a56d7fc 100644 --- a/api.go +++ b/api.go @@ -102,7 +102,7 @@ func (api *Api) Login() (*model.LoginResponse, error) { } defer resp.Body.Close() - response, err := ezhttp.ParseJsonResponse[model.LoginResponse](resp.Body) + response, err := ezhttp.ParseJsonResponse[model.LoginResponse](resp) if err != nil { return nil, err } @@ -128,7 +128,7 @@ func (api *Api) AuthCode(csrfToken, sessionID string) (*model.AuthCodeResponse, } defer resp.Body.Close() - response, err := ezhttp.ParseJsonResponse[model.AuthCodeResponse](resp.Body) + response, err := ezhttp.ParseJsonResponse[model.AuthCodeResponse](resp) if err != nil { return nil, err } @@ -158,7 +158,7 @@ func (api *Api) AuthToken(authCode string) (*model.AuthTokenResponse, error) { } defer resp.Body.Close() - response, err := ezhttp.ParseJsonResponse[model.AuthTokenResponse](resp.Body) + response, err := ezhttp.ParseJsonResponse[model.AuthTokenResponse](resp) if err != nil { return nil, err } @@ -207,7 +207,7 @@ func (api *Api) Refresh() error { } defer resp.Body.Close() - response, err := ezhttp.ParseJsonResponse[model.AuthTokenResponse](resp.Body) + response, err := ezhttp.ParseJsonResponse[model.AuthTokenResponse](resp) if err != nil { return err } diff --git a/client.go b/client.go index d94d9b9..b8484fe 100644 --- a/client.go +++ b/client.go @@ -53,7 +53,7 @@ func (api *Api) getClients(page int, siteID model.SiteID) (*model.PagedResponse[ } defer resp.Body.Close() - response, err := ezhttp.ParseJsonResponse[model.PagedResponse[model.Client]](resp.Body) + response, err := ezhttp.ParseJsonResponse[model.PagedResponse[model.Client]](resp) if err != nil { return nil, err } diff --git a/device.go b/device.go index e53ad75..3c73537 100644 --- a/device.go +++ b/device.go @@ -53,7 +53,7 @@ func (api *Api) getDevices(page int, siteID model.SiteID) (*model.PagedResponse[ } defer resp.Body.Close() - response, err := ezhttp.ParseJsonResponse[model.PagedResponse[model.Device]](resp.Body) + response, err := ezhttp.ParseJsonResponse[model.PagedResponse[model.Device]](resp) if err != nil { return nil, err } diff --git a/go.mod b/go.mod index 82b4238..2a0a97f 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module git.tordarus.net/tordarus/omada-api go 1.23.0 -require git.tordarus.net/tordarus/ezhttp v0.0.3 +require git.tordarus.net/tordarus/ezhttp v0.0.4 diff --git a/go.sum b/go.sum index d64335d..40107c1 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,2 @@ -git.tordarus.net/tordarus/ezhttp v0.0.3 h1:K6IlLmqkAFUF68HJsOTKcP3ejco7qfm+MuEagohoouo= -git.tordarus.net/tordarus/ezhttp v0.0.3/go.mod h1:Zq9o0Hibny61GqSCwJHa0PfGjVoUFv/zt2PjiQHXvmY= +git.tordarus.net/tordarus/ezhttp v0.0.4 h1:wm7rhol9MHZTZXOzH5I6Q4idjCiFfA4XwAMISZhTcCs= +git.tordarus.net/tordarus/ezhttp v0.0.4/go.mod h1:Zq9o0Hibny61GqSCwJHa0PfGjVoUFv/zt2PjiQHXvmY= diff --git a/site.go b/site.go index 285ceb1..a4f3258 100644 --- a/site.go +++ b/site.go @@ -53,7 +53,7 @@ func (api *Api) getSites(page int) (*model.PagedResponse[model.Site], error) { } defer resp.Body.Close() - response, err := ezhttp.ParseJsonResponse[model.PagedResponse[model.Site]](resp.Body) + response, err := ezhttp.ParseJsonResponse[model.PagedResponse[model.Site]](resp) if err != nil { return nil, err }