Recover Google Messages auth without re-pairing

internal/api/api.go

@@ -50,6 +50,7 @@ func (a *API) Register(app core.App) {
 		e.Router.GET("/api/dashboard", a.dashboard)
 		e.Router.GET("/api/connector/gmessages/status", a.gmessagesStatus)
 		e.Router.POST("/api/connector/gmessages/pair/google", a.gmessagesGooglePair).Bind(apis.BodyLimit(maxGMessagesPairBytes))
+		e.Router.POST("/api/connector/gmessages/reauth/google", a.gmessagesGoogleReauth).Bind(apis.BodyLimit(maxGMessagesPairBytes))
 		e.Router.POST("/api/connector/gmessages/pair/qr", a.gmessagesPair)
 		e.Router.POST("/api/connector/gmessages/pair/qr/refresh", a.gmessagesPairRefresh)
 		// Backward-compatible QR aliases from the first PayGate rebuild.
@@ -289,6 +290,23 @@ func (a *API) gmessagesGooglePair(e *core.RequestEvent) error {
 	})
 }
 
+func (a *API) gmessagesGoogleReauth(e *core.RequestEvent) error {
+	if !a.dashboardAuth(e) {
+		return e.UnauthorizedError("dashboard authentication is required", nil)
+	}
+	if a.GMessages == nil {
+		return e.BadRequestError("Google Messages connector is unavailable", nil)
+	}
+	var body googleMessagesPairBody
+	if err := decodeJSON(e, &body); err != nil {
+		return e.BadRequestError("invalid JSON body", err)
+	}
+	if err := a.GMessages.ReauthenticateGoogle(strings.TrimSpace(body.CookieData)); err != nil {
+		return e.BadRequestError(err.Error(), nil)
+	}
+	return e.JSON(http.StatusOK, a.GMessages.Status())
+}
+
 func (a *API) gmessagesPair(e *core.RequestEvent) error {
 	if !a.dashboardAuth(e) {
 		return e.UnauthorizedError("dashboard authentication is required", nil)

internal/api/gmessages_reauth_test.go

@@ -0,0 +1,38 @@
+package api
+
+import (
+	"net/http"
+	"strings"
+	"testing"
+
+	"github.com/pocketbase/pocketbase/tests"
+)
+
+func TestGoogleMessagesReauthEndpointRequiresDashboardAuth(t *testing.T) {
+	scenarios := []tests.ApiScenario{
+		{
+			Name: "reauth requires dashboard auth", Method: http.MethodPost,
+			URL:             "/api/connector/gmessages/reauth/google",
+			Headers:         map[string]string{"Content-Type": "application/json"},
+			Body:            strings.NewReader(`{"cookieData":"SID=missing-rest"}`),
+			TestAppFactory:  func(t testing.TB) *tests.TestApp { return apiTestFactoryWithGMessages(t) },
+			ExpectedStatus:  http.StatusUnauthorized,
+			ExpectedContent: []string{"Dashboard authentication is required."},
+		},
+		{
+			Name: "payment API key cannot reauthenticate Google Messages", Method: http.MethodPost,
+			URL: "/api/connector/gmessages/reauth/google",
+			Headers: map[string]string{
+				"Authorization": "Bearer api-secret",
+				"Content-Type":  "application/json",
+			},
+			Body:            strings.NewReader(`{"cookieData":"SID=missing-rest"}`),
+			TestAppFactory:  func(t testing.TB) *tests.TestApp { return apiTestFactoryWithGMessages(t) },
+			ExpectedStatus:  http.StatusUnauthorized,
+			ExpectedContent: []string{"Dashboard authentication is required."},
+		},
+	}
+	for i := range scenarios {
+		scenarios[i].Test(t)
+	}
+}

internal/gmessages/client_events.go

@@ -0,0 +1,43 @@
+package gmessages
+
+import (
+	"sync"
+
+	"go.mau.fi/mautrix-gmessages/pkg/libgm"
+)
+
+type clientEventGate struct {
+	mu     sync.RWMutex
+	active bool
+}
+
+var clientEventGates sync.Map // map[*libgm.Client]*clientEventGate
+
+func (m *Manager) registerClientEventHandler(client *libgm.Client) {
+	gate := &clientEventGate{active: true}
+	clientEventGates.Store(client, gate)
+	client.SetEventHandler(func(raw any) {
+		gate.mu.RLock()
+		defer gate.mu.RUnlock()
+		if !gate.active {
+			return
+		}
+		m.handleClientEvent(client, raw)
+	})
+}
+
+// retireClient waits for any event handler that already started for this
+// client, disables future events, then closes the libgm transport. It must not
+// be called from inside that same client's event handler.
+func (m *Manager) retireClient(client *libgm.Client) {
+	if client == nil {
+		return
+	}
+	if value, ok := clientEventGates.LoadAndDelete(client); ok {
+		gate := value.(*clientEventGate)
+		gate.mu.Lock()
+		gate.active = false
+		gate.mu.Unlock()
+	}
+	client.Disconnect()
+}