2 files changed, 113 insertions, 3 deletions
diff --git a/internal/api/google_tasks_oauth.go b/internal/api/google_tasks_oauth.go
index 6edba21..c6f816c 100644
--- a/internal/api/google_tasks_oauth.go
+++ b/internal/api/google_tasks_oauth.go
@@ -3,6 +3,7 @@ package api
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"golang.org/x/oauth2"
@@ -18,6 +19,21 @@ import (
 type TokenStore interface {
 	GetOAuthToken(source string) (*oauth2.Token, error)
 	SaveOAuthToken(source string, tok *oauth2.Token) error
+	// RecordOAuthTokenError persists why a refresh failed, so the settings page
+	// can distinguish "connected" from "has a row but the grant is dead".
+	RecordOAuthTokenError(source string, message string) error
+}
+
+// NeedsReconnect reports whether an error means the stored grant is finished
+// and only a fresh consent will fix it.
+//
+// Google answers invalid_grant when a refresh token has been revoked,
+// superseded, or has simply aged out — which for an OAuth client still in
+// "Testing" publishing status happens after seven days. Retrying cannot help;
+// the user has to reconnect. Any other error (a network blip, a 5xx) is worth
+// retrying and must not push the user through consent needlessly.
+func NeedsReconnect(err error) bool {
+	return err != nil && strings.Contains(err.Error(), "invalid_grant")
 }
 
 // GoogleTasksOAuthSource is the key GoogleTasksClient's token is stored
@@ -77,6 +93,15 @@ func (d *dbTokenSource) Token() (*oauth2.Token, error) {
 
 	refreshed, err := d.config.TokenSource(ctx, current).Token()
 	if err != nil {
+		// Record it: a failed refresh is invisible otherwise, and an
+		// invalid_grant in particular means no amount of waiting will fix it.
+		msg := err.Error()
+		if NeedsReconnect(err) {
+			msg = "Google rejected the saved authorisation (invalid_grant) — reconnect to continue. " +
+				"If this recurs weekly, the OAuth client is still in Testing publishing status, " +
+				"which expires refresh tokens after 7 days."
+		}
+		_ = d.store.RecordOAuthTokenError(d.source, msg)
 		return nil, fmt.Errorf("refreshing token: %w", err)
 	}
 
diff --git a/internal/api/google_tasks_oauth_test.go b/internal/api/google_tasks_oauth_test.go
index 93acd76..222baab 100644
--- a/internal/api/google_tasks_oauth_test.go
+++ b/internal/api/google_tasks_oauth_test.go
@@ -15,9 +15,10 @@ import (
 
 // memTokenStore is an in-memory TokenStore.
 type memTokenStore struct {
-	mu    sync.Mutex
-	token *oauth2.Token
-	saved int
+	mu        sync.Mutex
+	token     *oauth2.Token
+	saved     int
+	lastError string
 }
 
 func (m *memTokenStore) GetOAuthToken(string) (*oauth2.Token, error) {
@@ -30,6 +31,13 @@ func (m *memTokenStore) GetOAuthToken(string) (*oauth2.Token, error) {
 	return &cp, nil
 }
 
+func (m *memTokenStore) RecordOAuthTokenError(_ string, message string) error {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	m.lastError = message
+	return nil
+}
+
 func (m *memTokenStore) SaveOAuthToken(_ string, tok *oauth2.Token) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
@@ -153,3 +161,80 @@ func TestDBTokenSource_NotConnected(t *testing.T) {
 		t.Errorf("error = %q, want it to mention not being connected", err)
 	}
 }
+
+// invalid_grant means the saved authorisation is finished — retrying cannot
+// help, and the user has to reconnect. Anything else is worth retrying, so
+// misclassifying it would push the user through consent for a network blip.
+func TestNeedsReconnect(t *testing.T) {
+	cases := []struct {
+		err  error
+		want bool
+	}{
+		{errors.New(`oauth2: "invalid_grant" "Bad Request"`), true},
+		{errors.New("refreshing token: oauth2: \"invalid_grant\" \"Token has been expired or revoked.\""), true},
+		{errors.New("Post \"https://oauth2.googleapis.com/token\": dial tcp: i/o timeout"), false},
+		{errors.New("oauth2: cannot fetch token: 503 Service Unavailable"), false},
+		{nil, false},
+	}
+	for _, c := range cases {
+		if got := NeedsReconnect(c.err); got != c.want {
+			t.Errorf("NeedsReconnect(%v) = %v, want %v", c.err, got, c.want)
+		}
+	}
+}
+
+// A failed refresh must be recorded, or settings keeps showing "connected"
+// while every background fetch fails — which is how Google Tasks appeared
+// healthy for a month while returning nothing.
+func TestDBTokenSource_RecordsRefreshFailure(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusBadRequest)
+		_, _ = w.Write([]byte(`{"error":"invalid_grant","error_description":"Token has been expired or revoked."}`))
+	}))
+	defer srv.Close()
+
+	store := &memTokenStore{token: expiredToken()}
+	src := &dbTokenSource{
+		store:  store,
+		source: GoogleTasksOAuthSource,
+		config: &oauth2.Config{
+			ClientID:     "id",
+			ClientSecret: "secret",
+			Endpoint:     oauth2.Endpoint{TokenURL: srv.URL},
+		},
+	}
+
+	if _, err := src.Token(); err == nil {
+		t.Fatal("expected the refresh to fail")
+	}
+	if store.lastError == "" {
+		t.Fatal("the failure was not recorded")
+	}
+	if !strings.Contains(store.lastError, "reconnect") {
+		t.Errorf("recorded error should tell the user to reconnect, got %q", store.lastError)
+	}
+}
+
+// A successful refresh must clear a previously recorded failure; the store's
+// SaveOAuthToken does that, so this pins that saving is what happens on success.
+func TestDBTokenSource_SuccessSavesToken(t *testing.T) {
+	hits := 0
+	srv := tokenServer(t, &hits)
+	store := &memTokenStore{token: expiredToken()}
+	src := &dbTokenSource{
+		store:  store,
+		source: GoogleTasksOAuthSource,
+		config: &oauth2.Config{
+			ClientID:     "id",
+			ClientSecret: "secret",
+			Endpoint:     oauth2.Endpoint{TokenURL: srv.URL},
+		},
+	}
+	if _, err := src.Token(); err != nil {
+		t.Fatalf("Token(): %v", err)
+	}
+	if store.saved == 0 {
+		t.Error("a refreshed token should be persisted")
+	}
+}