diff --git a/cmd/fitbit-sync/interface.go b/cmd/fitbit-sync/interface.go index 9b11fd03..2e7dfa45 100644 --- a/cmd/fitbit-sync/interface.go +++ b/cmd/fitbit-sync/interface.go @@ -13,6 +13,6 @@ func (fs *fitbitSync) getDailyActivitySummary(d time.Time) (*fitbit.DailyActivit } func (fs *fitbitSync) getActivityTCX(a fitbit.Activity) ([]byte, error) { - tcx, _, _, err := fs.fitbitClient.GetActivityTCX(context.Background(), fs.cfg.FitbitConfig.UserID, a.LogID, fs.cfg.Token) + tcx, _, err := fs.fitbitClient.GetActivityTCX(context.Background(), fs.cfg.FitbitConfig.UserID, a.LogID, fs.cfg.Token) return tcx, err } diff --git a/go.mod b/go.mod index 380d267f..25797169 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.23 toolchain go1.23.4 -replace github.com/anyappinc/fitbit v0.0.3 => github.com/jovandeginste/fitbit v0.0.4-0.20250213152756-feb45617b002 +replace github.com/anyappinc/fitbit v0.0.3 => github.com/jovandeginste/fitbit v0.0.4-0.20250213164811-b0b3b27c3a84 require ( github.com/a-h/templ v0.3.833 diff --git a/go.sum b/go.sum index 513d4048..4206d165 100644 --- a/go.sum +++ b/go.sum @@ -45,8 +45,6 @@ github.com/alexedwards/scs/gormstore v0.0.0-20250212122300-421ef1d8611c/go.mod h github.com/alexedwards/scs/v2 v2.4.0/go.mod h1:ToaROZxyKukJKT/xLcVQAChi5k6+Pn1Gvmdl7h3RRj8= github.com/alexedwards/scs/v2 v2.8.0 h1:h31yUYoycPuL0zt14c0gd+oqxfRwIj6SOjHdKRZxhEw= github.com/alexedwards/scs/v2 v2.8.0/go.mod h1:ToaROZxyKukJKT/xLcVQAChi5k6+Pn1Gvmdl7h3RRj8= -github.com/anyappinc/fitbit v0.0.3 h1:Q1yxE62uAE8D4aTBgQS+jPuvYYDJbzo0jQJXOsjOWUw= -github.com/anyappinc/fitbit v0.0.3/go.mod h1:GEs6hK/2Kqjg8VPf30j++3AsmIH8FytcnQlP6kfduII= github.com/aquasecurity/table v1.8.0 h1:9ntpSwrUfjrM6/YviArlx/ZBGd6ix8W+MtojQcM7tv0= github.com/aquasecurity/table v1.8.0/go.mod h1:eqOmvjjB7AhXFgFqpJUEE/ietg7RrMSJZXyTN8E/wZw= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= @@ -85,7 +83,6 @@ github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/ github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/fsouza/slognil v0.4.1 h1:fMSnRtFZgAkM7r2IuviVMj50fKgT7agXSu0JiQsM2xU= github.com/fsouza/slognil v0.4.1/go.mod h1:uaLfvwv/vp6xUVeUEQiJ4n3L6qsGc8b/U+PANzm5Sts= -github.com/galeone/tcx v1.0.0/go.mod h1:cHrVurc4epPGjwvJt8kDkQgp4hEUhk0UiWPSN6/dykI= github.com/galeone/tcx v1.0.1-0.20230114151622-8168e1e47884 h1:aiujMvmLqdGvZftIoDSYmTPtSVPDXC9csDpZJQ8EEkQ= github.com/galeone/tcx v1.0.1-0.20230114151622-8168e1e47884/go.mod h1:cHrVurc4epPGjwvJt8kDkQgp4hEUhk0UiWPSN6/dykI= github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ= @@ -245,12 +242,8 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/jovandeginste/fitbit v0.0.3 h1:lpcQY7jySSRom7oTE7K6IeX6n/bxQebEE2NDhXJNue4= -github.com/jovandeginste/fitbit v0.0.3/go.mod h1:GEs6hK/2Kqjg8VPf30j++3AsmIH8FytcnQlP6kfduII= -github.com/jovandeginste/fitbit v0.0.4-0.20250213074802-01806236873e h1:voZpd5UHkmTdnfBCDfhkjtX/D/vM7NDEWlFaWTgb7tw= -github.com/jovandeginste/fitbit v0.0.4-0.20250213074802-01806236873e/go.mod h1:GEs6hK/2Kqjg8VPf30j++3AsmIH8FytcnQlP6kfduII= -github.com/jovandeginste/fitbit v0.0.4-0.20250213152756-feb45617b002 h1:kMALp2LMtvMWUin2qMMPh0X/h7BKEbYl3eVjdg2E0no= -github.com/jovandeginste/fitbit v0.0.4-0.20250213152756-feb45617b002/go.mod h1:/jNTx4kK0igJh7QNv0gaCUY8QK6B0zBPm0TdMTWricE= +github.com/jovandeginste/fitbit v0.0.4-0.20250213164811-b0b3b27c3a84 h1:VAPYoqkqXXmyH2dW8b0ZsMm3LTb66wwpIeAgln7D6PM= +github.com/jovandeginste/fitbit v0.0.4-0.20250213164811-b0b3b27c3a84/go.mod h1:GEs6hK/2Kqjg8VPf30j++3AsmIH8FytcnQlP6kfduII= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= diff --git a/vendor/github.com/anyappinc/fitbit/activity.go b/vendor/github.com/anyappinc/fitbit/activity.go index 29490cde..f2936583 100644 --- a/vendor/github.com/anyappinc/fitbit/activity.go +++ b/vendor/github.com/anyappinc/fitbit/activity.go @@ -160,12 +160,12 @@ func (c *Client) GetDailyActivitySummary(ctx context.Context, userID string, dat // Scope.Location is required. // // Web API Reference: https://dev.fitbit.com/build/reference/web-api/activity/get-activity-tcx/ -func (c *Client) GetActivityTCX(ctx context.Context, userID string, activityID int64, token *Token) ([]byte, *RateLimit, []byte, error) { +func (c *Client) GetActivityTCX(ctx context.Context, userID string, activityID int64, token *Token) ([]byte, *RateLimit, error) { endpoint := c.getEndpoint("GetActivityTCX", userID, activityID) b, rateLimit, err := c.getRequest(ctx, token, endpoint) if err != nil { - return nil, nil, b, err + return nil, nil, err } - return b, rateLimit, b, nil + return b, rateLimit, nil } diff --git a/vendor/github.com/anyappinc/fitbit/error.go b/vendor/github.com/anyappinc/fitbit/error.go index 370290df..eadb8add 100644 --- a/vendor/github.com/anyappinc/fitbit/error.go +++ b/vendor/github.com/anyappinc/fitbit/error.go @@ -76,6 +76,7 @@ type ( rawErrorResponse struct { Success bool `json:"success"` Errors []map[string]interface{} `json:"errors"` + Error map[string]interface{} `json:"error"` } // ErrorResponse represents an error response from Fitbit APIs. @@ -87,18 +88,20 @@ type ( // UnmarshalJSON implements the json.Unmarshaler interface. func (e *ErrorResponse) UnmarshalJSON(b []byte) error { - raw := rawErrorResponse{ - Success: true, - Errors: nil, - } + raw := rawErrorResponse{Success: true} if err := json.Unmarshal(b, &raw); err != nil { return err } e.Success = raw.Success + + if raw.Error != nil { + raw.Errors = append(raw.Errors, raw.Error) + } if len(raw.Errors) == 0 { return nil } + e.Success = false e.Errors = make([]Error, len(raw.Errors)) for i := range raw.Errors { _err, err := extractError(raw.Errors[i]) diff --git a/vendor/modules.txt b/vendor/modules.txt index bf220df2..289d5c20 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -17,7 +17,7 @@ github.com/alexedwards/scs/gormstore ## explicit; go 1.12 github.com/alexedwards/scs/v2 github.com/alexedwards/scs/v2/memstore -# github.com/anyappinc/fitbit v0.0.3 => github.com/jovandeginste/fitbit v0.0.4-0.20250213152756-feb45617b002 +# github.com/anyappinc/fitbit v0.0.3 => github.com/jovandeginste/fitbit v0.0.4-0.20250213164811-b0b3b27c3a84 ## explicit; go 1.15 github.com/anyappinc/fitbit github.com/anyappinc/fitbit/logger