bridgestate: rename some error codes

Author: tulir

pkg/connector/bridgestate.go

@@ -24,13 +24,12 @@ const (
 	GMListenError               status.BridgeStateErrorCode = "gm-listen-error"
 	GMFatalError                status.BridgeStateErrorCode = "gm-listen-fatal-error"
 	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"
-	GMUnpairedNoEmailInConfig   status.BridgeStateErrorCode = "gm-unpaired-no-email-in-config"
+	GMLoggedOut401              status.BridgeStateErrorCode = "gm-logged-out-401-polling"
+	GMLoggedOutInvalidCreds     status.BridgeStateErrorCode = "gm-logged-out-invalid-credentials"
+	GMLoggedOutNoEmailInConfig  status.BridgeStateErrorCode = "gm-logged-out-no-email-in-config"
 	GMNotLoggedIn               status.BridgeStateErrorCode = "gm-not-logged-in"
-	GMNotConnected              status.BridgeStateErrorCode = "gm-not-connected"
+	GMNotLoggedInCanReauth      status.BridgeStateErrorCode = "gm-not-logged-in-can-reauth"
 	GMConnecting                status.BridgeStateErrorCode = "gm-connecting"
 	GMConnectionFailed          status.BridgeStateErrorCode = "gm-connection-failed"
 	GMConfigFetchFailed         status.BridgeStateErrorCode = "gm-config-fetch-failed"
@@ -47,14 +46,14 @@ 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",
-		GMConnectionFailed:          "Failed to connect to Google Messages",
+		GMConfigFetchFailed:         "Failed to initialize connection to Google Messages",
 		GMNotLoggedIn:               "Unpaired from Google Messages, please re-link the connection to continue using SMS/RCS",
+		GMNotLoggedInCanReauth:      "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",
-		GMUnpairedNoEmailInConfig:   "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",
+		GMLoggedOut401:              "Unpaired from Google Messages, please re-link the connection to continue using SMS/RCS",
+		GMLoggedOutInvalidCreds:     "Unpaired from Google Messages, please re-link the connection to continue using SMS/RCS",
+		GMLoggedOutNoEmailInConfig:  "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",
 		GMBrowserInactiveTimeout:    "Google Messages disconnected due to timeout",

pkg/connector/client.go

@@ -89,12 +89,18 @@ func (gc *GMConnector) LoadUserLogin(ctx context.Context, login *bridgev2.UserLo
 }
 
 func (gc *GMClient) Connect(ctx context.Context) {
-	if gc.Client == nil || (gc.Meta.Session.AuthNetwork() == util.GoogleNetwork && !gc.Meta.Session.HasCookies()) {
+	if gc.Client == nil {
 		gc.UserLogin.BridgeState.Send(status.BridgeState{
 			StateEvent: status.StateBadCredentials,
 			Error:      GMNotLoggedIn,
 		})
 		return
+	} else if gc.Meta.Session.AuthNetwork() == util.GoogleNetwork && !gc.Meta.Session.HasCookies() {
+		gc.UserLogin.BridgeState.Send(status.BridgeState{
+			StateEvent: status.StateBadCredentials,
+			Error:      GMNotLoggedInCanReauth,
+		})
+		return
 	}
 	err := gc.Client.FetchConfig(ctx)
 	if err != nil {
@@ -111,7 +117,7 @@ func (gc *GMClient) Connect(ctx context.Context) {
 		zerolog.Ctx(ctx).Error().Msg("No email in config, invalidating session")
 		go gc.invalidateSession(ctx, status.BridgeState{
 			StateEvent: status.StateBadCredentials,
-			Error:      GMUnpairedInvalidCreds,
+			Error:      GMLoggedOutNoEmailInConfig,
 		}, false)
 		return
 	}
@@ -125,10 +131,10 @@ func (gc *GMClient) Connect(ctx context.Context) {
 					"go_error": err.Error(),
 				},
 			}, true)
-		} else if errors.Is(err, events.ErrInvalidCredentials) || err.Error() == "http 401 while polling" {
+		} else if errors.Is(err, events.ErrInvalidCredentials) {
 			go gc.invalidateSession(ctx, status.BridgeState{
 				StateEvent: status.StateBadCredentials,
-				Error:      GMUnpairedInvalidCreds,
+				Error:      GMLoggedOutInvalidCreds,
 				Info: map[string]any{
 					"go_error": err.Error(),
 				},

pkg/connector/handlegmessages.go

@@ -50,9 +50,13 @@ func (gc *GMClient) handleGMEvent(rawEvt any) {
 	switch evt := rawEvt.(type) {
 	case *events.ListenFatalError:
 		if errors.Is(evt.Error, events.ErrInvalidCredentials) || evt.Error.Error() == "http 401 while polling" {
+			errCode := GMLoggedOut401
+			if errors.Is(evt.Error, events.ErrInvalidCredentials) {
+				errCode = GMLoggedOutInvalidCreds
+			}
 			go gc.invalidateSession(ctx, status.BridgeState{
 				StateEvent: status.StateBadCredentials,
-				Error:      GMUnpairedInvalidCreds,
+				Error:      errCode,
 				Info:       map[string]any{"go_error": evt.Error.Error()},
 			}, false)
 		} else {
@@ -62,14 +66,6 @@ func (gc *GMClient) handleGMEvent(rawEvt any) {
 				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()},
-			}, false)
-		}*/
 	case *events.ListenTemporaryError:
 		gc.longPollingError = evt.Error
 		gc.UserLogin.BridgeState.Send(status.BridgeState{