sstent/go-garth
1
0
Fork 0
mirror of https://github.com/sstent/go-garth.git synced 2026-02-07 06:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync 3

Browse Source
This commit is contained in:
sstent
2025-09-05 09:02:26 -07:00
parent 9d60abfcf7
commit 0bb1b03d9c
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client.go
View File

@@ -30,7 +30,7 @@ func NewAuthTransport(auth *GarthAuthenticator, storage TokenStorage, base http.
base: base, base: base,
auth: auth, auth: auth,
storage: storage, storage: storage,
userAgent: "GarthClient/1.0", userAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
} }
} }
@@ -61,6 +61,7 @@ func (t *AuthTransport) RoundTrip(req *http.Request) (*http.Response, error) {
// Add Authorization header // Add Authorization header
req.Header.Set("Authorization", "Bearer "+token.OAuth2Token.AccessToken) req.Header.Set("Authorization", "Bearer "+token.OAuth2Token.AccessToken)
req.Header.Set("User-Agent", t.userAgent) req.Header.Set("User-Agent", t.userAgent)
req.Header.Set("Referer", "https://sso.garmin.com/sso/signin")
// Execute request with retry logic // Execute request with retry logic
var resp *http.Response var resp *http.Response

10
types.go
View File

@@ -26,7 +26,7 @@ type OAuth2Token struct {
// IsExpired checks if the token has expired // IsExpired checks if the token has expired
func (t *OAuth2Token) IsExpired() bool { func (t *OAuth2Token) IsExpired() bool {
return time.Now().After(t.Expiry) return time.Now().After(time.Unix(t.ExpiresAt, 0))
} }
// Token represents unified authentication credentials // Token represents unified authentication credentials
@@ -39,18 +39,18 @@ type Token struct {
// IsExpired checks if the OAuth2 token has expired // IsExpired checks if the OAuth2 token has expired
func (t *Token) IsExpired() bool { func (t *Token) IsExpired() bool {
if t.OAuth2 == nil { if t.OAuth2Token == nil {
return true return true
} }
return t.OAuth2.IsExpired() return t.OAuth2Token.IsExpired()
} }
// NeedsRefresh checks if token needs refresh (within 5 min expiry window) // NeedsRefresh checks if token needs refresh (within 5 min expiry window)
func (t *Token) NeedsRefresh() bool { func (t *Token) NeedsRefresh() bool {
if t.OAuth2 == nil { if t.OAuth2Token == nil {
return true return true
} }
return time.Now().Add(5 * time.Minute).After(t.OAuth2.Expiry) return time.Now().Add(5 * time.Minute).After(time.Unix(t.OAuth2Token.ExpiresAt, 0))
} }
// UserProfile represents Garmin user profile information // UserProfile represents Garmin user profile information

2
workouts_test.go
View File

@@ -615,7 +615,7 @@ func TestWorkoutService_Export(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
expectedPath := "/workout-service/workout/" + tt.workoutID + "/export/" + tt.format expectedPath := "/download-service/export/" + tt.format + "/workout/" + tt.workoutID
if r.URL.Path != expectedPath { if r.URL.Path != expectedPath {
t.Errorf("expected path %s, got %s", expectedPath, r.URL.Path) t.Errorf("expected path %s, got %s", expectedPath, r.URL.Path)
} }