handlegmessages: don't invalidate credentials on unknown error

Author: tulir

pkg/connector/bridgestate.go

@@ -26,6 +26,8 @@ const (
 	GMUnpaired                  status.BridgeStateErrorCode = "gm-unpaired"
 	GMUnpairedGaia              status.BridgeStateErrorCode = "gm-unpaired-gaia"
 	GMUnpaired404               status.BridgeStateErrorCode = "gm-unpaired-entity-not-found"
+	GMUnpaired401               status.BridgeStateErrorCode = "gm-unpaired-401-polling"
+	GMUnpairedInvalidCreds      status.BridgeStateErrorCode = "gm-unpaired-invalid-credentials"
 	GMNotLoggedIn               status.BridgeStateErrorCode = "gm-not-logged-in"
 	GMNotConnected              status.BridgeStateErrorCode = "gm-not-connected"
 	GMConnecting                status.BridgeStateErrorCode = "gm-connecting"
@@ -42,10 +44,13 @@ const (
 func init() {
 	status.BridgeStateHumanErrors.Update(status.BridgeStateErrorMap{
 		GMListenError:               "Error polling messages from Google Messages server, the bridge will try to reconnect",
-		GMFatalError:                "Fatal error polling messages from Google Messages server, please re-link the bridge",
+		GMFatalError:                "Fatal error polling messages from Google Messages server",
+		GMConnectionFailed:          "Failed to connect to Google Messages",
 		GMNotLoggedIn:               "Unpaired from Google Messages, please re-link the connection to continue using SMS/RCS",
 		GMUnpaired:                  "Unpaired from Google Messages, please re-link the connection to continue using SMS/RCS",
 		GMUnpaired404:               "Unpaired from Google Messages, please re-link the connection to continue using SMS/RCS",
+		GMUnpaired401:               "Unpaired from Google Messages, please re-link the connection to continue using SMS/RCS",
+		GMUnpairedInvalidCreds:      "Unpaired from Google Messages, please re-link the connection to continue using SMS/RCS",
 		GMUnpairedGaia:              "Unpaired from Google Messages, please re-link the connection to continue using SMS/RCS",
 		GMNotDefaultSMSApp:          "Google Messages isn't set as the default SMS app. Please set the default SMS app on your Android phone to Google Messages to continue using SMS/RCS.",
 		GMBrowserInactive:           "Google Messages opened in another browser",

pkg/connector/client.go

@@ -105,9 +105,18 @@ func (gc *GMClient) Connect(ctx context.Context) {
 					"go_error": err.Error(),
 				},
 			})
+		} else if errors.Is(err, events.ErrInvalidCredentials) {
+			go gc.invalidateSession(ctx, status.BridgeState{
+				StateEvent: status.StateBadCredentials,
+				Error:      GMUnpairedInvalidCreds,
+				Info: map[string]any{
+					"go_error": err.Error(),
+				},
+			})
 		} else {
 			gc.UserLogin.BridgeState.Send(status.BridgeState{
 				StateEvent: status.StateUnknownError,
+				Error:      GMConnectionFailed,
 				Info: map[string]any{
 					"go_error": err.Error(),
 				},

pkg/connector/handlegmessages.go

@@ -49,11 +49,27 @@ func (gc *GMClient) handleGMEvent(rawEvt any) {
 	ctx := log.WithContext(context.TODO())
 	switch evt := rawEvt.(type) {
 	case *events.ListenFatalError:
-		go gc.invalidateSession(ctx, status.BridgeState{
-			StateEvent: status.StateUnknownError,
-			Error:      GMFatalError,
-			Info:       map[string]any{"go_error": evt.Error.Error()},
-		})
+		if errors.Is(evt.Error, events.ErrInvalidCredentials) {
+			go gc.invalidateSession(ctx, status.BridgeState{
+				StateEvent: status.StateBadCredentials,
+				Error:      GMUnpairedInvalidCreds,
+				Info:       map[string]any{"go_error": evt.Error.Error()},
+			})
+		} else {
+			gc.UserLogin.BridgeState.Send(status.BridgeState{
+				StateEvent: status.StateUnknownError,
+				Error:      GMFatalError,
+				Info:       map[string]any{"go_error": evt.Error.Error()},
+			})
+		}
+		/* TODO determine if this should always invalidate
+		else if evt.Error.Error() == "http 401 while polling" {
+			go gc.invalidateSession(ctx, status.BridgeState{
+				StateEvent: status.StateBadCredentials,
+				Error:      GMUnpaired401,
+				Info:       map[string]any{"go_error": evt.Error.Error()},
+			})
+		}*/
 	case *events.ListenTemporaryError:
 		gc.longPollingError = evt.Error
 		gc.UserLogin.BridgeState.Send(status.BridgeState{

pkg/libgm/events/ready.go

@@ -34,6 +34,13 @@ var ErrRequestedEntityNotFound = RequestError{
 	},
 }
 
+var ErrInvalidCredentials = RequestError{
+	Data: &gmproto.ErrorResponse{
+		Type:    16,
+		Message: "Request had invalid authentication credentials. Expected OAuth 2 access token, login cookie or other valid authentication credential. See https://developers.google.com/identity/sign-in/web/devconsole-project.",
+	},
+}
+
 type RequestError struct {
 	Data *gmproto.ErrorResponse
 	HTTP *HTTPError